Sfoglia il codice sorgente

应用自动审核任务优化;强更时忽略版本无效;测试版本名称修改为小绵羊测试

zengjiebin 7 anni fa
parent
commit
6e8c8603d6

+ 2 - 0
app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -55,6 +55,7 @@ import com.sheep.gamegroup.model.entity.SlideshowEty;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.model.util.AutoTaskListUtil;
 import com.sheep.gamegroup.model.util.EntityUtils;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.SmallSheepContract;
@@ -555,6 +556,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             position = 0;
             BaseMessage baseMessage = (BaseMessage) o;
             List<TaskAcceptedEty> taskAcceptedEty = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
+            AutoTaskListUtil.getInstance().loadList(taskAcceptedEty);
             if(taskAcceptedEty != null && taskAcceptedEty.size()>0){
                 tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty), position);
                 tryMakeMoneyAdp.addPresenter(tryMakeMoneyPresenter);

+ 11 - 6
app/src/main/java/com/sheep/gamegroup/model/util/AutoTaskListUtil.java

@@ -83,16 +83,21 @@ public class AutoTaskListUtil {
                         LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
 
                         List<TaskAcceptedEty> list = baseMessage.getDatas(TaskAcceptedEty.class);
-                        if(list != null) {
-                            for (TaskAcceptedEty item : list) {
-                                if (item != null)
-                                    AutoTaskListUtil.getInstance().addTask(item.getRelease_task());
-                            }
-                        }
+                        loadList(list);
                         loadding = false;
                     }
                 });
     }
+
+    public void loadList(List<TaskAcceptedEty> list) {
+        if(list != null) {
+            for (TaskAcceptedEty item : list) {
+                if (item != null)
+                    AutoTaskListUtil.getInstance().addTask(item.getRelease_task());
+            }
+        }
+    }
+
     public void clear() {
         if(map != null)
             map.clear();

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

@@ -335,7 +335,7 @@ public class SysAppUtil {
                             G.showToast(baseMessage);
                             return;
                         }
-                        if(ignoreMd5 != null && TextUtils.equals(ignoreMd5, version.getMd5_address())){
+                        if(ignoreMd5 != null && TextUtils.equals(ignoreMd5, version.getMd5_address()) && !version.isForceUpdate()){
                             LogUtil.println("showVersionInfo", "忽略", ignoreMd5, version.getVersion_name());
                             return;
                         }

+ 3 - 0
app/src/sheeptest/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">小绵羊测试</string>
+</resources>