任务列表刷新问题，其他界面修改。重叠修改

app/build.gradle

@@ -77,6 +77,7 @@ android {
             buildConfigField "boolean", "KF_DEBUG", 'true'
 //            buildConfigField "String", "API_DOMAIN", '"10.8.210.229:8081"'
             buildConfigField "String", "API_DOMAIN", '"test.bdmapp.kfzs.com"'
+//            buildConfigField "String", "APP_URL", '"http://10.8.220.5:8080/"'//张伟
             buildConfigField "String", "APP_URL", '"http://test.sheep.kfzs.com/"'
 //            buildConfigField "String", "API_DOMAIN", '"10.8.210.229:8081"'
             buildConfigField "String", "JFSC_DOMAIN", '"http://10.8.210.190:8080/"'//积分商城

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -309,6 +309,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         upview1.setEasyViews(views);
         if(!upview1.isAutoStart()){
+            upview1.stopScroll();
             upview1.startScroll();
         }
 

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -213,7 +213,7 @@ public interface ApiService {
     /**
      * 修改任务进度
      */
-    @GET(V1 + "/app/accepted_task/status")
+    @GET(V1 + "app/accepted_task/status")
     Observable<BaseMessage> taskStatus(@Query("id") int id,@Query("screenshots") String screenshots,
         @Query("remark") String remark,@Query("package_name") String package_name,@Query("status") String status);
 //    @GET(V1 + "app/accepted_task/status")
@@ -224,14 +224,14 @@ public interface ApiService {
      * @param jsonObject
      * @return
      */
-    @PUT(V1 + "/app/accepted_task/download_task_notify/")
+    @PUT(V1 + "app/accepted_task/download_task_notify/")
     Observable<BaseMessage> taskDownloadNotify(@Body JSONObject jsonObject);
 
     /**
      * 获取可用余额
      * @return
      */
-    @GET(V1 +"/app/user/get_can_withdraw_amount")
+    @GET(V1 +"app/user/get_can_withdraw_amount")
     Observable<BaseMessage> getCanWithdrawAmount();
 
     @GET(V1 + "loan/userRecord")

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -63,8 +63,14 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
                     Jump2View.getInstance().goLoginView(SheepApp.mContext, "");
                     return;
                 }
-//                BaseMessage baseMessage = JSONObject.parseObject(BaseMessageConverter.decrypt(throwable.message), BaseMessage.class);
-                BaseMessage baseMessage = JSONObject.parseObject(throwable.message, BaseMessage.class);
+                BaseMessage baseMessage;
+                if(throwable.message.startsWith("{")){
+                    baseMessage = JSONObject.parseObject(throwable.message, BaseMessage.class);
+                }else {
+                    baseMessage = JSONObject.parseObject(BaseMessageConverter.decrypt(throwable.message), BaseMessage.class);
+                }
+
+
                 if(baseMessage.getCode() == 0)
                     baseMessage.setCode(throwable.code);
                 onError(baseMessage);
@@ -73,6 +79,7 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
                 onError(new ExceptionHandle.ResponeThrowable(e,ExceptionHandle.ERROR.UNKNOWN));
             }
         }catch (Exception er){
+            onError(new ExceptionHandle.ResponeThrowable(e,ExceptionHandle.ERROR.UNKNOWN));
             er.printStackTrace();
         }
     }

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

@@ -1,5 +1,7 @@
 package com.sheep.gamegroup.util;
 
+import android.os.Handler;
+
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.jiuyan.samllsheep.download.DownloadInfo;
 
@@ -39,10 +41,20 @@ public class MyDbManager {
     /**
      *保存或更新表表
      */
-    public void saveOrUpdateUser(UserEntity user) throws DbException {
+    public void saveOrUpdateUser(final UserEntity user) throws DbException {
         if(user != null){
             deleteTable(UserEntity.class);//先清空表
             db.saveOrUpdate(user);
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }, 2000);
+
         }
 
     }

