[8.5.0]

[singapore]
[上报升级结果]

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeApiService.kt

@@ -1,5 +1,6 @@
 package com.zhjt.mogo_core_function_devatools.upgrade
 
+import com.mogo.eagle.core.data.BaseData
 import com.mogo.eagle.core.data.deva.bindingcar.*
 import io.reactivex.*
 import okhttp3.*
@@ -30,4 +31,13 @@ interface UpgradeApiService {
     @POST("api/deploy/openapi/checkForAppUpdate")
     suspend fun getUpgradeInfo4Myflow(@Body requestBody: UpgradeAppMyFlowRequest): UpgradeAppInfo
 
+    /**
+     * 获取升级信息
+     * , @Query("resources") String i
+     * @return [UpgradeAppInfo]
+     */
+    @Headers("Content-Type:application/json;charset=UTF-8")
+    @POST("api/deploy/openapi/updateAppTask")
+    suspend fun updateAppTask(@Body requestBody: UpgradeAppResultMyFlowRequest): BaseData
+
 }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt

@@ -307,6 +307,23 @@ class UpgradeAppNetWorkManager private constructor() {
                     }
                 }
             } else {
+                if(result.versionCode == versionCode){
+                    val url_md5 = SharedPrefsMgr.getInstance().getString(SharedPrefsConstants.APP_UPGRADE_CONTENT_MYFLOW_CHECKMD5)
+                    if (url_md5.startsWith(result.appUrl)) {
+                        try {
+                            val request = UpgradeAppResultMyFlowRequest(result.taskItemId, 40)
+                            val info = mUpgradeMyFlowApiService.updateAppTask(request)
+                            if(info.code==200){
+                                Log.d(TAG,"MyFLow网络请求上报成功：${info}")
+                                SharedPrefsMgr.getInstance().putString(SharedPrefsConstants.APP_UPGRADE_CONTENT_MYFLOW_CHECKMD5,"")
+                            }
+                            Log.d(TAG,"MyFLow网络请求上报返回：${info}")
+                        }catch (e:Exception){
+                            Log.d(SceneConstant.M_DEVA + TAG, "MyFlow上报myflow 失败下次继续")
+                            e.printStackTrace()
+                        }
+                    }
+                }
                 deleteApkFile()
             }
         } else {

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppResultMyFlowRequest.java

@@ -0,0 +1,37 @@
+package com.zhjt.mogo_core_function_devatools.upgrade;
+
+import java.io.Serializable;
+
+/**
+ * @author lixiaopeng
+ * @description 获取app升级信息
+ * @since: 11/15/21
+ */
+public class UpgradeAppResultMyFlowRequest implements Serializable {
+    private Long taskItemId;
+    private Long status;
+
+    public UpgradeAppResultMyFlowRequest() {
+    }
+
+    public UpgradeAppResultMyFlowRequest(Long taskItemId, Long status) {
+        this.taskItemId = taskItemId;
+        this.status = status;
+    }
+
+    public Long getTaskItemId() {
+        return taskItemId;
+    }
+
+    public void setTaskItemId(Long taskItemId) {
+        this.taskItemId = taskItemId;
+    }
+
+    public Long getStatus() {
+        return status;
+    }
+
+    public void setStatus(Long status) {
+        this.status = status;
+    }
+}

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/bindingcar/AppInfo.java

@@ -21,6 +21,7 @@ public class AppInfo implements Serializable {
     private String beginTime;
     private String endTime;
     private String appFileName;
+    private long taskItemId;
 
     @SerializedName("patchInfoView")
     public PatchInfo patchInfo;
@@ -105,6 +106,14 @@ public class AppInfo implements Serializable {
         this.appFileName = appFileName;
     }
 
+    public long getTaskItemId() {
+        return taskItemId;
+    }
+
+    public void setTaskItemId(long taskItemId) {
+        this.taskItemId = taskItemId;
+    }
+
     @Override
     public String toString() {
         return "AppInfo{" +

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/bindingcar/AppInfoMyFlow.kt

@@ -9,7 +9,7 @@ data class AppInfoMyFlow(
     val notifyMsg: String,
     val product: String,
     val sn: String,
-    val taskItemId: Int?,
+    val taskItemId: Long?,
     val versionCode: Int?,
     val versionNo: String?,
     val encMd5: String?,
@@ -25,6 +25,7 @@ data class AppInfoMyFlow(
         appInfo.installContent = notifyMsg
         appInfo.installType = "1"
         appInfo.appFileName = product
+        appInfo.taskItemId = taskItemId?:0L
         return appInfo
     }
 }