尝试修复重新第二天无法完成自动时长任务的bug；

修复按钮状态可能没有重置的问题

app/src/main/java/com/sheep/gamegroup/usage/AppUsageManager.java

@@ -24,6 +24,7 @@ import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -188,11 +189,20 @@ public class AppUsageManager {
                 List<UsageStats> usageStatsList = mUsageStatsManager.queryUsageStats(UsageStatsManager.INTERVAL_BEST, 1_514_736_000_000L, time);//1_514_736_000_000L 对应 2018-01-01 0:0:0
 
                 if (usageStatsList != null && !usageStatsList.isEmpty()) {
+                    List<UsageStats> list = new ArrayList<>();
                     for (UsageStats usageStats : usageStatsList) {
                         if (usageStats != null && TextUtils.equals(packageName, usageStats.getPackageName())) {
-                            return usageStats.getTotalTimeInForeground();
+                            list.add(usageStats);
                         }
                     }
+                    //尝试修复重新第二天无法完成自动时长任务的bug
+                    if(!list.isEmpty()){
+                        long totalTimeInForeground = 0;
+                        for (UsageStats usageStats : list) {
+                            totalTimeInForeground += usageStats.getTotalTimeInForeground();
+                        }
+                        return totalTimeInForeground;
+                    }
                 } else {
                     return NOT_OPEN_USAGE_STATS;
                 }

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

@@ -1086,6 +1086,8 @@ public class CommonUtil {
                 if (result != null) {
                     tryShowShareDialog(activity, result.getShare_desc(), action1);
                 } else {
+                    if(action1 != null)
+                        action1.call(null);
                     G.showToast("分享功能调试中");
                 }
             }
@@ -1104,6 +1106,8 @@ public class CommonUtil {
             public void call(UserEntity userEntity) {
                 if (userEntity == null) {
                     G.showToast("分享功能调试中");
+                    if(action1 != null)
+                        action1.call(null);
                     return;
                 }
                 String url = userEntity.getShareLink();

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

@@ -221,7 +221,7 @@ public class Jump2View {
             return;
         }
         if (
-                TestUtil.isTestRecharge() ||
+                TestUtil.isDev() ||
                         TextUtils.isEmpty(DataUtil.getInstance().getUserWxOpenId())) {//这里认定没有微信id  为   没有绑定微信号
             goNoBindWx(context, ChangeWxOrTelAct.TYPE_RECHARGE);
             return;

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

@@ -643,14 +643,9 @@ public class TestUtil {
                 })
                 .open();
     }
-
-    public static boolean isTestRecharge() {
-//        return BuildConfig.DEBUG;//测试充值与绑定微信和身份信息逻辑
-        return false;
-    }
-    //开启后可跳转各种广告与升级
+    //开启后可 测试充值与绑定微信和身份信息逻辑 等
     public static boolean isDev() {
-        return BuildConfig.DEBUG;
-//        return false;
+//        return BuildConfig.DEBUG;
+        return false;
     }
 }

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

@@ -1753,14 +1753,22 @@ public class ViewUtil {
         showShareDialog(activity, url, description, null);
     }
 
-    public static void showShareDialog(final Activity activity, final String url, final String description, Action1<View> action1) {
+    /**
+     * 显示分享弹出框
+     * @param activity
+     * @param url
+     * @param description
+     * @param action1 回调的view为nul时，代表流程结束；不为空时，代表初始化dialog的view，可以做自定义
+     */
+    public static void showShareDialog(final Activity activity, final String url, final String description, final Action1<View> action1) {
         View dialogView = View.inflate(activity, R.layout.ask_to_share, null);
         final AlertDialog dialog = new AlertDialog.Builder(activity, R.style.AppTheme_Dialog_Alert)
                 .setView(dialogView)
                 .create();
 //        TextView ask_share_title = dialogView.findViewById(R.id.ask_share_title);
         RecyclerView ask_share_list = dialogView.findViewById(R.id.ask_share_list);
-        action1.call(dialogView);
+        if(action1 != null)
+            action1.call(dialogView);
 //        ask_share_list.setHasFixedSize(true);
 //        ask_share_list.setNestedScrollingEnabled(false);
         List<String> list = ListUtil.emptyList();
@@ -1818,6 +1826,13 @@ public class ViewUtil {
             }
         };
         ask_share_list.setAdapter(adapter);
+        dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface dialogInterface) {
+                if(action1 != null)
+                    action1.call(null);
+            }
+        });
         try {
             dialog.show();
             Window window = dialog.getWindow();
@@ -1829,6 +1844,8 @@ public class ViewUtil {
             }
         } catch (Exception e) {
             e.printStackTrace();
+            if(action1 != null)
+                action1.call(null);
         }
     }
 

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

@@ -93,7 +93,7 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
             case R.id.bindweixin_sure_text:
                 code = weinxinEtAccount.getText().toString();
                 if(TextUtils.isEmpty(code)){
-                    if(TestUtil.isTestRecharge()){
+                    if(TestUtil.isDev()){
                         updateView(null);
                         return;
                     }
@@ -120,7 +120,7 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
                 .getUserInfo(SheepApp.getInstance());
         if(from == ChangeWxOrTelAct.TYPE_RECHARGE){//来自充值功能,需要检查并跳转到绑定身份与银行卡信息界面
             if(
-                    TestUtil.isTestRecharge() ||
+                    TestUtil.isDev() ||
                     userEntity != null && userEntity.notCertification()){//没有实名认证
                 Jump2View.getInstance().goRealNameAuther(this, userEntity, 1);
             }

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

@@ -190,7 +190,7 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
         String bankCard;
         String bankCardMobile;
         if (TextUtils.isEmpty((realName = etName.getText().toString()))) {
-            if (TestUtil.isTestRecharge()) {
+            if (TestUtil.isDev()) {
                 NetSuccess(0, "测试成功", "");
                 return;
             }

app/src/main/java/com/sheep/jiuyan/samllsheep/ui/activity/SignActivity.java

@@ -272,11 +272,13 @@ public class SignActivity extends BaseActivity implements UMShareListener {
                         } else {
                             G.showToast(R.string.service_data_error);
                         }
+                        ViewUtil.setEnabled(sign_now_but, true);
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
                         G.showToast(baseMessage);
+                        ViewUtil.setEnabled(sign_now_but, true);
                     }
                 });
     }
@@ -335,6 +337,7 @@ public class SignActivity extends BaseActivity implements UMShareListener {
                     @Override
                     public void onError(BaseMessage baseMessage) {
                         G.showToast(baseMessage);
+                        ViewUtil.setEnabled(sign_now_but, true);
                     }
                 });
     }
@@ -426,7 +429,11 @@ public class SignActivity extends BaseActivity implements UMShareListener {
                 CommonUtil.getInstance().tryShowShareDialog(new Action1<View>() {
                     @Override
                     public void call(View view) {
-                        ViewUtil.setText((TextView) view.findViewById(R.id.ask_share_title), "邀请获得复活机会");
+                        if(view == null){
+                            ViewUtil.setEnabled(sign_now_but, true);
+                        } else {
+                            ViewUtil.setText((TextView) view.findViewById(R.id.ask_share_title), "邀请获得复活机会");
+                        }
                     }
                 }, this);
             }