update 整理服务端接口

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/ApiService.kt

@@ -16,324 +16,305 @@ import okhttp3.MultipartBody
 class ApiService {
   companion object {
 
-    // 获取短信验证码
-    fun sendMsgCode(apiCallback: IMobileLoginCallback, requestParams: HashMap<String, String?>) {
+    // 文件上传
+    fun uploadFile(apiCallback: IUploadFileCallback, requestParams: MultipartBody.Part) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
-      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .sendMsgCode(publicParamsMap, privateParamsMap)
+        .uploadFile(publicParamsMap, requestParams)
         .compose(TransformUtil.defaultSchedulers())
         .subscribe(object : HttpResultSubscriber<Any?>() {
           override fun onSuccess(result: HttpResult<Any?>?) {
-            apiCallback.sendSmsCodeCallBack(result)
+            apiCallback.uploadFileCallBack(result)
           }
 
           override fun onFailer(result: HttpResult<Any?>?) {
-            apiCallback.sendSmsCodeCallBack(result)
+            apiCallback.uploadFileCallBack(result)
           }
+
         })
     }
 
-    // 手机号登录接口
-    fun mobileLogin(apiCallback: IMobileLoginCallback, requestParams: HashMap<String, String?>) {
+    // pushToken绑定接口
+    fun pushTokenAndroid(requestParams: HashMap<String, String?>) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
       val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .mobileLogin(publicParamsMap, privateParamsMap)
+        .pushTokenAndroid(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
-        .subscribe(object : HttpResultSubscriber<MobileLoginBean.Response?>() {
-          override fun onSuccess(result: HttpResult<MobileLoginBean.Response?>?) {
-            apiCallback.mobileLoginCallBack(result)
+        .subscribe(object : HttpResultSubscriber<Any?>() {
+          override fun onSuccess(result: HttpResult<Any?>?) {
+
           }
 
-          override fun onFailer(result: HttpResult<MobileLoginBean.Response?>?) {
-            apiCallback.mobileLoginCallBack(result)
+          override fun onFailer(result: HttpResult<Any?>?) {
+
           }
         })
     }
 
-    // 用户退出登录接口
-    fun userLogout(apiCallback: IUserLogoutCallBack) {
+    // 获取短信验证码
+    fun sendMsgCode(apiCallback: IMobileLoginCallback, requestParams: HashMap<String, String?>) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
-      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(HashMap(), timeStamp)
+      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .userLogout(publicParamsMap, privateParamsMap)
+        .sendMsgCode(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
         .subscribe(object : HttpResultSubscriber<Any?>() {
           override fun onSuccess(result: HttpResult<Any?>?) {
-            apiCallback.userLogoutSuccess()
+            apiCallback.sendSmsCodeCallBack(result)
           }
 
           override fun onFailer(result: HttpResult<Any?>?) {
+            apiCallback.sendSmsCodeCallBack(result)
           }
         })
     }
 
-    // 106 获取生活号列表接口
-    fun getLifeAccountList(apiCallback: IGetLifeAccountListCallback) {
+    // 手机号登录接口
+    fun mobileLogin(apiCallback: IMobileLoginCallback, requestParams: HashMap<String, String?>) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
-      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(HashMap(), timeStamp)
+      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .getAccountList(publicParamsMap, privateParamsMap)
+        .mobileLogin(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
-        .subscribe(object : HttpResultSubscriber<ArrayList<LifeAccountItemBean.Response>?>() {
-          override fun onSuccess(result: HttpResult<ArrayList<LifeAccountItemBean.Response>?>?) {
-            apiCallback.getLifeAccountListSuccess(result?.result)
+        .subscribe(object : HttpResultSubscriber<MobileLoginBean.Response?>() {
+          override fun onSuccess(result: HttpResult<MobileLoginBean.Response?>?) {
+            apiCallback.mobileLoginCallBack(result)
           }
 
-          override fun onFailer(result: HttpResult<ArrayList<LifeAccountItemBean.Response>?>?) {
-            apiCallback.getLifeAccountListFailure(result?.reason)
+          override fun onFailer(result: HttpResult<MobileLoginBean.Response?>?) {
+            apiCallback.mobileLoginCallBack(result)
           }
         })
     }
 
-    // 人脸检测接口
-    fun identifyIdOcrVerify(apiCallback: IdentifyIdOcrVerifyCallback, requestParams: HashMap<String, String?>) {
+    // 用户退出登录接口
+    fun userLogout(apiCallback: IUserLogoutCallBack) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
-      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
+      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(HashMap(), timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .identifyIdOcrVerify(publicParamsMap, privateParamsMap)
+        .userLogout(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
-        .subscribe(object : HttpResultSubscriber<IdentifyIdOcrVerifyBean.Response?>() {
-          override fun onSuccess(result: HttpResult<IdentifyIdOcrVerifyBean.Response?>?) {
-            apiCallback.identifyIdOcrVerifySuccess(result)
+        .subscribe(object : HttpResultSubscriber<Any?>() {
+          override fun onSuccess(result: HttpResult<Any?>?) {
+            apiCallback.userLogoutSuccess()
           }
 
-          override fun onFailer(result: HttpResult<IdentifyIdOcrVerifyBean.Response?>?) {
-            apiCallback.identifyIdOcrVerifyFailure(result)
+          override fun onFailer(result: HttpResult<Any?>?) {
           }
         })
     }
 
-    // 获取人脸检测token接口
-    fun authPersonalGetToken(apiCallback: AuthPersonalGetTokenCallback, requestParams: HashMap<String, String?>) {
+    // 101 身份信息校验接口
+    fun authPersonalCheck(apiCallback: IAuthPersonalCheckCallback, requestParams: HashMap<String, String?>) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
       val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .authPersonalGetToken(publicParamsMap, privateParamsMap)
+        .authPersonalCheck(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
-        .subscribe(object : HttpResultSubscriber<AuthPersonalGetTokenBean.Response?>() {
-          override fun onSuccess(result: HttpResult<AuthPersonalGetTokenBean.Response?>?) {
-            apiCallback.getTokenSuccess(result)
+        .subscribe(object : HttpResultSubscriber<Any>() {
+          override fun onSuccess(result: HttpResult<Any>?) {
+            apiCallback.authPersonCheckSuccess()
           }
 
-          override fun onFailer(result: HttpResult<AuthPersonalGetTokenBean.Response?>?) {
+          override fun onFailer(result: HttpResult<Any>?) {
+            apiCallback.authPersonCheckFailure(result?.reason)
           }
         })
     }
 
-    // 获取金山云token接口
-    fun getKSYunToken(requestParams: HashMap<String, String?>): HttpResult<GetKSYunTokenBean.Response>? {
-      val timeStamp = System.currentTimeMillis()
-      val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
-      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
-      val res: HttpResult<Any?>? = ServiceFactory.getInstance().createService(CommonService::class.java)
-        .getKSYunToken(publicParamsMap, privateParamsMap)
-        .execute().body()
-      if (res?.code == 0) {
-        return HttpParamsUtils.rsaDecryptResult(res, object : TypeToken<GetKSYunTokenBean.Response>() {}.type)
-      } else {
-        val decodeResult = HttpResult<GetKSYunTokenBean.Response>()
-        decodeResult.code = res?.code!!
-        decodeResult.reason = res.reason
-        decodeResult.status = res.status
-        ToastUtil.showToast(YdBaseApplication.context, res.reason)
-      }
-      return null
-    }
-
-    // 获取身份证OCR接口
-    fun getIDCardOCR(apiCallback: IGetIDCardOCRCallback, requestParams: HashMap<String, String?>) {
+    // 102 活体识别成功后回调接口
+    fun authLiveIdentity(apiCallback: IAuthLiveIdentityCallback) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
-      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
+      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(HashMap(), timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .getIDCardOCR(publicParamsMap, privateParamsMap)
+        .authLiveIdentity(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
-        .subscribe(object : HttpResultSubscriber<GetIDCardOCRBean.Response>() {
-          override fun onSuccess(result: HttpResult<GetIDCardOCRBean.Response>?) {
-            apiCallback.getIDCardOCRSuccess(result?.result)
+        .subscribe(object : HttpResultSubscriber<Any?>() {
+          override fun onSuccess(result: HttpResult<Any?>?) {
+            apiCallback.authLiveIdentitySuccess()
           }
 
-          override fun onFailer(result: HttpResult<GetIDCardOCRBean.Response>?) {
-            apiCallback.getIDCardOCRFailure(result?.status)
+          override fun onFailer(result: HttpResult<Any?>?) {
+            apiCallback.authLiveIdentityFailure(result?.reason)
           }
         })
     }
 
-    // 获取金山云ObjectId
-    fun getKSYunObjectId(apiCallback: IGetKSYunObjectIdCallback, requestParams: HashMap<String, String?>) {
+    // 103 认证完成后创建生活号接口
+    fun authComplete(apiCallbackPersonal: IAuthPersonalCompleteCallback, requestParams: HashMap<String, String?>) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
       val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .getKSYunObjectId(publicParamsMap, privateParamsMap)
+        .authComplete(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
-        .subscribe(object : HttpResultSubscriber<GetKSYunObjectIdBean.Response>() {
-          override fun onSuccess(result: HttpResult<GetKSYunObjectIdBean.Response>?) {
-            apiCallback.getKSYunObjectIdSuccess(result?.result)
+        .subscribe(object : HttpResultSubscriber<AuthPersonalCompleteBean.Response?>() {
+          override fun onSuccess(result: HttpResult<AuthPersonalCompleteBean.Response?>?) {
+            apiCallbackPersonal.authPersonalCompleteSuccess(result?.result)
           }
 
-          override fun onFailer(result: HttpResult<GetKSYunObjectIdBean.Response>?) {
-            apiCallback.getKSYunObjectIdFailure(result?.status)
+          override fun onFailer(result: HttpResult<AuthPersonalCompleteBean.Response?>?) {
+            apiCallbackPersonal.authPersonalCompleteFailure(result?.reason)
           }
         })
     }
 
-    // 获取金山云Bucket
-    fun getKSYunBucket(apiCallback: IGetKSYunBucketCallback) {
+    // 104 检测是否可以个人认证，返回认证信息接口
+    fun authAuthentication(apiCallback: IAuthAuthenticationCallback) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
       val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(HashMap(), timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .getKSYunBucket(publicParamsMap, privateParamsMap)
+        .authAuthentication(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
-        .subscribe(object : HttpResultSubscriber<GetKSYunBucketBean.Response>() {
-          override fun onSuccess(result: HttpResult<GetKSYunBucketBean.Response>?) {
-            apiCallback.getKSYunBucketSuccess(result?.result)
+        .subscribe(object : HttpResultSubscriber<AuthAuthenticationBean.Response?>() {
+          override fun onSuccess(result: HttpResult<AuthAuthenticationBean.Response?>?) {
+            apiCallback.authAuthenticationSuccess(result?.result)
           }
 
-          override fun onFailer(result: HttpResult<GetKSYunBucketBean.Response>?) {
-            apiCallback.getKSYunBucketFailure(result?.status)
+          override fun onFailer(result: HttpResult<AuthAuthenticationBean.Response?>?) {
+            apiCallback.authAuthenticationFailure(result?.reason)
           }
         })
     }
 
-    // 获取金山云Bucket
-    fun businessLicenseOCR(apiCallback: IBusinessLicenseOCRCallback, requestParams: HashMap<String, String?>) {
+    // 106 获取生活号列表接口
+    fun getLifeAccountList(apiCallback: IGetLifeAccountListCallback) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
-      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
+      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(HashMap(), timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .businessLicenseOCR(publicParamsMap, privateParamsMap)
+        .getAccountList(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
-        .subscribe(object : HttpResultSubscriber<BusinessLicenseOCRBean.Response>() {
-          override fun onSuccess(result: HttpResult<BusinessLicenseOCRBean.Response>?) {
-            apiCallback.businessLicenseOCRSuccess(result?.result)
+        .subscribe(object : HttpResultSubscriber<ArrayList<LifeAccountItemBean.Response>?>() {
+          override fun onSuccess(result: HttpResult<ArrayList<LifeAccountItemBean.Response>?>?) {
+            apiCallback.getLifeAccountListSuccess(result?.result)
           }
 
-          override fun onFailer(result: HttpResult<BusinessLicenseOCRBean.Response>?) {
-            apiCallback.businessLicenseOCRFailure(result?.status)
+          override fun onFailer(result: HttpResult<ArrayList<LifeAccountItemBean.Response>?>?) {
+            apiCallback.getLifeAccountListFailure(result?.reason)
           }
         })
     }
 
-    // 文件上传
-    fun uploadFile(apiCallback: IUploadFileCallback, requestParams: MultipartBody.Part) {
+    // 201 身份证OCR接口
+    fun getIDCardOCR(apiCallback: IGetIDCardOCRCallback, requestParams: HashMap<String, String?>) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
+      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .uploadFile(publicParamsMap, requestParams)
+        .getIDCardOCR(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
-        .subscribe(object : HttpResultSubscriber<Any?>() {
-          override fun onSuccess(result: HttpResult<Any?>?) {
-            apiCallback.uploadFileCallBack(result)
+        .subscribe(object : HttpResultSubscriber<GetIDCardOCRBean.Response>() {
+          override fun onSuccess(result: HttpResult<GetIDCardOCRBean.Response>?) {
+            apiCallback.getIDCardOCRSuccess(result?.result)
           }
 
-          override fun onFailer(result: HttpResult<Any?>?) {
-            apiCallback.uploadFileCallBack(result)
+          override fun onFailer(result: HttpResult<GetIDCardOCRBean.Response>?) {
+            apiCallback.getIDCardOCRFailure(result?.reason)
           }
-
         })
     }
 
-    // pushToken绑定接口
-    fun pushTokenAndroid(requestParams: HashMap<String, String?>) {
+    // 202 获取人脸检测token接口
+    fun authPersonalGetToken(apiCallback: AuthPersonalGetTokenCallback, requestParams: HashMap<String, String?>) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
       val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .pushTokenAndroid(publicParamsMap, privateParamsMap)
+        .authPersonalGetToken(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
-        .subscribe(object : HttpResultSubscriber<Any?>() {
-          override fun onSuccess(result: HttpResult<Any?>?) {
-
+        .subscribe(object : HttpResultSubscriber<AuthPersonalGetTokenBean.Response?>() {
+          override fun onSuccess(result: HttpResult<AuthPersonalGetTokenBean.Response?>?) {
+            apiCallback.getTokenSuccess(result)
           }
 
-          override fun onFailer(result: HttpResult<Any?>?) {
-
+          override fun onFailer(result: HttpResult<AuthPersonalGetTokenBean.Response?>?) {
           }
         })
     }
 
-    // 101 身份信息校验接口
-    fun authPersonalCheck(apiCallback: IAuthPersonalCheckCallback, requestParams: HashMap<String, String?>) {
+    // 203 人脸检测接口
+    fun identifyIdOcrVerify(apiCallback: IdentifyIdOcrVerifyCallback, requestParams: HashMap<String, String?>) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
       val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .authPersonalCheck(publicParamsMap, privateParamsMap)
+        .identifyIdOcrVerify(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
-        .subscribe(object : HttpResultSubscriber<Any>() {
-          override fun onSuccess(result: HttpResult<Any>?) {
-            apiCallback.authPersonCheckSuccess()
+        .subscribe(object : HttpResultSubscriber<IdentifyIdOcrVerifyBean.Response?>() {
+          override fun onSuccess(result: HttpResult<IdentifyIdOcrVerifyBean.Response?>?) {
+            apiCallback.identifyIdOcrVerifySuccess(result)
           }
 
-          override fun onFailer(result: HttpResult<Any>?) {
-            apiCallback.authPersonCheckFailure(result?.reason)
+          override fun onFailer(result: HttpResult<IdentifyIdOcrVerifyBean.Response?>?) {
+            apiCallback.identifyIdOcrVerifyFailure(result)
           }
         })
     }
 
-    // 102 活体识别成功后回调接口
-    fun authLiveIdentity(apiCallback: IAuthLiveIdentityCallback) {
+    // 204 营业执照OCR接口
+    fun businessLicenseOCR(apiCallback: IBusinessLicenseOCRCallback, requestParams: HashMap<String, String?>) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
-      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(HashMap(), timeStamp)
+      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .authLiveIdentity(publicParamsMap, privateParamsMap)
+        .businessLicenseOCR(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
-        .subscribe(object : HttpResultSubscriber<Any?>() {
-          override fun onSuccess(result: HttpResult<Any?>?) {
-            apiCallback.authLiveIdentitySuccess()
+        .subscribe(object : HttpResultSubscriber<BusinessLicenseOCRBean.Response>() {
+          override fun onSuccess(result: HttpResult<BusinessLicenseOCRBean.Response>?) {
+            apiCallback.businessLicenseOCRSuccess(result?.result)
           }
 
-          override fun onFailer(result: HttpResult<Any?>?) {
-            apiCallback.authLiveIdentityFailure(result?.reason)
+          override fun onFailer(result: HttpResult<BusinessLicenseOCRBean.Response>?) {
+            apiCallback.businessLicenseOCRFailure(result?.reason)
           }
         })
     }
 
-    // 103 认证完成后创建生活号
-    fun authComplete(apiCallbackPersonal: IAuthPersonalCompleteCallback, requestParams: HashMap<String, String?>) {
+    // 301 获取金山云token接口
+    fun getKSYunToken(requestParams: HashMap<String, String?>): HttpResult<GetKSYunTokenBean.Response>? {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
       val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
-      ServiceFactory.getInstance().createService(CommonService::class.java)
-        .authComplete(publicParamsMap, privateParamsMap)
-        .compose(TransformUtil.defaultSchedulers())
-        .subscribe(object : HttpResultSubscriber<AuthPersonalCompleteBean.Response?>() {
-          override fun onSuccess(result: HttpResult<AuthPersonalCompleteBean.Response?>?) {
-            apiCallbackPersonal.authPersonalCompleteSuccess(result?.result)
-          }
-
-          override fun onFailer(result: HttpResult<AuthPersonalCompleteBean.Response?>?) {
-            apiCallbackPersonal.authPersonalCompleteFailure(result?.reason)
+      val res: HttpResult<Any?>? = ServiceFactory.getInstance().createService(CommonService::class.java)
+        .getKSYunToken(publicParamsMap, privateParamsMap)
+        .execute().body()
+      if (res?.code == 0) {
+        return HttpParamsUtils.rsaDecryptResult(res, object : TypeToken<GetKSYunTokenBean.Response>() {}.type)
+      } else {
+        val decodeResult = HttpResult<GetKSYunTokenBean.Response>()
+        decodeResult.code = res?.code!!
+        decodeResult.reason = res.reason
+        decodeResult.status = res.status
+        ToastUtil.showToast(YdBaseApplication.context, res.reason)
       }
-        })
+      return null
     }
 
-    // 104 检测是否可以个人认证，返回认证信息
-    fun authAuthentication(apiCallback: IAuthAuthenticationCallback) {
+    // 302 获取金山云ObjectId和Bucket接口
+    fun getKSYunObjectId(apiCallback: IGetKSYunObjectIdCallback, requestParams: HashMap<String, String?>) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
-      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(HashMap(), timeStamp)
+      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .authAuthentication(publicParamsMap, privateParamsMap)
+        .getKSYunObjectId(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
-        .subscribe(object : HttpResultSubscriber<AuthAuthenticationBean.Response?>() {
-          override fun onSuccess(result: HttpResult<AuthAuthenticationBean.Response?>?) {
-            apiCallback.authAuthenticationSuccess(result?.result)
+        .subscribe(object : HttpResultSubscriber<GetKSYunObjectIdBean.Response>() {
+          override fun onSuccess(result: HttpResult<GetKSYunObjectIdBean.Response>?) {
+            apiCallback.getKSYunObjectIdSuccess(result?.result)
           }
 
-          override fun onFailer(result: HttpResult<AuthAuthenticationBean.Response?>?) {
-            apiCallback.authAuthenticationFailure(result?.reason)
+          override fun onFailer(result: HttpResult<GetKSYunObjectIdBean.Response>?) {
+            apiCallback.getKSYunObjectIdFailure(result?.reason)
           }
         })
     }

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/CommonService.kt

@@ -44,12 +44,6 @@ interface CommonService {
     @QueryMap requestParams: Map<String, String?>
   ): Observable<HttpResult<Any?>>
 
-  @GET(URLs.getKSYunBucket)
-  fun getKSYunBucket(
-    @QueryMap commonParams: Map<String, String>,
-    @QueryMap requestParams: Map<String, String?>
-  ): Observable<HttpResult<Any?>>
-
   @Headers("Content-Type: application/json")
   @POST(URLs.businessLicenseOCR)
   fun businessLicenseOCR(

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/GetKSYunBucketBean.kt

-package com.yidian.shenghuoquan.newscontent.http.httpbean
-
-/**
- * author: yinjiacheng
- * date: 5/23/21 12:13 PM
- * description: 获取金山云Bucket
- */
-class GetKSYunBucketBean {
-    data class Response(val bucket: String)
-}
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/IGetKSYunBucketCallback.kt

-package com.yidian.shenghuoquan.newscontent.http.httpbean
-
-/**
- * author: yinjiacheng
- * date: 5/23/21 12:18 PM
- * description: 获取金山云Bucket
- */
-interface IGetKSYunBucketCallback {
-    fun getKSYunBucketSuccess(result: GetKSYunBucketBean.Response?)
-    fun getKSYunBucketFailure(message: String?)
-}
\ No newline at end of file