Merge branch 'sheep_develop' of 10.8.230.114:xmy_android/small_sheep_android into sheep_develop

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -1131,7 +1131,7 @@ public class Jump2View {
         } else {
             Intent intent = new Intent(context, RechargeQAct.class);
             context.startActivity(intent);
-            RECHARGE_QQ.onEvent("from", from);
+            RECHARGE_QQ.onEvent("from", TextUtils.isEmpty(from) ? "其它" : from);
         }
 
     }

app/src/main/java/com/sheep/gamegroup/view/activity/ActSignCard.java

@@ -408,7 +408,7 @@ public class ActSignCard extends BaseActivity {
                 } else {
                     ViewUtil.showMsgDialog(activity, new DialogConfig().setMsg("抱歉，你的余额不足，请先去充值或者领取奖励，然后再来参与打卡哦！").setBtnLeftText("去领奖").setBtnRightText("去充值")
                             .setBtnLeftOnClickListener(view -> Jump2View.getInstance().goTryplayView(activity, null))
-                            .setBtnRightOnClickListener(view -> Jump2View.getInstance().goRechargeAct(activity, null)));
+                            .setBtnRightOnClickListener(view -> Jump2View.getInstance().goRechargeAct(activity, "签到")));
                 }
             } else {
                 G.showToast(R.string.service_data_error);

app/src/main/java/com/sheep/gamegroup/view/activity/SignCardAct.java

@@ -282,7 +282,7 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
                     .setBtnLeftOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
-                            Jump2View.getInstance().goRechargeAct(activity, null);
+                            Jump2View.getInstance().goRechargeAct(activity, "签到(old)");
                         }
                     }));
         }

app/src/main/java/com/sheep/gamegroup/view/fragment/BaseListFragment5.java

@@ -224,7 +224,7 @@ public abstract class BaseListFragment5<T> extends BaseFragment implements IRefr
 
     public void refreshData() {
         clear();
-        ViewUtil.refreshXrv(view_list);
+        ViewUtil.notifyDataSetChanged(view_list);
         initData();
     }