11

cms/src/main/java/com/zxhl/cms/utils/WeChatUtils.kt

@@ -81,7 +81,7 @@ class WeChatUtils {
 //                    callBack.loginSuccess(lottery)
 //                    Toast.makeText(
 //                        AppContext.get(),
-//                        "登录出错，请稍后重试" + i + throwable.message,
+//                        "登录出错，loading重试" + i + throwable.message,
 //                        Toast.LENGTH_SHORT
 //                    ).show()
 //                }

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

@@ -6,8 +6,8 @@
     <string name="upload_success">上传成功</string>
     <string name="login_ing">正在登录中</string>
     <string name="auth_ing">授权中</string>
-    <string name="upload_ing">上传中,请稍后</string>
-    <string name="wait_ing">请稍后</string>
+    <string name="upload_ing">上传中,loading</string>
+    <string name="wait_ing">loading</string>
     <string name="wait_ing2">Loading</string>
     <string name="get_sms_code_success">验证码已发送</string>
     <string name="nav_back_again_finish">再按一次退出程序</string>

moduleMain/src/main/java/com/zxhl/main/page/activity/GoodsDetailActivity.kt

@@ -133,7 +133,7 @@ class GoodsDetailActivity : BaseActivity(), GoodsDetailContract.View,
                 if (ownCoin != null) {
                     val chajia = needPrice?.toDoubleOrNull()?.minus(ownCoin!!)
                     if (TextUtils.equals("flow_tag_xymh_z", SettingPreference.getFlowTag())) {
-                        mLoading?.setLoading("请稍后")
+                        mLoading?.setLoading("loading")
                         mLoading?.show()
                         if (pay_type == 1) {
                             mPayPresenter?.requestAliPay(
@@ -180,7 +180,7 @@ class GoodsDetailActivity : BaseActivity(), GoodsDetailContract.View,
                 if (ownCoin != null) {
                     val chajia = needPrice?.toDoubleOrNull()?.minus(ownCoin!!)
                     if (TextUtils.equals("flow_tag_xymh_z", SettingPreference.getFlowTag())) {
-                        mLoading?.setLoading("请稍后")
+                        mLoading?.setLoading("loading")
                         mLoading?.show()
                         if (pay_type == 1) {
                             mPayPresenter?.requestAliPay(

moduleMain/src/main/java/com/zxhl/main/page/activity/LogisticsActivity.kt

@@ -57,7 +57,7 @@ class LogisticsActivity : BaseActivity(), LogisticsContract.View {
                 id_tv_content?.text.toString(),
                 id_edit_mobile?.text.toString()
             )
-            mLoading?.setLoading("请稍后")
+            mLoading?.setLoading("loading")
             mLoading?.show()
 
         }

moduleMain/src/main/java/com/zxhl/main/page/activity/LotteryRuslutActivity.kt

@@ -133,7 +133,7 @@ class LotteryRuslutActivity : BaseActivity(), LotteryContract.View, AdCallback<S
             } else {
                 val coins = needPrice - userCoins
                 if (TextUtils.equals("flow_tag_xymh_z", SettingPreference.getFlowTag())) {
-                    mLoading?.setLoading("请稍后")
+                    mLoading?.setLoading("loading")
                     mLoading?.show()
                     if (pay_type == 1) {
                         mPayPresenter?.requestAliPay(

moduleMain/src/main/java/com/zxhl/main/page/activity/NewBoxGoodsDetailActivity.kt

@@ -136,7 +136,7 @@ class NewBoxGoodsDetailActivity : BaseActivity(), GoodsDetailContract.View,
                 if (ownCoin != null) {
                     val chajia = needPrice?.toDoubleOrNull()?.minus(ownCoin!!)
                     if (TextUtils.equals("flow_tag_xymh_z", SettingPreference.getFlowTag())) {
-                        mLoading?.setLoading("请稍后")
+                        mLoading?.setLoading("loading")
                         mLoading?.show()
                         if (pay_type == 1) {
                             mPayPresenter?.requestAliPay(
@@ -192,7 +192,7 @@ class NewBoxGoodsDetailActivity : BaseActivity(), GoodsDetailContract.View,
                 if (ownCoin != null) {
                     val chajia = needPrice?.toDoubleOrNull()?.minus(ownCoin!!)
                     if (TextUtils.equals("flow_tag_xymh_z", SettingPreference.getFlowTag())) {
-                        mLoading?.setLoading("请稍后")
+                        mLoading?.setLoading("loading")
                         mLoading?.show()
                         if (pay_type == 1) {
                             mPayPresenter?.requestAliPay(

moduleMain/src/main/java/com/zxhl/main/page/activity/ShopOrderActivity.kt

@@ -243,42 +243,42 @@ class ShopOrderActivity : BaseActivity(), ShopOrderContract.View, PayContract.Vi
 
     fun gotoPay() {
         if (TextUtils.isEmpty(addressId)) {
-            Utils.showToast(this, "请填写地址")
+            Utils.showToast(this, mActivity?.getString(R.string.write_info))
             return
         }
         orderNotes = id_edit_beizhu?.text.toString()
         if (mPayPrice?.toDouble()!! > 0) {
-            if (pay_type == 0) {
-                Utils.showToast(this, "请选择支付类型")
-                return
-            }
-            mLoading?.show()
-            mLoading?.setLoading("请稍后")
-            if (pay_type == 1) {
-                mPayresenter?.shoprequestAliPay(
-                    this,
-                    payId ?: "",
-                    pay_type.toString(),
-                    "8",
-                    addressId.toString(),
-                    mdiscount.toString(),
-                    depotIds.toString(),
-                    orderNotes.toString()
-                )
-            } else {
-                mPayresenter?.shoprequestWechatPayOrder(
-                    payId ?: "",
-                    pay_type.toString(),
-                    "8",
-                    addressId.toString(),
-                    mdiscount.toString(),
-                    depotIds.toString(),
-                    orderNotes.toString()
-                )
-            }
+//            if (pay_type == 0) {
+//                Utils.showToast(this, "请选择支付类型")
+//                return
+//            }
+//            mLoading?.show()
+//            mLoading?.setLoading("loading")
+//            if (pay_type == 1) {
+//                mPayresenter?.shoprequestAliPay(
+//                    this,
+//                    payId ?: "",
+//                    pay_type.toString(),
+//                    "8",
+//                    addressId.toString(),
+//                    mdiscount.toString(),
+//                    depotIds.toString(),
+//                    orderNotes.toString()
+//                )
+//            } else {
+//                mPayresenter?.shoprequestWechatPayOrder(
+//                    payId ?: "",
+//                    pay_type.toString(),
+//                    "8",
+//                    addressId.toString(),
+//                    mdiscount.toString(),
+//                    depotIds.toString(),
+//                    orderNotes.toString()
+//                )
+//            }
         } else {
             mLoading?.show()
-            mLoading?.setLoading("请稍后")
+            mLoading?.setLoading("loading")
             mPresenter?.createOrder(addressId, depotIds, orderNotes)
         }
     }

moduleMain/src/main/java/com/zxhl/main/page/fragment/ShopFragment.kt

@@ -51,7 +51,7 @@ class ShopFragment : BaseFragment(), ShopContract.View {
     override fun onVisible() {
         super.onVisible()
         if (activity != null && SettingPreference.getFirstShowShopTips()) {
-            DialogUtils.showShopTips(activity!!)
+           // DialogUtils.showShopTips(activity!!)
             SettingPreference.setFirstShowShopTips()
         }
     }