Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

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

@@ -14,6 +14,7 @@ import com.sheep.gamegroup.model.entity.AppRecord;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.util.ConnectAddress;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.tencent.bugly.Bugly;
@@ -51,7 +52,7 @@ public class SheepApp extends BaseApplication {
     }
 
     public TaskEty getTaskEty() {
-        return taskEty;
+        return MyDbManager.getInstance().dbFindTask();
     }
 
     public void setTaskEty(TaskEty taskEty) {