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

app/src/main/java/com/sheep/gamegroup/model/entity/WebParams.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
  */
 public class WebParams implements Serializable {
     private String url;//要加载的网页地址
-    private String jsUrl;//要注入的js的网页地址
+    private String jsUrl;//要注入的js源码的网页地址，（可以通过该地址直接获取js代码）
     private String title = "加载中";//页面默认标题
     private boolean needJsInteract = true;
     private boolean showTitle = true;

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

@@ -96,12 +96,7 @@ public class ActSignCard extends BaseActivity {
 //                                .setMsg("该栏目为日常活跃活动，收益可提现。"));
 //                    }
 //                })
-                .setRightBtn(activity, "我的战绩", 0, new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        Jump2View.getInstance().goSignRecordAct(activity, null);
-                    }
-                });
+                .setRightBtn(activity, "我的战绩", 0, v -> Jump2View.getInstance().goSignRecordAct(activity, null));
         //加下划线
         sign_card_tip.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
         if (DataUtil.getAsBoolean("isNotShowDialogSignCard", true)) {//没有记录显示过该对话框，就显示之
@@ -226,7 +221,7 @@ public class ActSignCard extends BaseActivity {
                         PunchStarList punchStarList = baseMessage.getData(PunchStarList.class);
                         superUserList.clear();
                         ListUtil.addAllItem(superUserList, punchStarList.getList());
-                        sign_card_super_users.getAdapter().notifyDataSetChanged();
+                        ViewUtil.notifyDataSetChanged(sign_card_super_users);
                     }
 
                     @Override
@@ -254,7 +249,7 @@ public class ActSignCard extends BaseActivity {
                             ListUtil.addAll(userList, punchAndSign.getAvatar());
                         }
                         sign_card_users.setLayoutManager(new GridLayoutManager(SheepApp.getInstance(), userList.size()));
-                        sign_card_users.getAdapter().notifyDataSetChanged();
+                        ViewUtil.notifyDataSetChanged(sign_card_users);
                         ViewUtil.setText(sign_card_total_bonus, String.format(Locale.CHINA, "%s元", punchAndSign.getSign_up_count()));
                         ViewUtil.setText(sign_card_total_people, String.format(Locale.CHINA, "当前参与人数%s人", punchAndSign.getSign_up_count()));
                         ViewUtil.setText(sign_card_success_people, punchAndSign.getPunch_count());
@@ -271,8 +266,7 @@ public class ActSignCard extends BaseActivity {
                     public void onError(BaseMessage baseMessage) {
                         userList.clear();
                         userList.add(null);
-                        if(sign_card_users != null)
-                            sign_card_users.getAdapter().notifyDataSetChanged();
+                        ViewUtil.notifyDataSetChanged(sign_card_users);
                     }
                 });
     }
@@ -365,12 +359,7 @@ public class ActSignCard extends BaseActivity {
                         if ("OK".equals(baseMessage.getMsg())) {
                             ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("恭喜您").setMsg("打卡成功，活动结束后平分奖励会直接发放到个人账户中")
                                     .setBtnLeftText("好的").setBtnRightText("查看战绩")
-                                    .setBtnRightOnClickListener(new View.OnClickListener() {
-                                        @Override
-                                        public void onClick(View view) {
-                                            Jump2View.getInstance().goSignRecordAct(activity, null);
-                                        }
-                                    }));
+                                    .setBtnRightOnClickListener(view -> Jump2View.getInstance().goSignRecordAct(activity, null)));
                             punchType = PUNCH_TYPE_HAD_PUNCH;//1未报名 2已打卡 3可以打卡 4已经过了时间 5活动暂未开始
                             initPunchAndSignCount();//(刷新数据)获取可打卡和报名人数
                             initBtnState();
@@ -388,51 +377,41 @@ public class ActSignCard extends BaseActivity {
 
     private void joinSignUp() {
         UMConfigUtils.Event.PUNCH_SIGN_UP.onEvent();
-        CommonUtil.getInstance().callActionWithUserInfo(new Action1<UserEntity>() {
-            @Override
-            public void call(UserEntity userEntity) {
-                if (userEntity != null) {
-                    if (NumberFormatUtils.parseFloat(userEntity.getBalance()) >= 1) {
-                        SheepApp.getInstance().getNetComponent().getApiService().getPunchUp()
-                                .subscribeOn(Schedulers.io())
-                                .observeOn(AndroidSchedulers.mainThread())
-                                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                                    @Override
-                                    public void onNext(BaseMessage baseMessage) {
-                                        if ("OK".equals(baseMessage.getMsg())) {
-                                            ViewUtil.showMsgDialog(activity, new DialogConfig().setMsg("记得明日7:00-9:00来参加打卡哦！").setTitle("恭喜你，报名成功").setBtnLeftText("设置闹铃提醒")
-                                                    .setBtnLeftOnClickListener(new View.OnClickListener() {
-                                                        @Override
-                                                        public void onClick(View view) {
-                                                            //跳转到系统闹钟
-                                                            SysAppUtil.startAlermApp(activity, getString(R.string.smallsheep_checkin_task), 7, 5);
-                                                        }
-                                                    }));
-                                            isCanSignUp = false;
-                                            initPunchType();
-                                            initPunchAndSignCount();//(刷新数据)获取可打卡和报名人数
-                                        } else {
-                                            G.showToast(baseMessage);
-                                        }
-                                    }
-
-                                    @Override
-                                    public void onError(BaseMessage baseMessage) {
+        CommonUtil.getInstance().callActionWithUserInfo(userEntity -> {
+            if (userEntity != null) {
+                if (NumberFormatUtils.parseFloat(userEntity.getBalance()) >= 1) {
+                    SheepApp.getInstance().getNetComponent().getApiService().getPunchUp()
+                            .subscribeOn(Schedulers.io())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                                @Override
+                                public void onNext(BaseMessage baseMessage) {
+                                    if ("OK".equals(baseMessage.getMsg())) {
+                                        ViewUtil.showMsgDialog(activity, new DialogConfig().setMsg("记得明日7:00-9:00来参加打卡哦！").setTitle("恭喜你，报名成功").setBtnLeftText("设置闹铃提醒")
+                                                .setBtnLeftOnClickListener(view -> {
+                                                    //跳转到系统闹钟
+                                                    SysAppUtil.startAlermApp(activity, getString(R.string.smallsheep_checkin_task), 7, 5);
+                                                }));
+                                        isCanSignUp = false;
+                                        initPunchType();
+                                        initPunchAndSignCount();//(刷新数据)获取可打卡和报名人数
+                                    } else {
                                         G.showToast(baseMessage);
                                     }
-                                });
-                    } else {
-                        ViewUtil.showMsgDialog(activity, new DialogConfig().setMsg("抱歉，你的余额不足，请先去充值再来参与打卡哦！").setBtnRightText("好的").setBtnLeftText("去充值")
-                                .setBtnLeftOnClickListener(new View.OnClickListener() {
-                                    @Override
-                                    public void onClick(View view) {
-                                        Jump2View.getInstance().goSignRechargeAct(activity, null);
-                                    }
-                                }));
-                    }
+                                }
+
+                                @Override
+                                public void onError(BaseMessage baseMessage) {
+                                    G.showToast(baseMessage);
+                                }
+                            });
                 } else {
-                    G.showToast(R.string.service_data_error);
+                    ViewUtil.showMsgDialog(activity, new DialogConfig().setMsg("抱歉，你的余额不足，请先去充值或者领取奖励，然后再来参与打卡哦！").setBtnLeftText("去领奖").setBtnRightText("去充值")
+                            .setBtnLeftOnClickListener(view -> Jump2View.getInstance().goTryplayView(activity, null))
+                            .setBtnRightOnClickListener(view -> Jump2View.getInstance().goSignRechargeAct(activity, null)));
                 }
+            } else {
+                G.showToast(R.string.service_data_error);
             }
         });
     }

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

@@ -98,7 +98,7 @@ public class ActWebX5 extends BaseActWeb {
                     .getInstance()
                     .setShowOrHide(this, true)
                     .setTitle(this, webParams.getTitle())
-                    .setRightImgBotton(this, R.drawable.ic_edit_text_delete, view -> finish())
+                    .setRightImgBotton(this, R.drawable.ic_edit_text_delete, view -> super.finish())
                     .setTitleFinish(this);
         }
         initWebViewSettings(mWebView);
@@ -172,12 +172,19 @@ public class ActWebX5 extends BaseActWeb {
 
     @Override
     protected void onDestroy() {
-        super.onDestroy();
+        if(act_web_loading_iv != null){
+            try {
+                act_web_loading_iv.clearAnimation();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
         if (mWebView != null) {
             mWebView.setVisibility(View.GONE);
             mWebView.removeAllViews();
             mWebView.destroy();
         }
+        super.onDestroy();
     }
 
     /**
@@ -287,7 +294,8 @@ public class ActWebX5 extends BaseActWeb {
                     act_web_loading_iv.startAnimation(animation);
                 }
                 ViewUtil.setVisibility(act_web_loading_pb, newProgress != 100);
-                act_web_loading_pb.setProgress(newProgress);
+                if(act_web_loading_pb != null)
+                    act_web_loading_pb.setProgress(newProgress);
                 super.onProgressChanged(view, newProgress);
             }
         });
@@ -374,9 +382,13 @@ public class ActWebX5 extends BaseActWeb {
             mWebView.addJavascriptInterface(new KFZSJs(this), "kfzsjs");
             String loadUrl = url;
             if(webParams.getTokenKey() != null){
-                if(url.startsWith(Config.YF_SHOP_HOME))webParams.tokenFirstUpperCase();
+                if(url.startsWith(Config.YF_SHOP_HOME)){
+                    webParams.tokenFirstUpperCase();
+                }
                 loadUrl = addUrlQuery(url, webParams.getTokenKey(), SpUtils.getToken(SheepApp.getInstance()));
-                loadUrl = addUrlQuery(loadUrl, "pf", Config.YF_SHOP_PLATFORM);
+                if(url.startsWith(Config.YF_SHOP_HOME)){
+                    loadUrl = addUrlQuery(loadUrl, "pf", Config.YF_SHOP_PLATFORM);
+                }
             }
             LogUtil.println("ActWeb loadUrl = " + loadUrl);
             webViewLoadUrl(mWebView, loadUrl);

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

@@ -223,16 +223,16 @@ public class FgtFootprint extends BaseListFragment4<UserFootprint> {
 
             @Override
             public void onCalendarSelect(Calendar calendar, boolean isClick) {
-                date = String.format(Locale.CHINA, "%d-%d-%d", calendar.getYear(), calendar.getMonth(), calendar.getDay());
+                date = String.format(Locale.CHINA, format, calendar.getYear(), calendar.getMonth(), calendar.getDay());
                 refreshData();
             }
         });
     }
-
+    public static final String format = "%d-%02d-%02d";
     //初始化足迹数量
     private void initFootprintCountRespons(final int year, final int month) {
-        String start_date = String.format(Locale.CHINA, "%d-%02d-%02d", year, month, 1);
-        String end_date = String.format(Locale.CHINA, "%d-%02d-%02d", year, month, TimeUtil.getTotalDay(month));
+        String start_date = String.format(Locale.CHINA, format, year, month, 1);
+        String end_date = String.format(Locale.CHINA, format, year, month, TimeUtil.getTotalDay(month));
         SheepApp.getInstance().getNetComponent().getApiService().getUserFootPrintDateCount(start_date, end_date)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())