更新数据库版本

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

@@ -22,7 +22,6 @@ import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTarget;
 import com.arialyy.aria.core.inf.IEntity;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
-import com.kfzs.duanduan.fragment.FgtSmallSheep;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.alipay.PayResult;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -32,11 +31,9 @@ import com.sheep.gamegroup.model.entity.TaskChild;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskListen;
 import com.sheep.gamegroup.model.entity.UserEntity;
-import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.entity.WithdrawalEty;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
-import com.sheep.gamegroup.view.activity.RechargeAct;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
@@ -45,7 +42,6 @@ import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.UMAuthListener;
 import com.umeng.socialize.UMShareAPI;
-import com.umeng.socialize.UMShareListener;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.media.UMImage;
 import com.umeng.socialize.media.UMWeb;
@@ -467,22 +463,18 @@ public class CommonUtil {
      SheepApp.getInstance().setTaskEty(taskEty);
      */
     public void setTAskEnty(TaskEty tAskEnty){
-        try {
-            if(tAskEnty.getInspect_type() == 3){
-
-                MyDbManager.getInstance()
-                        .saveOrUpdate(new TaskListen(tAskEnty.getId(), tAskEnty.getPackage_names(), tAskEnty.getRelease_task_id()));
-            }else {
-                MyDbManager.getInstance()
-                        .removeTask();
-                SheepApp.getInstance().setTaskEty(null);
+        if(tAskEnty != null) {
+            try {
+                if (tAskEnty.getInspect_type() == 3) {
+                    MyDbManager.getInstance().saveOrUpdate(new TaskListen(tAskEnty.getId(), tAskEnty.getPackage_names(), tAskEnty.getRelease_task_id()));
+                    return;
+                }
+            } catch (Exception ignore) {
             }
-        }catch (Exception e){
-            MyDbManager.getInstance()
-                    .removeTask();
-            SheepApp.getInstance().setTaskEty(null);
         }
-//        SheepApp.getInstance().setTaskEty(tAskEnty);
+        MyDbManager.getInstance().removeTask();
+        SheepApp.getInstance().setTaskEty(null);
+
     }
 
     /**

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

@@ -206,37 +206,43 @@ public class TestUtil {
             });
         }
     }
+
     public static void saveUser(LoginEntity loginEty) {
-        if(loginEty != null && loginEty.getUser() != null) {
-            LoginUser loginUser = new LoginUser();
-            loginUser.setId(loginEty.getUser().getId());
-            loginUser.setToken(loginEty.getToken());
-            loginUser.setServiceName(SheepApp.getInstance().getConnectAddress().getName());
-            loginUser.setNickname(loginEty.getUser().getNickname());
-            MyDbManager.getInstance().saveOrUpdate(loginUser);
+        if (isTest()) {
+            if (loginEty != null && loginEty.getUser() != null) {
+                LoginUser loginUser = new LoginUser();
+                loginUser.setId(loginEty.getUser().getId());
+                loginUser.setToken(loginEty.getToken());
+                loginUser.setServiceName(SheepApp.getInstance().getConnectAddress().getName());
+                loginUser.setNickname(loginEty.getUser().getNickname());
+                MyDbManager.getInstance().saveOrUpdate(loginUser);
+            }
         }
     }
+
     public static void addUser(final String token) {
-        SheepApp.getInstance().getNetComponent().getApiService().getInfo()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
-                        UserEntity userEntity = baseMessage.getData(UserEntity.class);
-                        LoginEntity loginEntity = new LoginEntity();
-                        loginEntity.setToken(token);
-                        loginEntity.setUser(userEntity);
-                        saveUser(loginEntity);
-                    }
+        if (isTest()) {
+            SheepApp.getInstance().getNetComponent().getApiService().getInfo()
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                        @Override
+                        public void onNext(BaseMessage baseMessage) {
+                            LogUtil.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
+                            UserEntity userEntity = baseMessage.getData(UserEntity.class);
+                            LoginEntity loginEntity = new LoginEntity();
+                            loginEntity.setToken(token);
+                            loginEntity.setUser(userEntity);
+                            saveUser(loginEntity);
+                        }
 
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-                        G.showToast(baseMessage);
-                    }
-                });
+                        @Override
+                        public void onError(BaseMessage baseMessage) {
+                            LogUtil.println("baseMessage onError " + JSON.toJSONString(baseMessage));
+                            G.showToast(baseMessage);
+                        }
+                    });
+        }
     }
     public static boolean isTest(){
         return BuildConfig.DEBUG || !"sheep".equals(BuildConfig.FLAVOR);

datashare/build.gradle

@@ -12,7 +12,7 @@ android {
     }
 
     greendao {
-        schemaVersion 9
+        schemaVersion 10
         targetGenDir 'src/main/java'
     }
     buildTypes {

datashare/src/main/java/com/kfzs/duanduan/data/graph/provider/channel/DaoMaster.java

@@ -18,10 +18,10 @@ import com.kfzs.duanduan.datashare.provider.download.DownLoadInfoDao;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 /**
- * Master of DAO (schema version 9): knows all DAOs.
+ * Master of DAO (schema version 10): knows all DAOs.
  */
 public class DaoMaster extends AbstractDaoMaster {
-    public static final int SCHEMA_VERSION = 9;
+    public static final int SCHEMA_VERSION = 10;
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {