发版本:3.2.6

修复device未拼接的问题

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

@@ -307,7 +307,7 @@ public interface ApiService {
      */
     @GET("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);
+                                       @Query("remark") String remark, @Query("package_name") String package_name, @Query("status") String status, @Query("device") String device);
 //    @GET("app/accepted_task/status")
 //    Observable<BaseMessage> taskStatus(@Body JSONObject jsonObject);
 

app/src/main/java/com/sheep/gamegroup/presenter/TaskDetailPresenter.java

@@ -29,7 +29,7 @@ public class TaskDetailPresenter implements TaskDetailContract.Presenter {
     @Override
     public void taskStatus(JSONObject jsonObject) {
         apiService.taskStatus(jsonObject.getInteger("id"),jsonObject.getString("screenshots"),
-                jsonObject.getString("remark"),jsonObject.getString("package_name"),jsonObject.getString("status"))
+                jsonObject.getString("remark"),jsonObject.getString("package_name"),jsonObject.getString("status"),jsonObject.getString("device"))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {

app/src/main/java/com/sheep/gamegroup/presenter/TaskListPresenter.java

@@ -47,7 +47,7 @@ public class TaskListPresenter implements TaskListContract.Presenter {
     public void taskStatus(JSONObject jsonObject) {
 
         apiService.taskStatus(jsonObject.getInteger("id"),jsonObject.getString("screenshots"),
-                jsonObject.getString("remark"),jsonObject.getString("package_name"),jsonObject.getString("status"))
+                jsonObject.getString("remark"),jsonObject.getString("package_name"),jsonObject.getString("status"),jsonObject.getString("device"))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {

app/src/main/java/com/sheep/gamegroup/util/upfile/UpFileUtils.java

@@ -72,11 +72,12 @@ public class UpFileUtils {
             if ((file = new File(photos.get(index))).exists()) {
                 File newFile = null;
                 boolean convertFile = false;
+                boolean needDecodeImage = action1 != null;
                 if(ListenerShotService.IS_RECORD_PATH) {
                     try {
                         //是否需要转换图片：不启用上传所有图片时，或者记录到图片时需要转换
-                        boolean needConvertImage = !DataUtil.IS_USE_ALL_IMAGE || (action1 != null && action1.call(ICallBack.IS_RECORD, file.getAbsolutePath()));
-                        if(needConvertImage) {
+                        needDecodeImage = action1 != null && (!DataUtil.IS_USE_ALL_IMAGE || action1.call(ICallBack.IS_RECORD, file.getAbsolutePath()));
+                        if(needDecodeImage) {
                             if (!Kfzssafe.isPng(file.getAbsolutePath())) {//非png图片才转换
                                 String toFilePath = String.format(Locale.CHINA, "%s%s_%d.png", file.getParent(), File.separator, System.currentTimeMillis());
                                 FileUtil.convertImage(file.getAbsolutePath(), toFilePath, Bitmap.CompressFormat.PNG);
@@ -108,7 +109,7 @@ public class UpFileUtils {
                     }
                 }
                 try {
-                    if(action1 != null)
+                    if(needDecodeImage)
                         action1.call(ICallBack.DECODE_PNG, newFile.getAbsolutePath(), size, index);
                 } catch (Exception e) {
                     e.printStackTrace();

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

@@ -393,9 +393,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 case TASK_TYPE_GAME_XIAO_MI://游戏任务
                     setFirstBtnState();
                     break;
-                default://试玩任务直接设置下载状态
+                default://试玩任务直接设置下线状态
                     setFirstBtnState();
-                    if (type == DownloadUtil.STATUS_INSTALLED && gettaskAcceptedEty != null && gettaskAcceptedEty.getStatus() != 3) {//已经安装并且有任务未完成的情况下
+                    if (type == DownloadUtil.STATUS_INSTALLED && gettaskAcceptedEty != null && gettaskAcceptedEty.getStatus() != TaskAcceptedEty.STATUS_FINISHED) {//已经安装并且有任务未完成的情况下
                         if (TextUtils.isEmpty(gettaskAcceptedEty.getScreenshots()) || gettaskAcceptedEty.getLower_num() > 0) {//没有提交过截图或者已经提交过一次 下线失败后提交
                         } else {//提交过一次，但是审核失败或者没有审核就下线了
                             btnUpImag.setText("重新提交");
@@ -1230,7 +1230,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         jsonObject.put("screenshots", data + "");
         jsonObject.put("remark", /*taskEty.getRemarks() +*/ "");
         jsonObject.put("package_name", taskEty.getPackage_names() + "");
-        jsonObject.put("status", 7 + "");
+        jsonObject.put("status", TaskAcceptedEty.STATUS_SUBMIT + "");
         jsonObject.put("device", SysAppUtil.getUserAgentOrDeviceInfo());
         presenter.taskStatus(jsonObject);
         taskEty.setScreenshots(data);

gradle.properties

@@ -17,8 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=3.2.5
-VERSION_CODE=3002005
+VERSION_NAME=3.2.6
+VERSION_CODE=3002006
 ANDROID_COMPILE_SDK_VERSION=27
 ANDROID_BUILD_TOOLS_VERSION=27.0.2
 ANDROID_MIN_SDK_VERSION=18