update 图片服务-图片上传切换XInsight API

CommonLib/Common/src/main/java/com/yidian/common/services/ImageService.kt

@@ -16,7 +16,9 @@ import com.yidian.common.bean.LocalSelectedImageBean
 import com.yidian.common.bean.SelectedImageBean
 import com.yidian.common.bean.UploadImageBean
 import com.yidian.common.utils.GlideEngine
-import com.yidian.common.utils.KS3Core
+import com.yidian.framework.mobile.insight.manage.XInsight
+import com.yidian.framework.mobile.insight.storage.ImageUploadListener
+import com.yidian.framework.mobile.insight.storage.bean.ImageUploadBean
 import com.yidian.xarc.xrouter.ResultResolver
 import com.yidian.xpage.observer.DStackActivityManager
 import com.yidian.yac.core.zap.ZapService
@@ -250,35 +252,38 @@ class ImageService : ZapService() {
         resolver.fail(CODE_FILE_NOT_EXIST, "file not exist", "文件不存在")
         return
       }
-      KS3Core.INSTANCE.uploadObject(file, KS3Core.ObjectType.IMAGE, KS3Core.ScenarioType.COMMODITY, object : KS3Core.OnKS3TaskListener {
-        override fun onTaskStart() {
+      XInsight.uploadImage(
+        file, ScenarioType.COMMODITY.scenario,
+        object : ImageUploadListener {
+          override fun onTaskStart(tag: String?) {
 
-        }
+          }
 
-        override fun onTaskProgress(progress: Double) {
+          override fun onTaskProgress(progress: Double?, tag: String?) {
 
-        }
+          }
 
-        override fun onTaskFinish() {
+          override fun onTaskFinish(tag: String?) {
 
-        }
+          }
 
-        override fun onTaskCancel() {
+          override fun onTaskCancel(tag: String?) {
 
-        }
+          }
 
-        override fun onTaskSuccess(bucket: String?, objectKey: String?) {
-          resolver.success(JSONObject(gson.toJson(UploadImageBean(id, "${bucket}/${objectKey}"))))
-          // 删除临时文件
-          clearCache(picOriginalPath + it.data.fileName, it.data.compressPath)
-        }
+          override fun onTaskSuccess(bucket: String?, objectKey: String?, imageUploadBean: ImageUploadBean?, tag: String?) {
+            resolver.success(JSONObject(gson.toJson(UploadImageBean(id, "${bucket}/${objectKey}"))))
+            // 删除临时文件
+            clearCache(picOriginalPath + it.data.fileName, it.data.compressPath)
+          }
 
-        override fun onTaskFailure(statesCode: Int, message: String?) {
-          resolver.fail(CODE_FILE_UPLOAD_FAIL, "upload failed", "上传失败")
-          // 删除临时文件
-          clearCache(picOriginalPath + it.data.fileName, it.data.compressPath)
-        }
-      })
+          override fun onTaskFailure(code: Int, msg: String?, tag: String?) {
+            resolver.fail(CODE_FILE_UPLOAD_FAIL, "upload failed", "上传失败")
+            // 删除临时文件
+            clearCache(picOriginalPath + it.data.fileName, it.data.compressPath)
+          }
+        }, id
+      )
     } ?: resolver.fail(CODE_FILE_NOT_EXIST, "file not exist", "文件不存在")
   }
 
@@ -306,4 +311,13 @@ class ImageService : ZapService() {
     File(compressPath).apply { if (exists()) delete() }
   }
 
+  /**
+   * 业务场景类型
+   * 图片上传时需要区分
+   */
+  enum class ScenarioType(val scenario: String) {
+    // 商品
+    COMMODITY("goods")
+  }
+
 }