修复bug

student/src/main/java/com/cooleshow/student/adapter/MessageBoxAdapter.java

@@ -32,16 +32,16 @@ public class MessageBoxAdapter extends BaseQuickAdapter<SystemMessageBean.RowsBe
     @Override
     protected void convert(BaseViewHolder helper, SystemMessageBean.RowsBean item) {
         ImageView im_type = helper.getView(R.id.im_type);
-        TextView tv_title=helper.getView(R.id.tv_title);
+        TextView tv_title = helper.getView(R.id.tv_title);
         tv_title.setText(item.title);
-        TextView tv_content=helper.getView(R.id.tv_content);
+        TextView tv_content = helper.getView(R.id.tv_content);
         tv_content.setText(item.content);
-        TextView tv_date=helper.getView(R.id.tv_date);
-        tv_date.setText(TimeUtils.date2String(TimeUtils.string2Date(item.sendTime),"yyyy-MM-dd"));
-        View view_unread=helper.getView(R.id.view_unread);
-        if (item.readStatus==0){
+        TextView tv_date = helper.getView(R.id.tv_date);
+        tv_date.setText(TimeUtils.date2String(TimeUtils.string2Date(item.sendTime), "yyyy-MM-dd"));
+        View view_unread = helper.getView(R.id.view_unread);
+        if (item.readStatus == 0) {
             view_unread.setVisibility(View.VISIBLE);
-        }else {
+        } else {
             view_unread.setVisibility(View.GONE);
         }
         switch (item.subType) {
@@ -93,12 +93,15 @@ public class MessageBoxAdapter extends BaseQuickAdapter<SystemMessageBean.RowsBe
                 //会员
                 im_type.setBackgroundResource(R.drawable.icon_message_vip);
                 break;
-            case "NOTICE":
+            case "PIANO_ROOM":
+                im_type.setBackgroundResource(R.drawable.icon_message_piano);
+                break;
+            case "STYLE":
+                im_type.setBackgroundResource(R.drawable.icon_message_piano);
+                break;
             default:
                 //公告
-//                im_type.setBackgroundResource(R.drawable.icon_message_notice);
-                //TODO 还差公告的图
-                im_type.setBackgroundResource(R.drawable.icon_message_vip);
+                im_type.setBackgroundResource(R.drawable.icon_message_other);
                 break;
         }
     }

student/src/main/java/com/cooleshow/student/ui/web/HtmlActivity.java

@@ -681,7 +681,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
                         sendPayResult(Constants.PAY_SUCCESS);
                     } else {
                         // 该笔订单真实的支付结果，需要依赖服务端的异步通知。
-                        ToastUtil.getInstance().showShort("支付失败" + resultStatus);
+                        ToastUtil.getInstance().showShort("支付失败");
                         sendPayResult(Constants.PAY_ERROR);
                     }
                     break;

student/src/main/java/com/cooleshow/student/ui/web/HtmlHorizontalScreenActivity.java

@@ -638,7 +638,7 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
                         sendPayResult(Constants.PAY_SUCCESS);
                     } else {
                         // 该笔订单真实的支付结果，需要依赖服务端的异步通知。
-                        ToastUtil.getInstance().showShort("支付失败" + resultInfo);
+                        ToastUtil.getInstance().showShort("支付失败");
                         sendPayResult(Constants.PAY_ERROR);
                     }
                     break;

teacher/src/main/java/com/cooleshow/teacher/adapter/MessageBoxAdapter.java

@@ -32,16 +32,16 @@ public class MessageBoxAdapter extends BaseQuickAdapter<SystemMessageBean.RowsBe
     @Override
     protected void convert(BaseViewHolder helper, SystemMessageBean.RowsBean item) {
         ImageView im_type = helper.getView(R.id.im_type);
-        TextView tv_title=helper.getView(R.id.tv_title);
+        TextView tv_title = helper.getView(R.id.tv_title);
         tv_title.setText(item.title);
-        TextView tv_content=helper.getView(R.id.tv_content);
+        TextView tv_content = helper.getView(R.id.tv_content);
         tv_content.setText(item.content);
-        TextView tv_date=helper.getView(R.id.tv_date);
-        tv_date.setText(TimeUtils.date2String(TimeUtils.string2Date(item.sendTime),"yyyy-MM-dd"));
-        View view_unread=helper.getView(R.id.view_unread);
-        if (item.readStatus==0){
+        TextView tv_date = helper.getView(R.id.tv_date);
+        tv_date.setText(TimeUtils.date2String(TimeUtils.string2Date(item.sendTime), "yyyy-MM-dd"));
+        View view_unread = helper.getView(R.id.view_unread);
+        if (item.readStatus == 0) {
             view_unread.setVisibility(View.VISIBLE);
-        }else {
+        } else {
             view_unread.setVisibility(View.GONE);
         }
         switch (item.subType) {
@@ -93,12 +93,15 @@ public class MessageBoxAdapter extends BaseQuickAdapter<SystemMessageBean.RowsBe
                 //会员
                 im_type.setBackgroundResource(R.drawable.icon_message_vip);
                 break;
-            case "NOTICE":
+            case "PIANO_ROOM":
+                im_type.setBackgroundResource(R.drawable.icon_message_piano);
+                break;
+            case "STYLE":
+                im_type.setBackgroundResource(R.drawable.icon_message_piano);
+                break;
             default:
                 //公告
-//                im_type.setBackgroundResource(R.drawable.icon_message_notice);
-                //TODO 还差公告的图
-                im_type.setBackgroundResource(R.drawable.icon_message_vip);
+                im_type.setBackgroundResource(R.drawable.icon_message_other);
                 break;
         }
     }

teacher/src/main/java/com/cooleshow/teacher/ui/web/HtmlActivity.java

@@ -668,7 +668,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
                         sendPayResult(Constants.PAY_SUCCESS);
                     } else {
                         // 该笔订单真实的支付结果，需要依赖服务端的异步通知。
-                        ToastUtil.getInstance().showShort("支付失败" + resultInfo);
+                        ToastUtil.getInstance().showShort("支付失败");
                         sendPayResult(Constants.PAY_ERROR);
                     }
                     break;
@@ -1110,7 +1110,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
             if (result != null) {
                 File file = UriUtils.uri2File(result);
                 if (file != null && file.exists()) {
-                    UploadHelper uploadHelper = new UploadHelper(HtmlActivity.this,buckName);
+                    UploadHelper uploadHelper = new UploadHelper(HtmlActivity.this, buckName);
                     uploadHelper.uploadFile(file);
                     uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
                         @Override

teacher/src/main/java/com/cooleshow/teacher/ui/web/HtmlHorizontalScreenActivity.java

@@ -636,7 +636,7 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
                         sendPayResult(Constants.PAY_SUCCESS);
                     } else {
                         // 该笔订单真实的支付结果，需要依赖服务端的异步通知。
-                        ToastUtil.getInstance().showShort("支付失败" + resultInfo);
+                        ToastUtil.getInstance().showShort("支付失败");
                         sendPayResult(Constants.PAY_ERROR);
                     }
                     break;