app/src/main/java/com/sheep/gamegroup/view/activity/DialogActivity.java

@@ -327,10 +327,10 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                         Build.VERSION.SDK_INT, task_entity.getIcon(), task_entity.getPackage_size(),task_entity.getAcceptedTaskId(), 1);
 
         }
-        if(downLoadInfo.getMGameID() == null || downLoadInfo.getMGameID() == 0){
-            downLoadInfo.setMGameID(task_entity.getAcceptedTaskId());
-            mDownloadTaskService.addDownloadTask(downLoadInfo);
-        }
+//        if(downLoadInfo.getMGameID() == null || downLoadInfo.getMGameID() == 0){
+//            downLoadInfo.setMGameID(task_entity.getAcceptedTaskId());
+//            mDownloadTaskService.addDownloadTask(downLoadInfo);
+//        }
         type = 0;
         if(task_entity.getRunTask() == 0){//开始任务
             buttonStr = "开始任务";

app/src/main/java/com/sheep/gamegroup/view/activity/PersonalCenterAct.java

@@ -148,7 +148,7 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
             SpUtils.savePhone(SheepApp.mContext, userEntity.getMobile());
             SpUtils.saveWeixin(SheepApp.mContext, userEntity.getWx_nickname());
             MyDbManager.getInstance().saveOrUpdateUser(userEntity);
-//            userEntity = MyDbManager.getInstance().dbFindUser();
+            UserEntity userEntitys = MyDbManager.getInstance().dbFindUser();
             Log.e("------userEntity",userEntity.getNickname()+"|"+userEntity.getMobile()+"");
         } catch (Exception e) {
             e.printStackTrace();

app/src/main/java/com/sheep/gamegroup/view/activity/PhoneAct.java

@@ -255,7 +255,7 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
             Log.e("------userEntity", userEntity.getNickname() + "|" + userEntity.getMobile() + "");
             showToast("登录成功");
 //            G.showToast(userEntity.getNickname() + "|" + userEntity.getMobile());
-        } catch (DbException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
 

app/src/main/java/com/sheep/gamegroup/view/activity/TryMakeMoneyact.java

@@ -54,6 +54,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
     TryMakeMoneyPresenter presenter;
     private Activity activity;
     private TryMakeMoneyAdp tryMakeMoneyAdp;
+    private int position = 0;
 
     Handler mhandler = new Handler(){
         @Override
@@ -61,7 +62,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
             super.handleMessage(msg);
 
             tryMakeMoneyAdp.notifyItemInserted(tryMakeMoneyAdp.getItemCount());
-            recyclerview.smoothScrollToPosition(0);//滚动到底部
+//            recyclerview.smoothScrollToPosition(0);//滚动到底部
             tryMakeMoneyAdp.notifyDataSetChanged();
         }
     };
@@ -105,27 +106,28 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
             @Override
             public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
                 super.onScrollStateChanged(recyclerView, newState);
-                int topRowVerticalPosition =
-                        (recyclerView == null || recyclerView.getChildCount() == 0) ? 0 : recyclerView.getChildAt(0).getTop();
-                refresh.setEnabled(topRowVerticalPosition >= 0);
             }
 
             @Override
             public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
-                super.onScrolled(recyclerView, dx, dy);
+
+                int topRowVerticalPosition =
+                        (recyclerView == null || recyclerView.getChildCount() == 0) ? 0 : recyclerView.getChildAt(0).getTop();
+
+                refresh.setEnabled(topRowVerticalPosition >= 0);
             }
         });
     }
 
     @Override
     public void initData() {
+        position = 0;
         tryMakeMoneyAdp.clear();
         for (int i = 0; i < 2; i++) {
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
         }
         tryMakeMoneyAdp.addHaveTask(false);
         presenter.returnTask(null);
-        presenter.releaseTask(null);
     }
 
     @Override
