Merge remote-tracking branch 'origin/4.2.40(复联迁移)' into 4.2.40(复联迁移)

config.gradle

@@ -10,7 +10,7 @@ ext {
             "m-fm"            : "0.0.30.03",
             "m-user"          : "0.0.61.31",
             "m-home"          : "0.0.22.61",
-            "m-im"            : "0.0.19.08",
+            "m-im"            : "0.0.19.09",
             "m-dynamic"       : "0.0.7.22",
             "m-article"       : "0.0.0.8",
 
@@ -93,7 +93,7 @@ ext {
             "m-fm"            : "0.0.30.01",
             "m-user"          : "0.0.61.31",
             "m-home"          : "0.0.22.61",
-            "m-im"            : "0.0.19.08",
+            "m-im"            : "0.0.19.09",
             "m-dynamic"       : "0.0.7.22",
             "m-article"       : "0.0.0.6",
 

m-im/src/main/java/com/yidianling/im/session/viewholder/MsgViewHolderReceivedMoney.java

@@ -62,10 +62,14 @@ public class MsgViewHolderReceivedMoney extends MsgViewHolderBase {
         if (title != null) tit.setText(title);
         if (orPay == 1) {
             //支付成功
-            if (num != null) content.setText("您支付了" + num + "元");
+            if (num != null) {
+                content.setText("您支付了" + num + "元");
+            }
             img.setImageDrawable(view.getResources().getDrawable(R.mipmap.im_zhifu));
         } else {
-            if (num != null) content.setText("您需要支付" + num + "元");
+            if (num != null) {
+                content.setText("您需要支付" + num + "元");
+            }
             img.setImageDrawable(view.getResources().getDrawable(R.mipmap.im_weifu));
         }
 
@@ -75,7 +79,7 @@ public class MsgViewHolderReceivedMoney extends MsgViewHolderBase {
     @Override
     protected void onItemClick() {
         if (isReceivedMessage()) {
-            if (isNewOrder) {
+            if (isNewOrder != null && isNewOrder) {
                 H5Params orderParams = new H5Params(
                         ImConstants.Companion.getORDER_DETAIL() + (orderid.isEmpty() ? "" : orderid), null);
                 NewH5Activity.start(context, orderParams);