Parcourir la source

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

hanjing il y a 7 ans
Parent
commit
8fd4baf69e

+ 4 - 0
app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -767,6 +767,10 @@ public class TestUtil {
     public static boolean isGTVersion3_4_3() {
         return BuildConfig.VERSION_CODE > 3004003;
     }
+    //3.4.5版本之前的版本
+    public static boolean isLTVersion3_4_5() {
+        return BuildConfig.VERSION_CODE < 3004005;
+    }
 
     /**
      * umen 分享

+ 3 - 1
app/src/main/java/com/sheep/gamegroup/view/adapter/NewbieTaskAdp.java

@@ -16,6 +16,7 @@ import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
+import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -135,7 +136,8 @@ public class NewbieTaskAdp extends BaseAdapter {
                     if (BuildConfig.DEBUG) {
                         G.showToast("测试:服务器返回数据错误,这个任务可能没有完成?");
                     }
-                    isShow(context);
+                    if(TestUtil.isLTVersion3_4_5())//3.4.5以前版本才调用下面的方法
+                        isShow(context);
                     break;
                 case 6://加入官方QQ群
                     doActionByTaskQQ(context, task);

+ 2 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

@@ -616,7 +616,8 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         }
         //每次进入主页都刷新一下url配置信息
         CommonUtil.getInstance().initUrlConfigByNet(null, null);
-        isShowRedPackage();
+        if(TestUtil.isLTVersion3_4_5())//3.4.5以前版本才调用下面的方法
+            isShowRedPackage();
     }