liujiangyao 8 lat temu
rodzic
commit
7a413beb0d

+ 2 - 1
app/src/main/java/com/sheep/gamegroup/model/entity/TaskEty.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 
 import org.greenrobot.greendao.annotation.Id;
 import org.greenrobot.greendao.annotation.Unique;
+import org.xutils.db.annotation.Column;
 import org.xutils.db.annotation.Table;
 
 import java.io.Serializable;
@@ -19,7 +20,7 @@ public class TaskEty implements Serializable{
     private String boot_address;//private String string",
     private String create_time;// 0,
     private String download_link;//private String string",
-    @Id(autoincrement = false)
+    @Column(name = "id")
     private int id;// 0,
     private int inspect_type = 1;// 1自动审核 2手动审核
     private String package_names;//private String string",

+ 53 - 0
app/src/main/java/com/sheep/gamegroup/model/entity/TaskListen.java

@@ -0,0 +1,53 @@
+package com.sheep.gamegroup.model.entity;
+
+import org.xutils.db.annotation.Column;
+import org.xutils.db.annotation.Table;
+
+import java.io.Serializable;
+
+/**
+ * Created by ljy on 2018/5/12.
+ */
+
+@Table(name = "task_listen")
+public class TaskListen implements Serializable {
+    @Column(name = "id",isId = true,autoGen = false,property = "NOT NULL")
+    private int id;
+    @Column(name = "package_names")
+    private String package_names;//private String string",
+    @Column(name = "release_task_id")
+    private int release_task_id;
+
+    public TaskListen() {
+    }
+
+    public TaskListen(int id, String package_names, int release_task_id) {
+        this.id = id;
+        this.package_names = package_names;
+        this.release_task_id = release_task_id;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getPackage_names() {
+        return package_names;
+    }
+
+    public void setPackage_names(String package_names) {
+        this.package_names = package_names;
+    }
+
+    public int getRelease_task_id() {
+        return release_task_id;
+    }
+
+    public void setRelease_task_id(int release_task_id) {
+        this.release_task_id = release_task_id;
+    }
+}

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

@@ -19,6 +19,7 @@ import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.TaskEty;
+import com.sheep.gamegroup.model.entity.TaskListen;
 import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.entity.WithdrawalEty;
 import com.sheep.jiuyan.samllsheep.R;
@@ -443,9 +444,9 @@ public class CommonUtil {
     public void setTAskEnty(TaskEty tAskEnty){
         try {
             if(tAskEnty.getInspect_type() == 3){
-                SheepApp.getInstance().setTaskEty(tAskEnty);
+
                 MyDbManager.getInstance()
-                        .saveOrUpdate(tAskEnty);
+                        .saveOrUpdate(new TaskListen(tAskEnty.getId(), tAskEnty.getPackage_names(), tAskEnty.getRelease_task_id()));
             }else {
                 MyDbManager.getInstance()
                         .removeTask();
@@ -456,5 +457,6 @@ public class CommonUtil {
                     .removeTask();
             SheepApp.getInstance().setTaskEty(null);
         }
+//        SheepApp.getInstance().setTaskEty(tAskEnty);
     }
 }

+ 7 - 6
app/src/main/java/com/sheep/gamegroup/util/MyDbManager.java

@@ -6,6 +6,7 @@ import android.os.Handler;
 import com.sheep.gamegroup.model.entity.AppRecord;
 import com.sheep.gamegroup.model.entity.NewbieTaskRecord;
 import com.sheep.gamegroup.model.entity.TaskEty;
+import com.sheep.gamegroup.model.entity.TaskListen;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
@@ -98,12 +99,12 @@ public class MyDbManager {
     /**
      * 查找指定表
      */
-    public TaskEty dbFindTask() {
-        TaskEty taskEty = null;
+    public TaskListen dbFindTask() {
+        TaskListen taskEty = null;
         try{
-            taskEty = db.findFirst(TaskEty.class);
-            if(taskEty == null ){
-                taskEty = new TaskEty();
+            List<TaskListen> taskEties = db.findAll(TaskListen.class);
+            if(taskEties != null && taskEties.size()>0){
+                taskEty = taskEties.get(0);
             }
         }catch (Exception e){
             e.printStackTrace();
@@ -180,7 +181,7 @@ public class MyDbManager {
 
     public void removeTask(){
         try{
-            db.dropTable(TaskEty.class);
+            db.dropTable(TaskListen.class);
         }catch (Exception e){
             e.printStackTrace();
         }

+ 2 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -36,6 +36,7 @@ import com.sheep.gamegroup.model.entity.Ext;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 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.TaskReleaseEty;
 import com.sheep.gamegroup.model.util.EntityUtils;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
@@ -44,6 +45,7 @@ import com.sheep.gamegroup.presenter.TaskDetailPresenter;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;

+ 4 - 3
app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -12,6 +12,7 @@ import com.sheep.gamegroup.di.components.NetComponent;
 import com.sheep.gamegroup.di.modules.NetModule;
 import com.sheep.gamegroup.model.entity.AppRecord;
 import com.sheep.gamegroup.model.entity.TaskEty;
+import com.sheep.gamegroup.model.entity.TaskListen;
 import com.sheep.gamegroup.util.ConnectAddress;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
@@ -31,7 +32,6 @@ public class SheepApp extends BaseApplication {
 
 
     private NetComponent netComponent;
-    private TaskEty taskEty;
     private AppRecord lastAppRecord;
     private long lastTime;
 
@@ -50,12 +50,13 @@ public class SheepApp extends BaseApplication {
     public void setLastTime(long lastTime) {
         this.lastTime = lastTime;
     }
+    private TaskListen taskEty;
 
-    public TaskEty getTaskEty() {
+    public TaskListen getTaskEty() {
         return MyDbManager.getInstance().dbFindTask();
     }
 
-    public void setTaskEty(TaskEty taskEty) {
+    public void setTaskEty(TaskListen taskEty) {
         this.taskEty = taskEty;
     }
 

+ 2 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/service/FloatService.java

@@ -23,6 +23,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.entity.AppRecord;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.TaskEty;
+import com.sheep.gamegroup.model.entity.TaskListen;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LocationUtils;
@@ -106,7 +107,7 @@ public class FloatService extends Service implements View.OnClickListener {
     }
 
     private void checkTask() {
-        TaskEty taskEty = SheepApp.getInstance().getTaskEty();
+        TaskListen taskEty = SheepApp.getInstance().getTaskEty();
         if(taskEty != null) {
             if(Jump2View.getInstance().startAccessibility(getApplication())){
                 if(count > (BuildConfig.DEBUG ? 6 : 60)){//每过一分钟提交一次任务