@@ -135,6 +137,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
 
     @Override
     public void failData2View(Object o) {
+        presenter.releaseTask(null);
 
     }
 
@@ -180,14 +183,16 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
         try{
             BaseMessage baseMessage = (BaseMessage) o;
             TaskAcceptedEty taskAcceptedEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty),0);
+            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty),position);
             tryMakeMoneyAdp.addPresenter(presenter);
             tryMakeMoneyAdp.addHaveTask(true);
 //            tryMakeMoneyAdp.notifyItemChanged(0);
             mhandler.sendEmptyMessage(0);
+            position ++;
         }catch (Exception e){
             e.printStackTrace();
         }
+        presenter.releaseTask(null);
     }
 
     @Override
@@ -220,7 +225,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
             BaseMessage baseMessage = (BaseMessage) o;
             List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
 
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyList),1);
+            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyList),position);
 //            tryMakeMoneyAdp.notifyItemChanged(1);
             mhandler.sendEmptyMessage(0);
         }catch (Exception e){

datashare/build.gradle

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

datashare/src/main/java/com/kfzs/duanduan/datashare/DDProviderHelper.java

@@ -320,14 +320,18 @@ public class DDProviderHelper {
         DownLoadInfoDao infoDao = getDaossion(context).getDownLoadInfoDao();
         DownLoadInfo downLoadInfo = infoDao
                 .queryBuilder()
-                .where(DownLoadInfoDao.Properties.MGameID.eq(info.getMGameID()))
+                .where(DownLoadInfoDao.Properties.MDownloadUrl.eq(info.getMDownloadUrl()))
                 .build()
                 .unique();
-        if (downLoadInfo == null) {
-            infoDao.insert(info);
-        } else {
-            info.setMId(downLoadInfo.getMId());
-            infoDao.update(info);
+        try{
+            if (downLoadInfo == null) {
+                infoDao.insert(info);
+            } else {
+                info.setMId(downLoadInfo.getMId());
+                infoDao.update(info);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
         }
     }
 

datashare/src/main/java/com/kfzs/duanduan/datashare/provider/download/DownLoadInfo.java

@@ -19,7 +19,7 @@ public class DownLoadInfo {
     /**
      * id
      */
-    @Id
+    @Id(autoincrement = true)
     private Long mId;
     /**
      * creat time
@@ -53,9 +53,9 @@ public class DownLoadInfo {
 
     /**
      * game id
+     @Unique
      */
     @NotNull
-    @Unique
     @Property(nameInDb = "game_id")
     private Integer mGameID;
 

datashare/src/main/java/com/kfzs/duanduan/datashare/provider/download/DownLoadInfoDao.java

@@ -55,13 +55,13 @@ public class DownLoadInfoDao extends AbstractDao<DownLoadInfo, Long> {
     public static void createTable(Database db, boolean ifNotExists) {
         String constraint = ifNotExists? "IF NOT EXISTS ": "";
         db.execSQL("CREATE TABLE " + constraint + "\"DOWN_LOAD_INFO\" (" + //
-                "\"_id\" INTEGER PRIMARY KEY ," + // 0: mId
+                "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: mId
                 "\"creat_time\" INTEGER," + // 1: mCreateTime
                 "\"download_task_id\" INTEGER," + // 2: mDownloadTaskId
                 "\"game_name\" TEXT," + // 3: mGameName
                 "\"icon_url\" TEXT," + // 4: mIconUrl
                 "\"percent\" INTEGER," + // 5: mPercent
-                "\"game_id\" INTEGER NOT NULL UNIQUE ," + // 6: mGameID
+                "\"game_id\" INTEGER NOT NULL ," + // 6: mGameID
                 "\"download_size\" REAL," + // 7: mDownloadedSize
                 "\"total_size\" REAL," + // 8: mTotalSize
                 "\"status\" INTEGER," + // 9: mStatus