Sfoglia il codice sorgente

引导页面只显示一次,发版本时可以随时设置开启一次

zengjiebin 7 anni fa
parent
commit
c557e8d0d6

+ 0 - 2
app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java

@@ -79,11 +79,9 @@ public class TabsHelper {
      */
     private void nativeBack() {
         if (System.currentTimeMillis() - mLastBackTime < 1000) {
-
             KFZSApp.getInstance().quit();
         } else {
             ToastBuilder.make(activity.getApplicationContext(), R.string.toast_double_click_exit_app, ToastBuilder.DEFAULT_TOAST_SINGLE);
-            SysAppUtil.isNewSmallSheep(true);//不知什么原因,之前在弹出弹窗广告时的设置为true可能没有效果,这里再保存一次吧
         }
         mLastBackTime = System.currentTimeMillis();
     }

+ 19 - 34
app/src/main/java/com/sheep/gamegroup/util/DataUtil.java

@@ -411,39 +411,24 @@ public class DataUtil {
                 });
 
     }
-//    //正在运行的任务
-//    List<TaskAcceptedEty> taskAcceptedEtyList = ListUtil.emptyList();
-//    public void addTaskAcceptedEtyList(List<TaskAcceptedEty> list) {
-//        isInitTaskAcceptedList = true;
-//        taskAcceptedEtyList.clear();
-//        taskAcceptedEtyList.addAll(list);
-//        LogUtil.println("DataUtil", "taskAcceptedEtyList", taskAcceptedEtyList.size());
-//    }
-//
-//    /**
-//     * 通过包名从内存中正在运行的任务列表中获取正在运行的任务
-//     * @param pacageName
-//     * @return
-//     */
-//    public TaskAcceptedEty getTaskAcceptedEtyFromPackageName(String pacageName) {
-//        if(!TextUtils.isEmpty(pacageName))
-//            for (TaskAcceptedEty taskAcceptedEty : taskAcceptedEtyList) {
-//                if(taskAcceptedEty != null && taskAcceptedEty.getRelease_task() != null && taskAcceptedEty.getRelease_task().getTask() != null
-//                        && TextUtils.equals(taskAcceptedEty.getRelease_task().getTask().getPackage_names(), pacageName)){
-//                    return taskAcceptedEty;
-//                }
-//            }
-//        return null;
-//    }
-//
-//    private boolean isInitTaskAcceptedList = false;
-//
-//    public boolean isInitTaskAcceptedList() {
-//        return isInitTaskAcceptedList;
-//    }
-//
-//    public List<TaskAcceptedEty> getTaskAcceptedEtyList() {
-//        return taskAcceptedEtyList;
-//    }
+
     //-----------------------------------------其它数据部分-----------------------------------------------------结束
+    //-----------------------------------------引导页中用到的是否为新版部分-----------------------------------------------------开始
+    private int versionType = 0;
+    public boolean notInitVersion() {
+        return versionType == 0;
+    }
+
+    public void setIsNewSmallSheep(boolean isNewSmallSheep) {
+        versionType = isNewSmallSheep ? 1 : 2;
+    }
+
+    public boolean isNewSmallSheep() {
+        return versionType == 1;
+    }
+    public void resetIsNewSmallSheep() {
+        versionType = 0;
+    }
+
+    //-----------------------------------------引导页中用到的是否为新版部分-----------------------------------------------------结束
 }

+ 2 - 2
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -1182,7 +1182,7 @@ public class Jump2View {
     }
 
     public void gotoGuide(final Activity activity) {
-        if(SysAppUtil.isNewSmallSheep(false)){
+        if(SysAppUtil.isNewSmallSheep()){
             Intent intent = new Intent(activity, ActGuide.class);
             activity.startActivity(intent);
             activity.finish();
@@ -1202,7 +1202,7 @@ public class Jump2View {
     }
 
     public void tryShowHalfScreenAd(final Activity activity, final Container<Action1<Integer>> container) {
-        if(SysAppUtil.isNewSmallSheep(true)){//新版本只显示引导页面,不展示弹窗和开屏广告
+        if(SysAppUtil.isNewSmallSheep()){//新版本只显示引导页面,不展示弹窗和开屏广告
             return;
         }
         SheepApp.getInstance().getNetComponent().getApiService().getAdvertising(2)

+ 8 - 6
app/src/main/java/com/sheep/gamegroup/util/SysAppUtil.java

@@ -114,17 +114,19 @@ public class SysAppUtil {
 
     /**
      * 是否第一次运行新的小绵羊
-     * @param isSetNew 是否保存最新版本号,清除数据后保存的数据无效(注:有且只有最后一步操作要设置其为true)
      * @return
      */
-    public static boolean isNewSmallSheep(boolean isSetNew) {
-        int version_code = ForeverCacheUtil.getInstance().getVersionCode();
-        int cur_version_code = ApkUtils.getCurrentPkgVersionCode(SheepApp.getInstance());
-        if(isSetNew)
+    public static boolean isNewSmallSheep() {
+        if(DataUtil.getInstance().notInitVersion()){
+            int version_code = ForeverCacheUtil.getInstance().getVersionCode();
+            int cur_version_code = 3000005;//要想发新版本后让用户显示引导页面,就直接修改为一个更大的值
             ForeverCacheUtil.getInstance().saveVersionCode(cur_version_code);
-        return version_code < cur_version_code
+            boolean isNewSmallSheep = version_code != cur_version_code
 //                || BuildConfig.DEBUG
                 ;
+            DataUtil.getInstance().setIsNewSmallSheep(isNewSmallSheep);
+        }
+        return DataUtil.getInstance().isNewSmallSheep();
     }
 
     public static void clearCache(final Action1<Object> action1) {

+ 7 - 6
app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java

@@ -125,7 +125,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
                         sendHandlerMessages(100);
                     break;
                 case 1:
-                    if(SysAppUtil.isNewSmallSheep(false)){//新版本只显示引导页面,不展示弹窗和开屏广告
+                    if(SysAppUtil.isNewSmallSheep()){//新版本只显示引导页面,不展示弹窗和开屏广告
                         isLoaddingData = false;
                         sendHandlerMessages(200);
                     } else {
@@ -191,11 +191,12 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
     public void initView() {
         activity = this;
         GlideImageLoader.setImage(login_bg_img, "http://cdngame.kuaifazs.com/login_bg_img.png");
-        if(BuildConfig.DEBUG){
-            Jump2View.getInstance().goHomePageView(activity, null);
-        } else {
-            mHandler.sendEmptyMessageDelayed(1, 500);
-        }
+//        if(BuildConfig.DEBUG){
+//            Jump2View.getInstance().goHomePageView(activity, null);
+//        } else {
+//            mHandler.sendEmptyMessageDelayed(1, 500);
+//        }
+        mHandler.sendEmptyMessageDelayed(1, 500);
     }
 
     @Override

+ 1 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -233,6 +233,7 @@ public class SheepApp extends BaseApplication {
         public void onActivityDestroyed(Activity activity) {
             if(mActivityCount == 0) {
                 LogUtil.println("SheepApp onActivityDestroyed", mActivityCount);
+                DataUtil.getInstance().resetIsNewSmallSheep();
                 stopService(new Intent(SheepApp.this, DownloadService.class));
                 stopService(new Intent(SheepApp.this, FloatService.class));
                 if(DataUtil.IS_USE_SCREEN_SHOT)