[提交人]：王雪伟

[提交简述] ：加入googlePay工具类
[实现方案] ：加入loading

cms/src/main/java/com/zxhl/cms/googlepay/GooglePayActivity.kt

@@ -8,6 +8,7 @@ import com.ishin.google.bean.GooglePayResult
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.R
 import com.zxhl.cms.common.base.BaseActivity
+import com.zxhl.cms.widget.LoadingDialog
 import kotlinx.android.synthetic.main.activity_google_pay.*
 
 
@@ -33,20 +34,30 @@ class GooglePayActivity : BaseActivity() {
     override fun layoutID(): Int {
         return R.layout.activity_google_pay
     }
-
+    private var mLoading: LoadingDialog? = null
     override fun init() {
+        mLoading = LoadingDialog.getLoadingDialog(
+            this,
+            getString(R.string.wait_ing2),
+            false,
+            false
+        )
         id_btn_google_pay.setOnClickListener {
+            mLoading?.show()
             googlePay?.googlePay("0.1", object : GooglePayCallBack {
                 override fun onPaySuccess(purchase: GooglePayResult) {
                     showToast("success" + purchase.orderId)
+                    mLoading?.setResult(true, "pay success", 1000)
                 }
 
                 override fun onCancel() {
                     showToast("onCancel")
+                    mLoading?.setResult(true, "pay cancel", 1000)
                 }
 
                 override fun onError(error: String) {
                     showToast("onError$error")
+                    mLoading?.setResult(true, "pay error", 1000)
                 }
             })
         }

cms/src/main/java/com/zxhl/cms/net/api/IUserInfoApi.java

@@ -2,6 +2,7 @@ package com.zxhl.cms.net.api;
 
 import com.zxhl.cms.ad.upload.model.Response;
 import com.zxhl.cms.common.NetConfig;
+import com.zxhl.cms.net.model.other.AnyEntity;
 import com.zxhl.cms.net.model.uc.AliPayEntity;
 import com.zxhl.cms.net.model.uc.GooglePayEntity;
 import com.zxhl.cms.net.model.uc.PayMinEntity;
@@ -90,10 +91,10 @@ public interface IUserInfoApi {
     Observable<Response<GooglePayEntity>> googlePay(@Query("goodsId") String goodsId, @Query("payType") String payType, @Query("voucherId") String voucherId, @Query("appId") String appId, @Query("payMode") String payMode);
 
     /**
-     * google支付成功后 通知后台更新会员状态
+     * google支付成功后 通知后台
      */
     @POST(NetConfig.User.URL_GOOGLE_NOTIFY)
-    Observable<Response<AliPayEntity>> googlePaySuccess(
+    Observable<Response<AnyEntity>> googlePaySuccess(
             @Query("packageName") String packageName,
             @Query("orderId") String orderId,
             @Query("productId") String productId,

cms/src/main/java/com/zxhl/cms/net/model/other/AnyEntity.java

+package com.zxhl.cms.net.model.other;
+
+/**
+ * @author (wangXuewei)
+ * @datetime 2022-03-15 10:25 GMT+8
+ * @detail :
+ */
+public class AnyEntity {
+}

cms/src/main/res/values/strings.xml

@@ -8,6 +8,7 @@
     <string name="auth_ing">授权中</string>
     <string name="upload_ing">上传中,请稍后</string>
     <string name="wait_ing">请稍后</string>
+    <string name="wait_ing2">Loading</string>
     <string name="get_sms_code_success">验证码已发送</string>
     <string name="nav_back_again_finish">再按一次退出程序</string>
     <string name="album_not_available">请检查系统相册是否可用</string>