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

app/src/main/java/com/sheep/gamegroup/model/entity/TaskEty.java

@@ -2,6 +2,10 @@ package com.sheep.gamegroup.model.entity;
 
 import com.alibaba.fastjson.JSONObject;
 
+import org.greenrobot.greendao.annotation.Id;
+import org.greenrobot.greendao.annotation.Unique;
+import org.xutils.db.annotation.Table;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -10,10 +14,12 @@ import java.util.List;
  * Created by ljy on 2018/3/20.
  */
 
+@Table(name = "task")
 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)
     private int id;// 0,
     private int inspect_type = 1;// 1自动审核　2手动审核
     private String package_names;//private String string",

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

@@ -444,10 +444,16 @@ public class CommonUtil {
         try {
             if(tAskEnty.getInspect_type() == 3){
                 SheepApp.getInstance().setTaskEty(tAskEnty);
+                MyDbManager.getInstance()
+                        .saveOrUpdate(tAskEnty);
             }else {
+                MyDbManager.getInstance()
+                        .removeTask();
                 SheepApp.getInstance().setTaskEty(null);
             }
         }catch (Exception e){
+            MyDbManager.getInstance()
+                    .removeTask();
             SheepApp.getInstance().setTaskEty(null);
         }
     }

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

@@ -186,14 +186,14 @@ public class LocationUtils {
                 public void onSuccessLocation(Location location) {
                     if (location != null) {
                         logitudeLStr = location.getLongitude() + "," +location.getLatitude();
-                        Toast.makeText(context, "gps onSuccessLocation location:  lat==" + location.getLatitude() + "     lng==" + location.getLongitude(), Toast.LENGTH_SHORT).show();
+//                        Toast.makeText(context, "gps onSuccessLocation location:  lat==" + location.getLatitude() + "     lng==" + location.getLongitude(), Toast.LENGTH_SHORT).show();
                     } else {
 //                        Toast.makeText(context, "gps location is null", Toast.LENGTH_SHORT).show();
                     }
                 }
             });
         } else {
-            Toast.makeText(context, "gps location: lat==" + gps.getLatitude() + "  lng==" + gps.getLongitude(), Toast.LENGTH_SHORT).show();
+//            Toast.makeText(context, "gps location: lat==" + gps.getLatitude() + "  lng==" + gps.getLongitude(), Toast.LENGTH_SHORT).show();
         }
         return logitudeLStr;
     }

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

@@ -5,6 +5,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.UserEntity;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
@@ -94,6 +95,21 @@ public class MyDbManager {
         }
         return users;
     }
+    /**
+     * 查找指定表
+     */
+    public TaskEty dbFindTask() {
+        TaskEty taskEty = null;
+        try{
+            taskEty = db.findFirst(TaskEty.class);
+            if(taskEty == null ){
+                taskEty = new TaskEty();
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return taskEty;
+    }
 
 
     /**
@@ -161,4 +177,12 @@ public class MyDbManager {
 //        }
 //        return time;
 //    }
+
+    public void removeTask(){
+        try{
+            db.dropTable(TaskEty.class);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }