设置全局的升级对话框

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

@@ -418,25 +418,23 @@ public class SysAppUtil {
 
     /**
      * 显示升级对话框
-     * @param activity
      * @param ignoreMd5 用户手动时传null；进入主要界面时不要传null，传保存的忽略md5值，为空字符串时传""
      */
-    public static void showVersionInfo(final Activity activity, final String ignoreMd5) {
+    public static void showVersionInfo(final String ignoreMd5) {
         /**
          *游戏认证过来的不提示升级
          */
         if(!TextUtils.isEmpty(SheepApp.getInstance().getGamePackgeName()))
             return;
-        showVersionInfo(activity, ignoreMd5, null);
+        showVersionInfo(ignoreMd5, null);
     }
 
     /**
      * 显示升级对话框
-     * @param activity
      * @param ignoreMd5 用户手动时传null；进入主要界面时不要传null，传保存的忽略md5值，为空字符串时传""
      * @param action1 动作完成后的回调
      */
-    public static void showVersionInfo(final Activity activity, final String ignoreMd5, final Action1<Integer> action1) {
+    public static void showVersionInfo(final String ignoreMd5, final Action1<Integer> action1) {
         if(!ConfigUtil.getInstance().isUpgrade()) {
             if(action1 != null)
                 action1.call(0);
@@ -451,11 +449,11 @@ public class SysAppUtil {
                 e.printStackTrace();
             }
         }
-//        checkUpdateNewVersion(activity, ignoreMd5, action1);
+//        checkUpdateNewVersion(ignoreMd5, action1);
         if(TestUtil.isSheep()) {
             checkUpdateNewVersion(ignoreMd5, action1);
         } else if(!TestUtil.isDev()) {
-            TestUtil.checkUpdateFromJenkins(activity, ignoreMd5, action1);
+            TestUtil.checkUpdateFromJenkins(ignoreMd5, action1);
         }
     }
     //通过接口检查更新
@@ -600,8 +598,8 @@ public class SysAppUtil {
                 }
             }
         });
-        if(version.isForceUpdate() && TestUtil.isSheep()){//强更
-            dialogConfig.setCancelable(false);
+        if(version.isForceUpdate()){//强更
+            dialogConfig.setCancelable(!TestUtil.isSheep());
         } else {
             dialogConfig.setBtnRightText("下次更新").setBtnRightOnClickListener(view -> {
                 SpUtils.saveIgnoreMd5(TestUtil.isSheep() ? version.getVersion_number()+"" : version.getMd5_address());
@@ -609,7 +607,7 @@ public class SysAppUtil {
                     UPGRADE_DIALOG_BT.onEvent("action", ((TextView) view).getText());
             });
         }
-        dialog = ViewUtil.showUpgradeDialog(SheepApp.getInstance().getCurrentActivity(), dialogConfig);
+        dialog = ViewUtil.showUpgradeDialog(SheepApp.getInstance(), dialogConfig);
         dialog.setOnDismissListener(dialogInterface -> {
             if (action1 != null)
                 action1.call(0);

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

@@ -910,7 +910,7 @@ public class TestUtil {
     private static final String URL_START = "http://10.8.210.20:8080/jenkins/job/android_small_sheep/";
 
     //通过jenkins服务器打包结果进行检查更新
-    public static void checkUpdateFromJenkins(final Activity activity, final String ignoreMd5, final Action1<Integer> action1) {
+    public static void checkUpdateFromJenkins(final String ignoreMd5, final Action1<Integer> action1) {
         //加载jenkins信息来判断是否当前安装的是最新的安装包
         OkHttpUtils.get().url("http://10.8.210.20:8080/jenkins/job/android_small_sheep").build().execute(new StringCallback() {
             @Override

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

@@ -7,7 +7,6 @@ import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.text.TextUtils;
-import android.transition.Transition;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.FrameLayout;
@@ -28,11 +27,9 @@ import com.sheep.gamegroup.util.ChannelContent;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.DownloadUtil;
-import com.sheep.gamegroup.util.DrawablesHelper;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.MainTab;
-import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -340,7 +337,7 @@ public class ActMain extends BaseActYmPermissionCheck {
             }
         } else {
             if (onResumeCount == 0 && !TestUtil.isDev()) {
-                SysAppUtil.showVersionInfo(this, SpUtils.getIgnoreMd5(), integer -> Jump2View.getInstance().tryShowHalfScreenAd(ActMain.this, getContainer()));
+                Jump2View.getInstance().tryShowHalfScreenAd(ActMain.this, getContainer());
             }
         }
         onResumeCount++;

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

@@ -522,7 +522,7 @@ public class FgtPersonalCenter extends BaseFragment {
                 USER_SHARE.onEvent();
                 break;
             case R.id.version_layout://版本更新
-                SysAppUtil.showVersionInfo(activity, null);
+                SysAppUtil.showVersionInfo(null);
                 USER_UPGRADE.onEvent();
                 break;
             case R.id.order_layout://订单管理

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -442,9 +442,7 @@ public class SheepApp extends MultiDexApplication {
 
         @Override
         public void onActivityCreated(final Activity activity, Bundle savedInstanceState) {
-            if (/*activity instanceof SplashAct || */activity instanceof LoginAct) {
-                SysAppUtil.showVersionInfo(activity, SpUtils.getIgnoreMd5());
-            } else if (YmConfig.isAvf(activity)) {
+            if (YmConfig.isAvf(activity)) {
                 YmConfig.showTipDialog(activity, YmConfig.TYPE_ADD_VIEW);
             }
 
@@ -458,6 +456,9 @@ public class SheepApp extends MultiDexApplication {
                 LogUtil.println("SheepApp onActivityCreated", activity.getClass().getSimpleName(), mActivityCount);
                 if (!UMConfigUtils.isNotNeedAct(activity))
                     UMConfigUtils.Event.SHEEP_CREATED.onEvent();
+
+                //检查升级
+                SysAppUtil.showVersionInfo(SpUtils.getIgnoreMd5());
             }
         }