From bb5bd7adf33dc690902efdf9575c2268e64d45e2 Mon Sep 17 00:00:00 2001
From: yezhiqiu <123456@qq.com>
Date: Tue, 9 Jun 2026 17:05:44 +0800
Subject: [PATCH] =?UTF-8?q?paypal=E6=94=AF=E4=BB=98=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |   2 +-
 .../compile-file-map.properties               |   2 +-
 app/build.gradle                              |   6 +-
 app/src/main/AndroidManifest.xml              |  15 +-
 .../com/abbidot/tracker/base/BaseFragment.kt  |   9 +
 .../com/abbidot/tracker/bean/PaymentIDBean.kt |   3 +
 .../ui/activity/LoginRegisterCNActivity.kt    |   2 +-
 .../cn/RechargeOrderDetailCNActivity.kt       |  18 +-
 .../tracker/retrofit2/INetworkService.kt      | 231 +++++++++---------
 .../abbidot/tracker/retrofit2/NetworkApi.kt   | 159 ++++++------
 .../tracker/ui/activity/SayHelloActivity.kt   |  21 +-
 .../tracker/ui/activity/SplashActivity.kt     |   7 +-
 .../activity/account/AddEmailValidActivity.kt |   2 +-
 .../activity/account/cn/LoginV2CNActivity.kt  |  53 ++++
 .../ui/activity/device/MyTrackerV2Activity.kt |   4 +-
 .../subscribe/PaymentMethodActivity.kt        |  61 ++++-
 .../subscribe/SureSubscriptionPlanActivity.kt |  44 +++-
 .../googlemap/HomeMapGoogleMapFragmentV3.kt   |   9 +-
 .../subscribe/CreditCardPaymentFragment.kt    |  24 +-
 .../subscribe/PaypalPaymentFragment.kt        |  54 ++--
 .../abbidot/tracker/util/ThirdPartyUtil.kt    |  11 +
 .../java/com/abbidot/tracker/util/ViewUtil.kt |  17 +-
 .../abbidot/tracker/vm/GeoCoderViewModel.kt   |   1 +
 .../com/abbidot/tracker/vm/MapViewModel.kt    |   2 +-
 .../tracker/vm/SubscriptionPayViewModel.kt    |  10 +
 .../res/drawable-xhdpi/ico_loading_wechat.png | Bin 3329 -> 0 bytes
 .../drawable-xhdpi/ico_loading_wechat2.png    | Bin 2108 -> 0 bytes
 .../icon_login_cn_wechat_image.png            | Bin 0 -> 1644 bytes
 .../drawable-xxhdpi/ico_loading_wechat.png    | Bin 6503 -> 0 bytes
 .../drawable-xxhdpi/ico_loading_wechat2.png   | Bin 3904 -> 0 bytes
 .../icon_login_cn_wechat_image.png            | Bin 0 -> 2128 bytes
 .../drawable-xxxhdpi/ico_loading_wechat.png   | Bin 7335 -> 0 bytes
 .../drawable-xxxhdpi/ico_loading_wechat2.png  | Bin 4326 -> 0 bytes
 .../icon_login_cn_wechat_image.png            | Bin 0 -> 2570 bytes
 .../res/layout/activity_login_register_cn.xml |   2 +-
 .../main/res/layout/activity_login_v2_cn.xml  | 104 ++++++++
 .../main/res/layout/activity_say_hello.xml    |  25 +-
 .../res/layout/fragment_login_cn_account.xml  |   2 +-
 .../res/layout/fragment_login_cn_first.xml    |   4 +-
 .../res/layout/fragment_paypal_payment.xml    |  26 +-
 .../res/layout/item_baidu_map_poi_result.xml  |   4 +-
 .../layout/layout_recharge_pay_options_cn.xml |  55 +++++
 app/src/main/res/values-zh-rCN/strings.xml    |   2 +
 app/src/main/res/values/strings.xml           |   2 +
 .../com/abbidot/baselibrary/util/AppUtils.kt  |   9 +-
 gradle.properties                             |  52 ++--
 46 files changed, 737 insertions(+), 317 deletions(-)
 create mode 100644 app/src/main/java/com/abbidot/tracker/bean/PaymentIDBean.kt
 create mode 100644 app/src/main/java/com/abbidot/tracker/ui/activity/account/cn/LoginV2CNActivity.kt
 delete mode 100644 app/src/main/res/drawable-xhdpi/ico_loading_wechat.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ico_loading_wechat2.png
 create mode 100644 app/src/main/res/drawable-xhdpi/icon_login_cn_wechat_image.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ico_loading_wechat.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ico_loading_wechat2.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/icon_login_cn_wechat_image.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ico_loading_wechat.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ico_loading_wechat2.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_login_cn_wechat_image.png
 create mode 100644 app/src/main/res/layout/activity_login_v2_cn.xml
 create mode 100644 app/src/main/res/layout/layout_recharge_pay_options_cn.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d3da0a0..4396204 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-21" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
index 098c127..90ae22b 100644
--- a/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
+++ b/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@@ -1 +1 @@
-#Tue Apr 21 16:52:55 CST 2026
+#Thu Jun 04 09:43:21 CST 2026
diff --git a/app/build.gradle b/app/build.gradle
index 2c7c4ba..b36a3ba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,9 +28,9 @@ android {
         applicationId "com.abbidot.tracker"
         minSdkVersion 23
         targetSdkVersion 35
-        versionCode 2209
-        versionName "2.2.9"
-//        versionName "2.2.9-Beta1"
+        versionCode 2210
+//        versionName "2.2.10"
+        versionName "2.2.10-Beta2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f30d963..b0cdc82 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,9 +77,9 @@
     <uses-permission
         android:name="android.permission.REQUEST_INSTALL_PACKAGES"
         tools:node="remove" /> <!-- Android 13上一新增运行时权限 -->
-<!--    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />-->
-<!--    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />-->
-<!--    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" /> -->
+    <!-- <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" /> -->
+    <!-- <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" /> -->
+    <!-- <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" /> -->
     <!-- 通知权限 -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" /> <!-- Android 12新增权限适配 -->
@@ -106,6 +106,12 @@
         android:usesCleartextTraffic="true"
         tools:replace="android:supportsRtl"
         tools:targetApi="n">
+        <activity
+            android:name=".ui.activity.account.cn.LoginV2CNActivity"
+            android:exported="false" />
+        <activity
+            android:name=".deprecated.ui.activity.profile.recharge.cn.RechargeOrderDetailCNActivity"
+            android:exported="false" />
         <activity
             android:name=".ui.activity.device.InitializingDeviceActivity"
             android:exported="false" />
@@ -421,9 +427,6 @@
         <activity
             android:name=".ui.activity.account.recharge.cn.RechargeDeviceDetailCNActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.activity.account.recharge.cn.RechargeOrderDetailCNActivity"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activity.account.recharge.cn.RechargeAmountCNActivity"
             android:screenOrientation="portrait" />
diff --git a/app/src/main/java/com/abbidot/tracker/base/BaseFragment.kt b/app/src/main/java/com/abbidot/tracker/base/BaseFragment.kt
index f7763a5..dfdd22e 100644
--- a/app/src/main/java/com/abbidot/tracker/base/BaseFragment.kt
+++ b/app/src/main/java/com/abbidot/tracker/base/BaseFragment.kt
@@ -11,6 +11,7 @@ import android.view.ViewGroup
 import androidx.activity.result.ActivityResultLauncher
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 import androidx.viewbinding.ViewBinding
 import com.abbidot.baselibrary.util.LogUtil
 import com.abbidot.tracker.R
@@ -71,6 +72,14 @@ abstract class BaseFragment<T : ViewBinding>(
      */
     open fun liveDataObserve() {}
 
+    /**
+     * 获取当前activity
+     */
+    protected fun <T : FragmentActivity> getHostActivity(clazz: Class<T>): T? {
+        val act = activity ?: return null
+        return if (clazz.isInstance(act)) clazz.cast(act) else null
+    }
+
     /**
      * 初始化
      */
diff --git a/app/src/main/java/com/abbidot/tracker/bean/PaymentIDBean.kt b/app/src/main/java/com/abbidot/tracker/bean/PaymentIDBean.kt
new file mode 100644
index 0000000..cd3b2cb
--- /dev/null
+++ b/app/src/main/java/com/abbidot/tracker/bean/PaymentIDBean.kt
@@ -0,0 +1,3 @@
+package com.abbidot.tracker.bean
+
+data class PaymentIDBean(var stripeMethodInfo: CreditCardBean, var paypalMethodInfo: UserBean)
diff --git a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/LoginRegisterCNActivity.kt b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/LoginRegisterCNActivity.kt
index 0c93b1a..f2f5960 100644
--- a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/LoginRegisterCNActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/LoginRegisterCNActivity.kt
@@ -72,7 +72,7 @@ class LoginRegisterCNActivity :
     fun switchFragment(index: Int) {
 
         setTopTitle(getString(R.string.login_txt_welcome))
-        setTopContent(getString(R.string.login_txt_seeyou))
+        setTopContent(getString(R.string.app_name))
 
         supportFragmentManager.commit {
 
diff --git a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeOrderDetailCNActivity.kt b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeOrderDetailCNActivity.kt
index 66f66bc..1a5b012 100644
--- a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeOrderDetailCNActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeOrderDetailCNActivity.kt
@@ -78,7 +78,7 @@ class RechargeOrderDetailCNActivity : BaseActivity<ActivityRechargeOrderDetailCn
                 it.text = getString(R.string.txt_select_payment_method)
                 it.detailTextView.visibility = View.VISIBLE
                 it.detailTextView.background =
-                    ContextCompat.getDrawable(mContext!!, R.drawable.pic_wechatpay)
+                    ContextCompat.getDrawable(mContext, R.drawable.pic_wechatpay)
 
                 setOnClickListenerViews(startPayMoneyBtnCn, it)
             }
@@ -87,7 +87,7 @@ class RechargeOrderDetailCNActivity : BaseActivity<ActivityRechargeOrderDetailCn
         //底部弹出菜单
         val languageList = mutableListOf(R.drawable.pic_wechatpay, R.drawable.pic_alipay)
         val bottomListSheetBuilder =
-            ViewUtil.instance.showBottomSheetList(mContext!!, { dialog, _, position, _ ->
+            ViewUtil.instance.showBottomSheetList(mContext, { dialog, _, position, _ ->
                 dialog.dismiss()
                 mPayWay = position
                 mViewBinding.rechargeOrderDetailCnPayWay.detailTextView.background =
@@ -190,7 +190,11 @@ class RechargeOrderDetailCNActivity : BaseActivity<ActivityRechargeOrderDetailCn
                     it.itemCardPetHead.appHeadImage.visibility = View.VISIBLE
                     it.itemCardPetName.visibility = View.VISIBLE
                     it.itemCardPetName.text = pet!!.petName
-                    ViewUtil.instance.imageLoadUrl(mContext,it.itemCardPetHead.appHeadImage, pet!!.imgurl)
+                    ViewUtil.instance.imageLoadUrl(
+                        mContext,
+                        it.itemCardPetHead.appHeadImage,
+                        pet!!.imgurl
+                    )
                 }
             }
         }
@@ -201,7 +205,7 @@ class RechargeOrderDetailCNActivity : BaseActivity<ActivityRechargeOrderDetailCn
             val str = getString(R.string.txt_month_until) + "\t$accountFee"
             mViewBinding.tvNeedPayMoneyCn.text = str
             mViewBinding.rechargeOrderDetailCnAmount.let {
-                if (hotType ==  ConstantInt.Type1) {
+                if (hotType == ConstantInt.Type1) {
                     it.rechargeAmountNormalHotImage.visibility = View.VISIBLE
                 } else {
                     it.rechargeAmountNormalHotImage.visibility = View.GONE
@@ -210,11 +214,7 @@ class RechargeOrderDetailCNActivity : BaseActivity<ActivityRechargeOrderDetailCn
 
                 it.txtRechargeAmountName.text = name
 
-                val perMonth = if (period > 1) {
-                    String.format(getString(R.string.pet_managet_age), period)
-                } else {
-                    String.format(getString(R.string.pet_managet_age_1), period)
-                }
+                val perMonth = ""
                 it.rechargeAmountTwoTime.text = perMonth
 
 //                val subscriptionPlan =
diff --git a/app/src/main/java/com/abbidot/tracker/retrofit2/INetworkService.kt b/app/src/main/java/com/abbidot/tracker/retrofit2/INetworkService.kt
index f47b3e1..1995c66 100644
--- a/app/src/main/java/com/abbidot/tracker/retrofit2/INetworkService.kt
+++ b/app/src/main/java/com/abbidot/tracker/retrofit2/INetworkService.kt
@@ -23,6 +23,7 @@ import com.abbidot.tracker.bean.OrderBean
 import com.abbidot.tracker.bean.PackageBean
 import com.abbidot.tracker.bean.PackageTypeBean
 import com.abbidot.tracker.bean.PayResultBean
+import com.abbidot.tracker.bean.PaymentIDBean
 import com.abbidot.tracker.bean.PetAllInfoBean
 import com.abbidot.tracker.bean.PetBean
 import com.abbidot.tracker.bean.RechargeDeviceBean
@@ -47,8 +48,6 @@ import retrofit2.http.Query
 interface INetworkService {
 
     companion object {
-        //宠物勋章图片url
-        const val BASE_PET_BADGE_URL = "http://162.62.53.38:9998/static/TrackerBadgeImages/"
         private const val IP_SERVER = "https://aws.abbidot.com"
 //        private const val IP_SERVER = "https://192.168.0.22"
 //        const val BASE_URL = "http://ec2-50-18-65-40.us-west-1.compute.amazonaws.com:8090/abbidot/"
@@ -1141,119 +1140,12 @@ interface INetworkService {
     suspend fun rsaDecodeTest(
         @Field("encryptedData") encryptedData: String
     ): BaseResponse<String>
-    /*******************************************以下是国内版本接口***********************************/
-    /**
-     * 获取微信登录的OpedId
-     */
-//    @Headers("${CommonRequestInterceptor.HEADERS_NAME}:${CommonRequestInterceptor.HEADERS_value}")
-//    @GET("oauth2/access_token")
-//    suspend fun getWXOpedId(@Query("appid") appid: String,
-//                            @Query("secret") secret: String,
-//                            @Query("code") code: String,
-//                            @Query("grant_type") grant_type: String): BaseResponse<String>
 
     /**
-     * 微信登录
+     * 获取Stripe、paypal支付id
      */
-    @GET("user/wxLogin")
-    suspend fun wxLogin(@Query("code") code: String): BaseResponse<UserBean>
-
-    /**
-     * 微信绑定
-     */
-    @FormUrlEncoded
-    @POST("user/weixinBind")
-    suspend fun wxBind(
-        @Field("phone") phone: String,
-        @Field("verificationCode") verificationCode: String,
-        @Field("wxId") wxId: String
-    ): BaseResponse<UserBean>
-
-    /**
-     * 发送验证码
-     */
-    @GET("user/sendCode")
-    suspend fun sendCode(
-        @Query("phone") phone: String,
-        //发送类型 1是验证码登录 2微信绑定 3注册 4忘记密码
-        @Query("type") type: Int
-    ): BaseResponse<String>
-
-    /**
-     * 验证码登录
-     */
-    @FormUrlEncoded
-    @POST("user/phoneLogin")
-    suspend fun phoneLogin(
-        @Field("phone") phone: String, @Field("verificationCode") verificationCode: String
-    ): BaseResponse<UserBean>
-
-    /**
-     * 手机号验证码验证
-     */
-    @FormUrlEncoded
-    @POST("user/validateCode")
-    suspend fun validatePhoneCode(
-        @Field("phone") phone: String, @Field("code") code: String,
-        //验证码类型 1是注册 2是忘记密码
-        @Field("type") type: Int
-    ): BaseResponse<String>
-
-    /**
-     * 账号密码登录
-     */
-    @FormUrlEncoded
-    @POST("user/accountPasswordLogin")
-    suspend fun accountPasswordLogin(
-        @Field("phone") phone: String, @Field("password") password: String
-    ): BaseResponse<UserBean>
-
-    /**
-     * 用户注册
-     */
-    @FormUrlEncoded
-    @POST("user/register")
-    suspend fun register(
-        @Field("phone") phone: String, @Field("password") password: String
-    ): BaseResponse<String>
-
-    /**
-     * 重置密码
-     */
-    @FormUrlEncoded
-    @POST("user/resetPassword")
-    suspend fun resetNewPassword(
-        @Field("phone") phone: String, @Field("password") password: String
-    ): BaseResponse<String>
-
-    /**
-     * 获取微信支付Prepay_id
-     */
-    @FormUrlEncoded
-    @POST("order/getWxPayOrder")
-    suspend fun getWxPayOrder(
-        @Field("feePackage") feePackage: String,
-        @Field("deviceId") deviceId: String,
-        @Field("payFee") payFee: Double,
-        @Field("period") period: Float,
-        @Field("userId") userId: String,
-        @Field("username") username: String
-    ): BaseResponse<WXPayOrderBean>
-
-    /**
-     * 获取支付宝支付订单
-     */
-    @FormUrlEncoded
-    @POST("order/getAlipayOrder")
-    suspend fun getAlipayOrder(
-        @Field("feePackage") feePackage: String,
-        @Field("deviceId") deviceId: String,
-        @Field("payFee") payFee: Double,
-        @Field("period") period: Float,
-        @Field("userId") userId: String,
-        @Field("username") username: String
-    ): BaseResponse<AlipayOrderBean>
-
+    @GET("user/getUserPaymentMethodID")
+    suspend fun getUserPaymentMethodID(@Query("userId") userId: String): BaseResponse<PaymentIDBean>
 
     /**
      * 获取订阅订单列表
@@ -1464,4 +1356,119 @@ interface INetworkService {
     @FormUrlEncoded
     @POST("map/setupRefreshLocation")
     suspend fun setupRefreshLocation(@Field("deviceId") deviceId: String): BaseResponse<String>
+
+    /*******************************************以下是国内版本接口***********************************/
+    /**
+     * 获取微信登录的OpedId
+     */
+//    @Headers("${CommonRequestInterceptor.HEADERS_NAME}:${CommonRequestInterceptor.HEADERS_value}")
+//    @GET("oauth2/access_token")
+//    suspend fun getWXOpedId(@Query("appid") appid: String,
+//                            @Query("secret") secret: String,
+//                            @Query("code") code: String,
+//                            @Query("grant_type") grant_type: String): BaseResponse<String>
+
+    /**
+     * 微信登录
+     */
+    @GET("user/wxLogin")
+    suspend fun wxLogin(@Query("code") code: String): BaseResponse<UserBean>
+
+    /**
+     * 微信绑定
+     */
+    @FormUrlEncoded
+    @POST("user/weixinBind")
+    suspend fun wxBind(
+        @Field("phone") phone: String,
+        @Field("verificationCode") verificationCode: String,
+        @Field("wxId") wxId: String
+    ): BaseResponse<UserBean>
+
+    /**
+     * 发送验证码
+     */
+    @GET("user/sendCode")
+    suspend fun sendCode(
+        @Query("phone") phone: String,
+        //发送类型 1是验证码登录 2微信绑定 3注册 4忘记密码
+        @Query("type") type: Int
+    ): BaseResponse<String>
+
+    /**
+     * 验证码登录
+     */
+    @FormUrlEncoded
+    @POST("user/phoneLogin")
+    suspend fun phoneLogin(
+        @Field("phone") phone: String, @Field("verificationCode") verificationCode: String
+    ): BaseResponse<UserBean>
+
+    /**
+     * 手机号验证码验证
+     */
+    @FormUrlEncoded
+    @POST("user/validateCode")
+    suspend fun validatePhoneCode(
+        @Field("phone") phone: String, @Field("code") code: String,
+        //验证码类型 1是注册 2是忘记密码
+        @Field("type") type: Int
+    ): BaseResponse<String>
+
+    /**
+     * 账号密码登录
+     */
+    @FormUrlEncoded
+    @POST("user/accountPasswordLogin")
+    suspend fun accountPasswordLogin(
+        @Field("phone") phone: String, @Field("password") password: String
+    ): BaseResponse<UserBean>
+
+    /**
+     * 用户注册
+     */
+    @FormUrlEncoded
+    @POST("user/register")
+    suspend fun register(
+        @Field("phone") phone: String, @Field("password") password: String
+    ): BaseResponse<String>
+
+    /**
+     * 重置密码
+     */
+    @FormUrlEncoded
+    @POST("user/resetPassword")
+    suspend fun resetNewPassword(
+        @Field("phone") phone: String, @Field("password") password: String
+    ): BaseResponse<String>
+
+    /**
+     * 获取微信支付Prepay_id
+     */
+    @FormUrlEncoded
+    @POST("order/getWxPayOrder")
+    suspend fun getWxPayOrder(
+        @Field("feePackage") feePackage: String,
+        @Field("deviceId") deviceId: String,
+        @Field("payFee") payFee: Double,
+        @Field("period") period: Float,
+        @Field("userId") userId: String,
+        @Field("username") username: String
+    ): BaseResponse<WXPayOrderBean>
+
+    /**
+     * 获取支付宝支付订单
+     */
+    @FormUrlEncoded
+    @POST("order/getAlipayOrder")
+    suspend fun getAlipayOrder(
+        @Field("feePackage") feePackage: String,
+        @Field("deviceId") deviceId: String,
+        @Field("payFee") payFee: Double,
+        @Field("period") period: Float,
+        @Field("userId") userId: String,
+        @Field("username") username: String
+    ): BaseResponse<AlipayOrderBean>
+
+    /*******************************************以上是国内版本接口end***********************************/
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/abbidot/tracker/retrofit2/NetworkApi.kt b/app/src/main/java/com/abbidot/tracker/retrofit2/NetworkApi.kt
index e9c3c66..f44c60d 100644
--- a/app/src/main/java/com/abbidot/tracker/retrofit2/NetworkApi.kt
+++ b/app/src/main/java/com/abbidot/tracker/retrofit2/NetworkApi.kt
@@ -1066,83 +1066,11 @@ object NetworkApi : BaseNetworkApi<INetworkService>(INetworkService.BASE_URL) {
         service.rsaDecodeTest(encryptedData)
     }
 
-    /*******************************************以下是国内版本接口***********************************/
     /**
-     * 微信登录
+     * 获取Stripe、paypal支付id
      */
-    suspend fun wxLogin(code: String) = getResult {
-        service.wxLogin(code)
-    }
-
-    /**
-     * 微信绑定
-     */
-    suspend fun wxBind(phone: String, verificationCode: String, wxId: String) = getResult {
-        service.wxBind(phone, verificationCode, wxId)
-    }
-
-    /**
-     * 发送验证码
-     */
-    suspend fun sendCode(phone: String, type: Int) = getResult {
-        service.sendCode(phone, type)
-    }
-
-    /**
-     * 手机号验证码验证
-     */
-    suspend fun validatePhoneCode(phone: String, code: String, type: Int) = getResult {
-        service.validatePhoneCode(phone, code, type)
-    }
-
-    /**
-     * 验证码登录
-     */
-    suspend fun phoneLogin(phone: String, verificationCode: String) = getResult {
-        service.phoneLogin(phone, verificationCode)
-    }
-
-    /**
-     * 账号密码登录
-     */
-    suspend fun accountPasswordLogin(phone: String, password: String) = getResult {
-        service.accountPasswordLogin(phone, password)
-    }
-
-    /**
-     * 用户注册
-     */
-    suspend fun register(phone: String, password: String) = getResult {
-        service.register(phone, password)
-    }
-
-    /**
-     * 重置密码
-     */
-    suspend fun resetNewPassword(phone: String, password: String) = getResult {
-        service.resetNewPassword(phone, password)
-    }
-
-    /**
-     * 获取微信Prepay_id
-     */
-    suspend fun getWxPayOrder(
-        setMealBean: SetMealBean, deviceId: String, userId: String, username: String
-    ) = getResult {
-        service.getWxPayOrder(
-            setMealBean.name, deviceId, setMealBean.accountFee, setMealBean.period, userId, username
-        )
-    }
-
-    /**
-     * 获取支付宝支付订单
-     */
-    suspend fun getAlipayOrder(
-        setMealBean: SetMealBean, deviceId: String, userId: String, username: String
-    ) = getResult {
-        service.getAlipayOrder(
-            setMealBean.name, deviceId, setMealBean.accountFee, setMealBean.period, userId, username
-        )
+    suspend fun getUserPaymentMethodID(userId: String) = getResult {
+        service.getUserPaymentMethodID(userId)
     }
 
     /**
@@ -1350,4 +1278,85 @@ object NetworkApi : BaseNetworkApi<INetworkService>(INetworkService.BASE_URL) {
     ) = getResult {
         service.uploadDeviceLog(deviceOutId, uploadTime, macID, logFileUrl)
     }
+
+    /*******************************************以下是国内版本接口***********************************/
+    /**
+     * 微信登录
+     */
+    suspend fun wxLogin(code: String) = getResult {
+        service.wxLogin(code)
+    }
+
+    /**
+     * 微信绑定
+     */
+    suspend fun wxBind(phone: String, verificationCode: String, wxId: String) = getResult {
+        service.wxBind(phone, verificationCode, wxId)
+    }
+
+    /**
+     * 发送验证码
+     */
+    suspend fun sendCode(phone: String, type: Int) = getResult {
+        service.sendCode(phone, type)
+    }
+
+    /**
+     * 手机号验证码验证
+     */
+    suspend fun validatePhoneCode(phone: String, code: String, type: Int) = getResult {
+        service.validatePhoneCode(phone, code, type)
+    }
+
+    /**
+     * 验证码登录
+     */
+    suspend fun phoneLogin(phone: String, verificationCode: String) = getResult {
+        service.phoneLogin(phone, verificationCode)
+    }
+
+    /**
+     * 账号密码登录
+     */
+    suspend fun accountPasswordLogin(phone: String, password: String) = getResult {
+        service.accountPasswordLogin(phone, password)
+    }
+
+    /**
+     * 用户注册
+     */
+    suspend fun register(phone: String, password: String) = getResult {
+        service.register(phone, password)
+    }
+
+    /**
+     * 重置密码
+     */
+    suspend fun resetNewPassword(phone: String, password: String) = getResult {
+        service.resetNewPassword(phone, password)
+    }
+
+    /**
+     * 获取微信Prepay_id
+     */
+    suspend fun getWxPayOrder(
+        setMealBean: SetMealBean, deviceId: String, userId: String, username: String
+    ) = getResult {
+        service.getWxPayOrder(
+            setMealBean.name, deviceId, setMealBean.accountFee, setMealBean.period, userId, username
+        )
+    }
+
+    /**
+     * 获取支付宝支付订单
+     */
+    suspend fun getAlipayOrder(
+        setMealBean: SetMealBean, deviceId: String, userId: String, username: String
+    ) = getResult {
+        service.getAlipayOrder(
+            setMealBean.name, deviceId, setMealBean.accountFee, setMealBean.period, userId, username
+        )
+    }
+
+    /*******************************************以上是国内版本接口end***********************************/
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/SayHelloActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/SayHelloActivity.kt
index 4aa2f7d..fa2537c 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/SayHelloActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/SayHelloActivity.kt
@@ -5,12 +5,14 @@ import android.view.View
 import com.abbidot.baselibrary.constant.EventName
 import com.abbidot.baselibrary.constant.MMKVKey
 import com.abbidot.baselibrary.eventbus.XEventBus
+import com.abbidot.baselibrary.util.AppUtils
 import com.abbidot.baselibrary.util.MMKVUtil
 import com.abbidot.tracker.R
 import com.abbidot.tracker.base.BaseActivity
 import com.abbidot.tracker.databinding.ActivitySayHelloBinding
 import com.abbidot.tracker.ui.activity.account.CreateAccountV2Activity
 import com.abbidot.tracker.ui.activity.account.LoginV2Activity
+import com.abbidot.tracker.ui.activity.account.cn.LoginV2CNActivity
 
 class SayHelloActivity : BaseActivity<ActivitySayHelloBinding>(ActivitySayHelloBinding::inflate) {
 
@@ -21,7 +23,11 @@ class SayHelloActivity : BaseActivity<ActivitySayHelloBinding>(ActivitySayHelloB
 
         mViewBinding.apply {
             root.setBackgroundResource(R.drawable.icon_say_hi_bg)
-            setOnClickListenerViews(btnSayHelloLogin, btnSayHelloSignup)
+            if (AppUtils.isChina()) {
+
+                btnSayHelloLoginWechat.visibility = View.VISIBLE
+            }
+            setOnClickListenerViews(btnSayHelloLogin, btnSayHelloSignup, btnSayHelloLoginWechat)
         }
     }
 
@@ -35,10 +41,15 @@ class SayHelloActivity : BaseActivity<ActivitySayHelloBinding>(ActivitySayHelloB
         mViewBinding.apply {
             when (v!!) {
                 btnSayHelloLogin -> {
-                    val intent = Intent(mContext, LoginV2Activity::class.java)
-                    val email = MMKVUtil.getString(MMKVKey.Email)
-                    intent.putExtra(MMKVKey.Email, email)
-                    startActivity(intent)
+                    if (AppUtils.isChina()) {
+                        val intent = Intent(mContext, LoginV2CNActivity::class.java)
+                        startActivity(intent)
+                    } else {
+                        val intent = Intent(mContext, LoginV2Activity::class.java)
+                        val email = MMKVUtil.getString(MMKVKey.Email)
+                        intent.putExtra(MMKVKey.Email, email)
+                        startActivity(intent)
+                    }
                 }
 
                 btnSayHelloSignup -> startActivity(
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/SplashActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/SplashActivity.kt
index d053444..3f5c00e 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/SplashActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/SplashActivity.kt
@@ -203,11 +203,8 @@ class SplashActivity : QMUIActivity() {
             initMapbox()
             try {
                 //stripe支付
-                val stripeKey = Util.getMetadata(applicationContext, KeyNames.STRIPE_TEST_KEY)
-                LogUtil.e("stripeKey=$stripeKey")
-                PaymentConfiguration.init(
-                    applicationContext, stripeKey
-                )
+                val stripeKey = ThirdPartyUtil.instance.getStripeKey(applicationContext)
+                PaymentConfiguration.init(applicationContext, stripeKey)
             } catch (e: Exception) {
                 LogUtil.e("stripeSdk initialize初始化异常,${e.message}")
             }
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/account/AddEmailValidActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/account/AddEmailValidActivity.kt
index 59d698d..da7cc6a 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/account/AddEmailValidActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/account/AddEmailValidActivity.kt
@@ -17,7 +17,7 @@ open class AddEmailValidActivity :
     lateinit var mFragmentList: MutableList<Fragment>
     lateinit var mEmailValidFragment: EmailValidFragment
 
-    var mIndex = 0
+    private var mIndex = 0
 
     //用户邮箱
     var mUserEmail = ""
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/account/cn/LoginV2CNActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/account/cn/LoginV2CNActivity.kt
new file mode 100644
index 0000000..c0c33d1
--- /dev/null
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/account/cn/LoginV2CNActivity.kt
@@ -0,0 +1,53 @@
+package com.abbidot.tracker.ui.activity.account.cn
+
+import android.graphics.Paint
+import android.text.InputFilter
+import android.text.InputType
+import com.abbidot.tracker.R
+import com.abbidot.tracker.base.BaseActivity
+import com.abbidot.tracker.databinding.ActivityLoginV2CnBinding
+import com.abbidot.tracker.util.ViewUtil
+
+class LoginV2CNActivity :
+    BaseActivity<ActivityLoginV2CnBinding>(ActivityLoginV2CnBinding::inflate) {
+
+    override fun getTopBar() = mViewBinding.loginV2CnTopBar.titleTopBar
+
+    override fun initData() {
+        super.initData()
+        setTopBarTitle("")
+        mViewBinding.apply {
+            root.setBackgroundResource(R.drawable.icon_login_v2_bg)
+
+            ilLoginV2CnPhone.let {
+                it.tvInputNameTitle.setText(R.string.login_txt_phone)
+                it.etInputContent.setHint(R.string.login_txt_phone)
+                it.etInputContent.inputType = InputType.TYPE_CLASS_PHONE
+                ViewUtil.instance.setInputViewErrorHideClick(
+                    mContext, it.rlEtInputLayout, tvPhoneErrorTipLoginCn, it.etInputContent
+                )
+            }
+            ilLoginV2CnPassword.let {
+                it.tvInputNameTitle.setText(R.string.login_txt_password)
+                it.etInputContent.setHint(R.string.login_txt_password)
+                ViewUtil.instance.setShowAndHidePassword(
+                    it.etInputContent, it.ivInputRepresentImage
+                )
+                val filters = arrayOf<InputFilter>(InputFilter.LengthFilter(60))
+                it.etInputContent.filters = filters
+                ViewUtil.instance.setInputViewErrorHideClick(
+                    mContext, it.rlEtInputLayout, tvPasswordErrorTipLoginCn, it.etInputContent
+                )
+            }
+            //添加下划线
+            tvLoginV2CnForgotPassword.paintFlags = Paint.UNDERLINE_TEXT_FLAG
+
+            setOnClickListenerViews(
+                tvLoginV2CnForgotPassword,
+                ilLoginV2CnPassword.ivInputRepresentImage,
+                btnLoginV2CnLogin, btnLoginV2CnLoginCode
+            )
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/device/MyTrackerV2Activity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/device/MyTrackerV2Activity.kt
index e7b9fb4..9c997f8 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/device/MyTrackerV2Activity.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/device/MyTrackerV2Activity.kt
@@ -549,9 +549,7 @@ class MyTrackerV2Activity :
     private fun unAssignDeviceDialogTips(device: DeviceBean) {
         device.apply {
             pet?.let {
-                val string = String.format(
-                    getString(R.string.txt_unassign_pet_tracker), it.petName, deviceOutId
-                )
+                val string =  getString(R.string.app_name)
                 ViewUtil.instance.showDialog(
                     mContext, string, object : BaseDialog.OnDialogOkListener {
                         override fun onOkClick(dialog: BaseDialog<*>) {
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/PaymentMethodActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/PaymentMethodActivity.kt
index 33748cc..ef25e55 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/PaymentMethodActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/PaymentMethodActivity.kt
@@ -1,33 +1,50 @@
 package com.abbidot.tracker.ui.activity.subscribe
 
+import androidx.activity.viewModels
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.widget.ViewPager2
 import com.abbidot.baselibrary.constant.EventName
 import com.abbidot.baselibrary.eventbus.XEventBus
+import com.abbidot.baselibrary.util.LogUtil
 import com.abbidot.tracker.R
 import com.abbidot.tracker.adapter.ViewPagerAdapter
 import com.abbidot.tracker.base.BaseActivity
+import com.abbidot.tracker.bean.PaymentIDBean
 import com.abbidot.tracker.bean.SubscriptionsOrderBean
 import com.abbidot.tracker.constant.ConstantInt
 import com.abbidot.tracker.constant.ConstantString
+import com.abbidot.tracker.constant.GetResultCallback
 import com.abbidot.tracker.databinding.ActivityPaymentMethodBinding
+import com.abbidot.tracker.deprecated.ui.fragment.vm.LoginCNViewModel
 import com.abbidot.tracker.ui.fragment.subscribe.CreditCardPaymentFragment
 import com.abbidot.tracker.ui.fragment.subscribe.PaypalPaymentFragment
+import com.abbidot.tracker.util.ThirdPartyUtil
 import com.abbidot.tracker.util.Util
 import com.abbidot.tracker.util.ViewUtil
+import com.abbidot.tracker.vm.SubscriptionPayViewModel
+import com.stripe.android.ApiResultCallback
+import com.stripe.android.Stripe
+import com.stripe.android.model.PaymentMethod
+import com.stripe.android.model.PaymentMethodCreateParams
 
 class PaymentMethodActivity :
     BaseActivity<ActivityPaymentMethodBinding>(ActivityPaymentMethodBinding::inflate) {
 
+    private val mSubscriptionPayViewModel: SubscriptionPayViewModel by viewModels()
+    private val mLoginCNViewModel: LoginCNViewModel by viewModels()
+
     var mOrderBean: SubscriptionsOrderBean? = null
 
     //设备充值类型，0=首次设备充值激活，1=已添加设备再次添加设备充值，2=给当前的设备续费或者升级套餐
     var mRechargeType = ConstantInt.Type1
-    lateinit var mFragments: MutableList<Fragment>
+    var mFragments = mutableListOf<Fragment>()
 
     //设备类型
     var mType = ConstantInt.Type1
 
+    //支付id
+    var mPaymentIDBean: PaymentIDBean? = null
+
     override fun getTopBar() = mViewBinding.ilPaymentMethodTopBar.titleTopBar
 
     override fun initData() {
@@ -35,6 +52,26 @@ class PaymentMethodActivity :
         setTopBarTitle(R.string.txt_payment_method)
         setLeftBackImage(R.drawable.icon_white_back_svg)
 
+        // 用 PaymentMethodCreateParams 封装银行卡，不再直接new Card
+        val cardParams = PaymentMethodCreateParams.Card.Builder()
+            .setNumber("4242424242424242")
+            .setExpiryMonth(12)
+            .setExpiryYear(2028)
+            .setCvc("123")
+            .build()
+        val paymentMethodParams = PaymentMethodCreateParams.create(cardParams)
+        val stripeKey = ThirdPartyUtil.instance.getStripeKey(mContext)
+        Stripe(mContext, stripeKey).createPaymentMethod(
+            paymentMethodParams, callback = object : ApiResultCallback<PaymentMethod> {
+                override fun onError(e: Exception) {
+                    LogUtil.e("ApiResultCallback,${e.message}")
+                }
+
+                override fun onSuccess(result: PaymentMethod) {
+                    LogUtil.e(result.toString())
+                }
+            })
+
         intent.extras?.apply {
             mOrderBean = Util.getParcelableAdaptive(
                 intent, ConstantString.LkSetMeal, SubscriptionsOrderBean::class.java
@@ -43,10 +80,8 @@ class PaymentMethodActivity :
             mRechargeType = getInt(ConstantString.RechargeType, ConstantInt.Type1)
         }
 
-        mFragments = mutableListOf(
-            CreditCardPaymentFragment.newInstance(mContext),
-            PaypalPaymentFragment.newInstance(mContext)
-        )
+        mFragments.add(CreditCardPaymentFragment.newInstance(mContext))
+        mFragments.add(PaypalPaymentFragment.newInstance(mContext))
 
         mViewBinding.apply {
             rgSwitchPaymentMethod.setOnCheckedChangeListener { _, checkedId ->
@@ -70,12 +105,26 @@ class PaymentMethodActivity :
                     })
             }
         }
+
+        mSubscriptionPayViewModel.getUserPaymentMethodID()
     }
 
     override fun liveDataObserve() {
         XEventBus.observe(this, EventName.PayBack) {
             finish()
         }
-    }
 
+        mSubscriptionPayViewModel.mPaymentMethodIDLiveData.observe(this) {
+            dealRequestResult(it, object : GetResultCallback {
+                override fun onResult(any: Any) {
+                    it.getOrNull()?.let { p ->
+                        mPaymentIDBean = p
+                        if (mFragments.size > 1) {
+                            (mFragments[1] as PaypalPaymentFragment).showPaypalInfo()
+                        }
+                    }
+                }
+            })
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SureSubscriptionPlanActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SureSubscriptionPlanActivity.kt
index c5f4303..4113d12 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SureSubscriptionPlanActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SureSubscriptionPlanActivity.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.graphics.Paint
 import android.view.Gravity
 import android.view.View
+import android.widget.RadioGroup
 import androidx.activity.viewModels
 import com.abbidot.baselibrary.constant.EventName
 import com.abbidot.baselibrary.constant.MMKVKey
@@ -27,6 +28,8 @@ import com.abbidot.tracker.util.ViewUtil
 import com.abbidot.tracker.vm.GeoCoderViewModel
 import com.abbidot.tracker.vm.GoogleLocationViewModel
 import com.abbidot.tracker.vm.SubscriptionManageViewModel
+import com.abbidot.tracker.widget.TypefaceRoundButton
+import com.google.android.material.bottomsheet.BottomSheetDialog
 import kotlin.math.abs
 
 class SureSubscriptionPlanActivity :
@@ -67,6 +70,10 @@ class SureSubscriptionPlanActivity :
     private var mType = ConstantInt.Type1
 
     private lateinit var mSummaryAdapter: SureSubscribeSummaryAdapter
+    private var mRechargePayOptionsCn: BottomSheetDialog? = null
+
+    //国内支付方式
+    private var mPayCnOption = ConstantInt.Type0
 
     override fun getTopBar() = mViewBinding.sureSubscribePlan1TopBar.titleTopBar
 
@@ -482,10 +489,35 @@ class SureSubscriptionPlanActivity :
     override fun onClick(v: View?) {
         mViewBinding.apply {
             when (v!!) {
-                btnSureSubscribePlan1Continue -> createOrder()
+                btnSureSubscribePlan1Continue -> {
+                    if (!AppUtils.isChina()) {
+                        if (null == mRechargePayOptionsCn) {
+                            mRechargePayOptionsCn = ViewUtil.instance.showBottomSheet(
+                                mContext,
+                                R.layout.layout_recharge_pay_options_cn
+                            ).apply {
+                                setOnClickListenerViews(findViewById<TypefaceRoundButton>(R.id.btn_pay_cn_chose_sure))
+                                findViewById<RadioGroup>(R.id.rg_pay_cn_chose)?.let {
+                                    it.setOnCheckedChangeListener { _, checkedId ->
+                                        when (checkedId) {
+                                            R.id.rb_pay_cn_chose_alipay -> mPayCnOption =
+                                                ConstantInt.Type0
+
+                                            R.id.rb_pay_cn_chose_wxpay -> mPayCnOption =
+                                                ConstantInt.Type1
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        return
+                    }
+                    createOrder()
+                }
+
                 ilSubscribePlanDetail.tvSureSubscribePlanTermsConditions -> {
                     val url = if (AppUtils.isChina()) {
-                        "file:///android_asset/subscription_terms_conditions_en.html"
+                        "file:///android_asset/subscription_terms_conditions_cn.html"
                     } else {
                         "file:///android_asset/subscription_terms_conditions_en.html"
                     }
@@ -496,7 +528,7 @@ class SureSubscriptionPlanActivity :
 
                 ilSubscribePlanInsurance.ivSureSubscribePlanInsurance -> {
                     val url = if (AppUtils.isChina()) {
-                        "file:///android_asset/annual_protection_plan_en.html"
+                        "file:///android_asset/annual_protection_plan_cn.html"
                     } else {
                         "file:///android_asset/annual_protection_plan_en.html"
                     }
@@ -506,5 +538,11 @@ class SureSubscriptionPlanActivity :
                 }
             }
         }
+
+        when (v!!.id) {
+            R.id.btn_pay_cn_chose_sure -> {
+                showToast("$mPayCnOption")
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/HomeMapGoogleMapFragmentV3.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/HomeMapGoogleMapFragmentV3.kt
index 955ecb5..78b8c7a 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/HomeMapGoogleMapFragmentV3.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/HomeMapGoogleMapFragmentV3.kt
@@ -63,6 +63,7 @@ class HomeMapGoogleMapFragmentV3 : BaseGoogleMapFragment() {
 
     //是否需要反编译地理位置
     private var isReverseGeocode = false
+
     //其他没有选择的宠物
     private val mOtherPetMarkerList = mutableListOf<Marker?>()
 
@@ -106,13 +107,19 @@ class HomeMapGoogleMapFragmentV3 : BaseGoogleMapFragment() {
 //                    mMarker?.tag = history
 
 //                    showMarkerInfoWindow(history)
+
+                    if (TextUtils.isEmpty(it)) {
+                        mPetLocationLayoutBinding.root.visibility = View.INVISIBLE
+                    } else {
+                        ViewUtil.instance.viewShow(mPetLocationLayoutBinding.root)
+                    }
                     val address =
                         if (inWifiZone == ConstantInt.Type1 && !TextUtils.isEmpty(wifiZoneName)) {
                             "$wifiZoneName · $it"
                         } else {
                             String.format(mContext!!.getString(R.string.txt_near), it)
                         }
-                    ViewUtil.instance.viewShow(mPetLocationLayoutBinding.root)
+
                     mPetLocationLayoutBinding.let { layout ->
                         layout.tvPetLocationReverseGeocode.text = address
                         layout.tvPetLocationUpdateTime.text = timeString
diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/subscribe/CreditCardPaymentFragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/subscribe/CreditCardPaymentFragment.kt
index c494b6a..36d1b4c 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/fragment/subscribe/CreditCardPaymentFragment.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/subscribe/CreditCardPaymentFragment.kt
@@ -35,7 +35,6 @@ class CreditCardPaymentFragment : BaseFragment<FragmentCreditCardPaymentBinding>
 
     private val mSubscriptionPayViewModel: SubscriptionPayViewModel by viewModels()
     private lateinit var mCreditCardAdapter: CreditCardAdapter
-    private lateinit var mPaymentMethodActivity: PaymentMethodActivity
 
     companion object {
         @JvmStatic
@@ -46,7 +45,6 @@ class CreditCardPaymentFragment : BaseFragment<FragmentCreditCardPaymentBinding>
 
     override fun initData() {
         mViewBinding.apply {
-            mPaymentMethodActivity = mActivity!! as PaymentMethodActivity
             root.setBackgroundResource(R.color.transparent)
             mCreditCardAdapter = CreditCardAdapter(mContext!!, null).apply {
                 setOnAgainClickListener(object : BaseRecyclerAdapter.OnAgainClickListener {
@@ -60,7 +58,7 @@ class CreditCardPaymentFragment : BaseFragment<FragmentCreditCardPaymentBinding>
                     override fun onItemClick(itemView: View?, pos: Int) {
                         val card = getData()[pos]
                         //卡管理 不需要点击效果
-                        if (null == mPaymentMethodActivity.mOrderBean) {
+                        if (null == getHostActivity(PaymentMethodActivity::class.java)?.mOrderBean) {
                             goEditCard(card)
                         } else {
                             if (card.checked) return
@@ -114,7 +112,7 @@ class CreditCardPaymentFragment : BaseFragment<FragmentCreditCardPaymentBinding>
                 dealRequestResult(it, object : GetResultCallback {
                     override fun onResult(any: Any) {
                         it.getOrNull()?.let { o ->
-                            mPaymentMethodActivity.mOrderBean?.apply {
+                            getHostActivity(PaymentMethodActivity::class.java)?.mOrderBean?.apply {
                                 customerId = o.customerId
                                 mSubscriptionPayViewModel.createStripeOrder(this)
                             }
@@ -132,14 +130,16 @@ class CreditCardPaymentFragment : BaseFragment<FragmentCreditCardPaymentBinding>
                 dealRequestResult(it, object : GetResultCallback {
                     override fun onResult(any: Any) {
                         it.getOrNull()?.apply {
-                            val intent = Intent(mContext, PaymentSuccessActivity::class.java)
-                            rechargeType = mPaymentMethodActivity.mRechargeType
-                            mPaymentMethodActivity.mOrderBean?.let { o ->
-                                deviceId = o.deviceId
+                            getHostActivity(PaymentMethodActivity::class.java)?.let { p ->
+                                val intent = Intent(mContext, PaymentSuccessActivity::class.java)
+                                rechargeType = p.mRechargeType
+                                p.mOrderBean?.let { o ->
+                                    deviceId = o.deviceId
+                                }
+                                deviceType = p.mType
+                                intent.putExtra(ConstantString.Amount, this)
+                                startActivity(intent)
                             }
-                            deviceType = mPaymentMethodActivity.mType
-                            intent.putExtra(ConstantString.Amount, this)
-                            startActivity(intent)
                         }
                     }
                 })
@@ -156,7 +156,7 @@ class CreditCardPaymentFragment : BaseFragment<FragmentCreditCardPaymentBinding>
             return
         }
         //卡管理 不需要点击效果
-        if (null == mPaymentMethodActivity.mOrderBean) {
+        if (null == getHostActivity(PaymentMethodActivity::class.java)?.mOrderBean) {
             mViewBinding.btnMakePaymentCreditCard.visibility = View.GONE
         } else {
             var haveCheck = false
diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/subscribe/PaypalPaymentFragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/subscribe/PaypalPaymentFragment.kt
index 6d078c6..f6a6ed7 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/fragment/subscribe/PaypalPaymentFragment.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/subscribe/PaypalPaymentFragment.kt
@@ -2,6 +2,7 @@ package com.abbidot.tracker.ui.fragment.subscribe
 
 import android.content.Context
 import android.content.Intent
+import android.text.TextUtils
 import android.view.View
 import androidx.fragment.app.viewModels
 import com.abbidot.tracker.R
@@ -21,7 +22,6 @@ class PaypalPaymentFragment :
     BaseFragment<FragmentPaypalPaymentBinding>(FragmentPaypalPaymentBinding::inflate) {
 
     private val mSubscriptionPayViewModel: SubscriptionPayViewModel by viewModels()
-    private lateinit var mPaymentMethodActivity: PaymentMethodActivity
 
     companion object {
         @JvmStatic
@@ -31,10 +31,31 @@ class PaypalPaymentFragment :
     }
 
     override fun initData() {
-        mPaymentMethodActivity = mActivity!! as PaymentMethodActivity
         mViewBinding.apply {
             root.setBackgroundResource(R.color.transparent)
             setOnClickListenerViews(btnSureRedirectPaypal)
+
+            if (null == getHostActivity(PaymentMethodActivity::class.java)?.mOrderBean) {
+                tvPaypalPaymentGoTip.visibility = View.GONE
+                btnSureRedirectPaypal.visibility = View.GONE
+                ivSureRedirectPaypalBg.visibility = View.GONE
+            } else {
+                tvNoPaypalPaymentEmail.visibility = View.GONE
+            }
+            showPaypalInfo()
+        }
+    }
+
+    fun showPaypalInfo() {
+        getHostActivity(PaymentMethodActivity::class.java)?.let {
+            it.mPaymentIDBean?.let { pId ->
+                mViewBinding.tvPaypalPaymentEmail.text = pId.paypalMethodInfo.email
+                mViewBinding.tvNoPaypalPaymentEmail.visibility =
+                    if (TextUtils.isEmpty(pId.paypalMethodInfo.email))
+                        View.VISIBLE
+                    else
+                        View.GONE
+            }
         }
     }
 
@@ -44,19 +65,22 @@ class PaypalPaymentFragment :
             dealRequestResult(it, object : GetResultCallback {
                 override fun onResult(any: Any) {
                     it.getOrNull()?.apply {
-                        val intent = Intent(mContext, WebViewActivity::class.java)
-                        intent.putExtra(
-                            ConstantString.Title, getString(R.string.txt_pay_order_payment_title)
-                        )
-                        intent.putExtra(ConstantString.Url, url)
-                        rechargeType = mPaymentMethodActivity.mRechargeType
-                        deviceType = mPaymentMethodActivity.mType
-                        mPaymentMethodActivity.mOrderBean?.let { o ->
-                            deviceId = o.deviceId
-                        }
-                        intent.putExtra(ConstantString.Amount, this)
+                        getHostActivity(PaymentMethodActivity::class.java)?.let { p ->
+                            val intent = Intent(mContext, WebViewActivity::class.java)
+                            intent.putExtra(
+                                ConstantString.Title,
+                                getString(R.string.txt_pay_order_payment_title)
+                            )
+                            intent.putExtra(ConstantString.Url, url)
+                            rechargeType = p.mRechargeType
+                            deviceType = p.mType
+                            p.mOrderBean?.let { o ->
+                                deviceId = o.deviceId
+                            }
+                            intent.putExtra(ConstantString.Amount, this)
 
-                        mPaymentMethodActivity.startActivity(intent)
+                            p.startActivity(intent)
+                        }
                     }
                 }
             })
@@ -66,7 +90,7 @@ class PaypalPaymentFragment :
     override fun onClick(v: View?) {
         mViewBinding.apply {
             when (v!!) {
-                btnSureRedirectPaypal -> mPaymentMethodActivity.mOrderBean?.let {
+                btnSureRedirectPaypal -> getHostActivity(PaymentMethodActivity::class.java)?.mOrderBean?.let {
                     showNoCancelableLoading(true)
                     mSubscriptionPayViewModel.createPaypalOrder(it)
                 }
diff --git a/app/src/main/java/com/abbidot/tracker/util/ThirdPartyUtil.kt b/app/src/main/java/com/abbidot/tracker/util/ThirdPartyUtil.kt
index 44613a5..92ff794 100644
--- a/app/src/main/java/com/abbidot/tracker/util/ThirdPartyUtil.kt
+++ b/app/src/main/java/com/abbidot/tracker/util/ThirdPartyUtil.kt
@@ -1,8 +1,11 @@
 package com.abbidot.tracker.util
 
+import android.content.Context
+import com.abbidot.baselibrary.util.AppUtils
 import com.abbidot.baselibrary.util.LogUtil
 import com.abbidot.tracker.MyApplication
 import com.abbidot.tracker.base.BaseActivity
+import com.abbidot.tracker.constant.KeyNames
 import com.hjq.toast.Toaster
 import com.tencent.mm.opensdk.modelmsg.SendAuth
 import com.tencent.mm.opensdk.openapi.IWXAPI
@@ -31,6 +34,14 @@ class ThirdPartyUtil {
         }
     }
 
+    /**
+     * 获取Stripe正式和测试key
+     */
+    fun getStripeKey(context: Context): String {
+        return if (AppUtils.isDebug()) Util.getMetadata(context, KeyNames.STRIPE_TEST_KEY)
+        else Util.getMetadata(context, KeyNames.STRIPE_RELEASE_KEY)
+    }
+
     /**
      * 开始微信登录
      */
diff --git a/app/src/main/java/com/abbidot/tracker/util/ViewUtil.kt b/app/src/main/java/com/abbidot/tracker/util/ViewUtil.kt
index cc78ade..4b62639 100644
--- a/app/src/main/java/com/abbidot/tracker/util/ViewUtil.kt
+++ b/app/src/main/java/com/abbidot/tracker/util/ViewUtil.kt
@@ -526,15 +526,16 @@ class ViewUtil private constructor() {
         context: Context, layoutId: Int, behaviorState: Int = 0
     ): BottomSheetDialog {
         val view = View.inflate(context, layoutId, null)
-        val bottomSheetDialog = BottomSheetDialog(context)
-        bottomSheetDialog.setContentView(view)
-        //改变弹出位置方式
-        if (behaviorState > 0) {
-            val behavior = BottomSheetBehavior.from(view.parent as View)
-            behavior.state = behaviorState
+        return BottomSheetDialog(context).apply {
+            setContentView(view)
+            setCancelable(false)
+            //改变弹出位置方式
+            if (behaviorState > 0) {
+                val behavior = BottomSheetBehavior.from(view.parent as View)
+                behavior.state = behaviorState
+            }
+            show()
         }
-        bottomSheetDialog.show()
-        return bottomSheetDialog
     }
 
     /**
diff --git a/app/src/main/java/com/abbidot/tracker/vm/GeoCoderViewModel.kt b/app/src/main/java/com/abbidot/tracker/vm/GeoCoderViewModel.kt
index 13f7a68..8509107 100644
--- a/app/src/main/java/com/abbidot/tracker/vm/GeoCoderViewModel.kt
+++ b/app/src/main/java/com/abbidot/tracker/vm/GeoCoderViewModel.kt
@@ -173,6 +173,7 @@ class GeoCoderViewModel : ViewModel() {
 
             override fun onGetReverseGeoCodeResult(result: ReverseGeoCodeResult?) {
                 if (null == result || result.error != com.baidu.mapapi.search.core.SearchResult.ERRORNO.NO_ERROR) {
+                    LogUtil.e("百度地图反向地理编码没有找到检索结果,${result?.error}")
                     //没有找到检索结果
                     return
                 } else {
diff --git a/app/src/main/java/com/abbidot/tracker/vm/MapViewModel.kt b/app/src/main/java/com/abbidot/tracker/vm/MapViewModel.kt
index 1f6ac7a..12b4358 100644
--- a/app/src/main/java/com/abbidot/tracker/vm/MapViewModel.kt
+++ b/app/src/main/java/com/abbidot/tracker/vm/MapViewModel.kt
@@ -179,7 +179,7 @@ class MapViewModel : ViewModel() {
 
                 //警告状态
                 DataBean().apply {
-                    value = context.getString(R.string.txt_in_sleep_mode)
+//                    value = context.getString(R.string.txt_in_sleep_mode)
                     deviceMsgList.add(this)
                 }
             }
diff --git a/app/src/main/java/com/abbidot/tracker/vm/SubscriptionPayViewModel.kt b/app/src/main/java/com/abbidot/tracker/vm/SubscriptionPayViewModel.kt
index 7e54b1a..44d8fa9 100644
--- a/app/src/main/java/com/abbidot/tracker/vm/SubscriptionPayViewModel.kt
+++ b/app/src/main/java/com/abbidot/tracker/vm/SubscriptionPayViewModel.kt
@@ -9,6 +9,7 @@ import com.abbidot.baselibrary.util.MMKVUtil
 import com.abbidot.baselibrary.util.rsa.RSA
 import com.abbidot.tracker.bean.CreditCardBean
 import com.abbidot.tracker.bean.PayResultBean
+import com.abbidot.tracker.bean.PaymentIDBean
 import com.abbidot.tracker.bean.StripeSubscriptionPriceBean
 import com.abbidot.tracker.bean.SubscriptionsOrderBean
 import com.abbidot.tracker.retrofit2.NetworkApi
@@ -26,6 +27,7 @@ class SubscriptionPayViewModel : ViewModel() {
     val mSubscriptionCustomerLiveData = MutableLiveData<Result<StripeSubscriptionPriceBean>>()
     val mCreateStripeOrderLiveData = MutableLiveData<Result<PayResultBean>>()
     val mCreatePaypalOrderLiveData = MutableLiveData<Result<PayResultBean>>()
+    val mPaymentMethodIDLiveData = MutableLiveData<Result<PaymentIDBean>>()
 
     /**
      * Stripe支付创建消费用户
@@ -72,4 +74,12 @@ class SubscriptionPayViewModel : ViewModel() {
             mCreatePaypalOrderLiveData.value = result
         }
     }
+
+    fun getUserPaymentMethodID() {
+        viewModelScope.launch {
+            val userId = MMKVUtil.getString(MMKVKey.UserId)
+            val result = NetworkApi.getUserPaymentMethodID(userId)
+            mPaymentMethodIDLiveData.value = result
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xhdpi/ico_loading_wechat.png b/app/src/main/res/drawable-xhdpi/ico_loading_wechat.png
deleted file mode 100644
index 33f55c6286d224f1e6de5caee1fc02b81fc13cf0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3329
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
LNkvXXu0mjf!)rqd

diff --git a/app/src/main/res/drawable-xhdpi/ico_loading_wechat2.png b/app/src/main/res/drawable-xhdpi/ico_loading_wechat2.png
deleted file mode 100644
index 6f79662c187406b398ace5929201fb867db15e1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2108
zcmV-C2*dY@P)<h;3K|Lk000e1NJLTq002Ay001-y1^@s6)~{P1000OBNkl<ZXhYRn
zZEPG@6+L%$z3Vhl<G3@P*^QGrJL?36wxmrJL#ZGr(9$*ng;WYiQ9&v#Eg&NC(Lf6n
zN>$R7j}{e3t12o~gestd#FzMpR6^A>fJ+I%BJs}JO>OVY&bo<dn%LRhchTGIx_0dK
z%-S<{d4K$4&OPUzd9&}md!Grj9A>h01(zf5BhUsYd^s2$0I2}Ss+6M)<Oq0~7%wsS
za8oq?$Nvlt4$o3DkT7b5rK6*zC33du77#uP;HpMqt5^ZxF97Wwi^hI7Ffed-794X5
z@ntx*Y}ryYM|TqAlK_^^N%4(fn~5J3@g;lu`};=&;`F5PG;HeXhe7l(0Ns;qb^wc6
zxg+a1f0|u*V^MVtx3{-1ikHTI2vk1b&<BIQv(nD*d=@B$DK@QPQ`g%V;`c;Y7pC}B
zZaxq#Vau^X;kB@Irx;EfhQ=sA2ViwrqBHRl=&xd|cwP47$&oPhCmBvAlNT)##e)FW
zhau*llMl4mg&VqoqW>6w$VrA%3GE4D-0CkhToe&@WpeJ9f>s$foHEp#2=wcq1?IrV
zOuQkREBt*998*FohS#n|Z0uF72Y?wQc>r90wrqD}06gOq6~ksiy$wu{2T2?hmqK`V
zZ_btLN+9FBVM9F%&|7^lmH_@P6y<ql-aw4c18DLQSA!I*@rQ`Hiy5Eu5x?KE-E9qM
z%m}4bZEbH;6n@DUA!CQ-xZkT`(}}k2%>0zESOCnpHS4&0Yj{)FJ_Eud9`R?&&5JJy
z>i9`!Lc0fy`~4&>1Q~t#yfXnCF%3<ggQI@p<E?JIrw8Z84JTVyKtxV>#WE}J%{tBj
zFPxv}WE$FU0Nm&c%*s15j`Knd+o|g*LBjGAD={45HQB+!@ftpr)UG8Vt0%8PJ1slE
z+Y9CAIhlsq574E4zyMw>m3Z^Zg+i`+B6|kFwLW9Pz`>}}wDtJVP@x+CTL4#k#xp%`
zIr&d`;(P$)49nAuuTSzkADsh4FQ9ZzDE56wjYCF>aEuvi05ne%_+J3e0n|<4qh*Nx
zc%<11s&OC<b0gV?fhEwZ4BjUQ`}=b4^8m_W=v1a_K@BqoS)u#SMPfgybw5@old2HK
zjSTJrl+^&Q0B|vY2oXkvfCEA=fNn+5!Aw5ydkv`=P8)5*3~mkUjn?5U5$J)@Xl$1>
zx)F%JqN_K9l-mH7Co83ae2xPAWHDCUd*Z~%Nv}9*_%MSvcmacY&Ojd^wq@<%ze!G0
z*S3MM3y@8~*$)O@S3uvoi0Pptj`MmwCQ2FF_X(9=Rp>)@E{P)_upB2Zn+zcFV*u9&
zEZi>$xAf)QX}3E{>-q<o#4iIDokAxI`&gMb^|<cobW*#L1?2vp2uW9VM|W7Z`{;%I
zluoDP{Mv{OLQ6>ElGchSO>dX`Z)ZY#mtg#=x)6mZ2{8C;S-bG{i6WKaA!W3Eo4}t9
zN1e`r#5Go~(4Ert%ZY?+AIVjBUIu|am9g_bsEJh!uTj-xDM}dtivrJr@PL(b?~%Q2
zibww0z^N{%REiAo&e|e5vE%Vo0!^C!02J+b8J+TXYZ}^<^VRa5nm6^d*!gv`M>cMF
zJ<xQ@&<+LJz^na+s*BW%bza~ZfaT(n2k6s2x2F*>9)*IlVC(>(c})%z-I>kh_e^Ty
zt<m*WB@&1I5O@j5;;39kvfp*>w4wc+fvwZUOstVp$z>}^H1&F((G}Wa4dp94ODdsW
zO-z+NeWoGz|E%q%r}U*eb-hcF_`_Tm7P$>&?0i?{0&X<s)HA`XT#<F0f7Oyr8CsTr
zRWl_YE%EYWg~Cu3qnL&^=Bof=v1!_yhpK7W!BoB8T;1o@#j1KY_0xJd2H%^t3-`(A
zRbBbB^0@P&yDU5Zkc?^M96^kS>k^xqmPQ1>0C3rCOcSszW4rrJL){I~7d$wg1>+=$
zZu0z`$BFm=K(gB+PilV4+ZSehlUL~a;xi<kW?*xprb)q7nIZQdrmj5$!j?wk!@$cj
z)bqNuz5U|Wcqv}+{>&z)7>SDZ;{(HkDP5D7a@U1nU^bkdhAT(U(<8F_h%_QlZZ0nC
z?>}|w|IY9XjkW?9#~4^lgyk1*Wp5Z(pCY2|jl8U|u(E{ooMAJeeHn~zOi1DtFyCc4
zh5Z0zRZ<xp9UaX|@$^cRA}c^*rLtt{zDy=FW*Tkx0sNJ)Of<-Q#M`i;{SLtUWuJ*b
zk2IJ0UU^jXE0ogJ%|s-tqlF)YCp-;TTR@f)!R@_+uD=_K3D(wX+LEyd+&Ue~`F#mQ
zADYqdrK*~UMro^MyRy6*|9l(G(oD4N1M^23jSCn*OiPw7_nhG%M9qY{9!!DW^ER4S
zt&o`)!!kM3(4Gbm*ezf~h8cr#fw#!DXWk4~n+!()T+&do!GLeHY*#M6UWfEx)M_lI
zq1^yL7A1}Jo#&Lqg?+7go8fWO3H5d`JvJv7zJqy>Wf$(82%mSuQar7zA7`qV4sWK<
z-#FeO8xad`SSFCt^-V<LCn5b0XSZd$UDI94EyxVl-gx!mY&QcR3vxYS;EP$?eQ>%j
ze?bk`5=tAbYr)aGnfPV^ao<1DIzT3TGn;eoe$yJRB_{h{(XrTOX5K`ED+NO~-4<7$
zmjNCC=-&YM$iD>cW5Q{IqB4ui0NF9YdjK4=Z1<Wsz2WH+lvk<8lgZf7(9jt_GvB#f
mTPMoc6;YbD%d4FWWBvz!74RJ>T(dF&0000<MNUMnLSTXxnfXKj

diff --git a/app/src/main/res/drawable-xhdpi/icon_login_cn_wechat_image.png b/app/src/main/res/drawable-xhdpi/icon_login_cn_wechat_image.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffc5a4069ee9980625d40dc400c40b6f70c07b6d
GIT binary patch
literal 1644
zcmYLK2~-nj5dKNB;Y>CW@Bl3;5J5^kiWcPwRqldF3070_iQH7I;DMr*QZB)xAc#s4
zXb}NZk`P0nq6LZqf>1;&Rk;zQ$R(Ft5<CB5U*DVE%+CMKH{Z<czQnt_*t67h)DS`}
zM+X}>_%*_p3LWlumOJc2h<4M}+1=JY*qI?Bkr1IWgq;Y)5R=$>4?rCGVEH6U{r?fk
zbRY%8iWVRl8yq_LQZ1CVXx?Xt*+{B}0YWYTBw`Ez!>3|41K5OIV8B@-Ejpa$Q$-~l
z06;Fp2@$5H3_Hwx4J6d2i#a$&%)<AA1x&HV2eoo-jFgc`rpYMeLKgs_jyQw_91a1A
zU=kADUWDUNP69=NhYfK8^oUfkFChUBf@zdal!+MmY=nI*3^?f$O4WP|SS=frBcVFx
zgdjCKLc+p?HvrE902IRgLTMqyK?X^~Y!pvE=A=<wqe2qpv5*+r)PUXzVEdI#1Hk+`
zq-+)8yboP)kWdw*(nXvPbCa@|_>p83LPZXe;3-j~!?Iyq%2LqD0U3A~lpzr;4j~bT
zQjT*`fjXQ5Au!{<C>SWg5wHS4f@U^gz|b!&JVV&B3_Gw>cwwma=jTHrxjIqs-wI&A
zVk%3-W=h$N0+>0acD@8mgE|Es8Z--yNZ}Oo;C;zC_?;Ay+=}-W@J4nWb#vjPcXY-a
zO`%XynjM~+Bc^BS)R>cO!`Iy`^|6enI*p|Fw&vH8Ju@GvzFczit2dlSKeU?<<WG*8
zXt=d#b}cg=9b8;$r@MvG*?8+(__sUw>QfEYu1;O4OK+rnDh$1@^5aTbQ-|Zjiw{5l
zt7vgUVp)l&8P~HnRHDDiYb2!l?MP~HKbL2$y&>mx;FWQM741Dqx|fs2p0A2c+Y+_B
z?WJWe&%m`iZQ{?RYI-C6d8QrB-Vy)Q1WQ^oi*K#()Qm3D8vmI#bielbV*lB#?JXG_
zJnZ}XLLY?GwB9~em);Y0O^>M(WNZxGss=j<jv%DI0AEUvTf^VMcYDgwW~;mTj`~a9
z#Rls*v1!RZK^~_jUo^caI@mmK3d1y?q4d6?zEqiBap}>_?whrH%q!Qvk6Q5{MzD#Q
zmFQ)DAS$O(KJoT^75Csh9j5igkT-EBWJuvjk2LlV{GKh8K59C^ixILu?$<PACKUu2
zm{bO|ln&CpDvZu;t=aGPnadJc(52Yu;7q3x%R?s=3R6p^FpHk-tJ~WM^6;U(Tb#^0
zZG8nbx}(L1ik<z29ZsH(vOc~hG4aJpZkT1VRYALvVe+{9cj3I@+je4>Rrpv+X5QIl
zr?Tb4JXha=N++^U6gxLFXu+wA39AkrOz~?=$j&mGYarL?rN=ejx-e-aX5D|5pj|1+
z@O?Hhv!rC>#QB{y$`R#rJ%3wVDH851zx#Wb$!d92SKym&xy-%En4g^-FgUQi%AZKc
zy!=on!D+pZ2CunsbV{Q;_mz>yIzdU~{>=g(MbOEGrn7$(@}tX+kBuJ8-@f}&UHR_R
z<+~m$xz#0~@f`Y6<67_ipsuz4EA9m^yAj{e_C>OZ)#0h5N{WmSk2337dHjA?XVS55
zTHr4B+$7eI=&L=wIjTHz%<elc*1q){j;+2>Vc#Ek?zj3<FD5<L?a@ZAva(jjB8d*y
zIk%%_=RmEXb=NApJJq=oK2iTf<&2l+!W|XXKi&14t|IvFP8xoq%X<>%wAyAkZd-H}
zdzV>a$1Bw~Ze)^D%-(x+hftBduU?#KATgKInByxP(l50=8#L}rKSMm<<2A?YOiEAW
zTrY{s^YiwQm0b8nUUY|fEZ)d0CHm{=toqjuB7RG9Z#q3Tw(aWEu$9#TE{6Uo`daQ?
eWz)*n6|^fyET6`A8=Sy@4vw}iHsWobk^cg|H+eb$

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ico_loading_wechat.png b/app/src/main/res/drawable-xxhdpi/ico_loading_wechat.png
deleted file mode 100644
index a9338128f40ad57924e8dc02495309f7b02a6baa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6503
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
N002ovPDHLkV1ky+P~HFl

diff --git a/app/src/main/res/drawable-xxhdpi/ico_loading_wechat2.png b/app/src/main/res/drawable-xxhdpi/ico_loading_wechat2.png
deleted file mode 100644
index 3d0453ba07ec1d5bdfa2e71d544b2dc88dd38e56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3904
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
O0000<MNUMnLSTYK$YFf|

diff --git a/app/src/main/res/drawable-xxhdpi/icon_login_cn_wechat_image.png b/app/src/main/res/drawable-xxhdpi/icon_login_cn_wechat_image.png
new file mode 100644
index 0000000000000000000000000000000000000000..5257634f0165db9e80e302602d63743c5945ccdd
GIT binary patch
literal 2128
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ico_loading_wechat.png b/app/src/main/res/drawable-xxxhdpi/ico_loading_wechat.png
deleted file mode 100644
index 09817165d84178929abfbed446be0c4696d93d0a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7335
zcmV;Y99ZLtP)<h;3K|Lk000e1NJLTq006WA006WI1^@s6J<SF(0010rNkl<ZcwX&Y
zd7K<owf;`cbS<3;BoY>XDvKya*02c#K||8rAuK^8F%QBbl83S=iwm0&9*BYqC?Fsp
z1P~$YU_!ck!aN=l0)k)wL0Jv(WJ$<`%yiYQo~h%nY9=8wndz>suI|3oQ}-W!WbQrp
zJKz1L=2qQv&mqLEG6v>CG4?S&#o%qAU~9nHhCrJEv<a9u1+WQ#(Ex7@C<=&M!S4S9
zAglpX58yZetp=kD3RVL2KENv({63((0S9jq=neA;^Bv5EQyIXK-J3?X`=z~aTiCX#
zlPG@40Z$-Sc46=r3D^#RS|{FY051XjJb>pFg_e<>c&2Mw*9Uc)KXTK=f?jXQw1>4X
zw6xHEfb(Sr?Snq?%Gmx%;3oj(&%M3;m^e`ULq?E|z%;T2-GR1bk2=|5no7V_z}-Sb
zvc1W`B87NSq19fDN$85C7a@Qid4gVujr3N1IuXwVBVEVsLkP>|%Y+R=j+y3LJ=O!5
zhL3!WYLZSPL(oqnkzA=B#6-scI1qr|B<oks4GV-t<nX-0CiVjCfnvD<QU7^U3tC&O
zZL9Rs955dX!WL0qtg7%c-UZP-r-iQ<lf`RQ*^+p0Qwmyd*QdbY?-RT&MN|4%g{GK*
zJQ!CL(qa(^T!k&^hBnV)cc4`->az%ZCV&ajF)bk=23`Q@GAm*I5tGm(A;gLyMPJZ!
zq39F!qX>LHfX`LTKs*3oyv9TqTAkMIn2FvfQxaW4GstLHXMpKK0OO;)2ohm`8N?Tu
zQ|!B<x)q6}ppCq-H@Nq5fcBP13{3=umx5YOH&f=)s5uoWK^qH=PotGD19(>avR8Ad
zF+g{K=|^V9e5>ZOg)~7l1nmX{P1H^Wa4~?kkbIBL_+y|8gddxai{C^cP)d41kIJh%
zIgIN8+RGpRaj)7iz)vcKIo&DS4V03$$t!5@Gn{%3fzEBh<7sIHQ3jaJ;Gb9t`x03{
z^GPXay<Pt-InJ#BO^oWwH#crx!isXVHN|>eHb12kw4T?GQJAk}U?bVcit&8R00AF4
zM5kIQ>lT@Kkw?%Aq3NyKRRo+M6G1VS(hM+ggViHW!88aNxROH9dS2g>7<U7_rwpXT
z7%F9e{=$SKtdzC9(ve~JZ@8fKy#7^Uo)5sij~BP-GVlR|W>{(K(MGz^P(i!<Wn#WQ
z{)*8^34}Vg%|vq=xvy@Fpc$mMtLGEb1@VbrsDhHg7&GyO))f1H8W9gte?iYjOLB~Q
zJ%hd}1N$+C+Au)in+l!woO(y^)mPB-p&DcKTLGR~8yaJ)axp-6nVr^b%!Hecp)Rd{
zg6@EB6t%kn98?$2;z?v-V1d~tW?&-BdH|}ApdUgqscH8!kgA7M@f>n7K#cZ+EvDlT
z6l#sE_JW=dRUe~0NI<66&cycRWq^UK)hQ0G_4cE-f}W2SV`J?e5T?sZb&RZz3_NId
zio<L9qF6gYGbou;Z|={9QAf_=sbpq=!1D?z`<u1;q*pUR8(ICQAU;cGa${@_Vu0yq
zX2v?Z7PHqx(8-*B0>e82j9bjWkPI->30B6sF>HE57qp($4<O=)<KyhGm#XRP+01mH
zm9ZWP)3Z<otv{@9O)dOX9B35g5;e805145$D`UM8mY3lP`XM9@O?y1fS`^mOj2Ju5
znL_Lv);H?V1f9&OzmMZHMvMqUb<~UdNZZGUVKfv$>pA^s0!wujCk%388}(y=LC08W
z>(**#tXk0Sg;vGkXX877)h@*dA5U1rL=&pLcw3#Iy^}!oF_2e}ByKSS)iJ>Qgt^+@
zubPv@ssyd))bj~mvc$N>41~e}6VJ6$c3@2f7Ia%y-LaSGnfQBiDC-y-`Iv#CLcDv>
z3{AlV?QS*3sDF;Lf5tkj4Fmk7*=g?^Wa|+~&_-7KE(pJ_jWe;;m;vvm>FH)lTu~_(
z6${!}Y<vp6&dYHY&`PO}`&Y<77h06@=4A7oO2$<#=$z{2oSR+AByr!EfnW^qZD!g&
zx{|RK3A!(HzOy7wJx~e7ao;K!V30Dgl1c*p1?|=}$*WJqd77(Oo_J^g2KY%cW$)wn
zLV#~U8+mmmnC=XKC@Mp`0dn6BUIFo2aPT$}6&TKH_rDI2Xkl(~m^Wf5IuVb7gDpX{
zCE#oYqV2&L9TjIIg_C)fnX!Fo&!3>Z<S^Rv416(CM3e@*oQT`O^b|SH(r&HzVpU1J
z=R#5UQMXfo-HE(nMpNT5bK$6kfR_rLVkbYJ@q7uoiGq)wW8(XjUVf-BwfNU?=pNpR
zwn+P&LYM}En^?z9-tLR<TH}hMeZRp=<q7UUt5MWmity8>3&1>u_`0B{Phkkat2^F9
zCxF<^e?2Y?n<L5w<26$i<IDXOEh}g}r_UyE)nR=NApZjfU!f=L-*!$yX9MORddej*
zlHJ;I%=jUIt);;g0U&;!(q#p0<TUqB^R5x_cP+$jCjPnAYX1_G;69z@Y+jx}uT<T6
z0LI7(QaV)6nrX3HDO4o|tuN9ik;0)~Vyr1egg>!Dr&yD%f7NuJ5RH%S7(K37v@asy
z#CVTgo>&G=vC`J!;d+)9bWU3okrZC<gZX4LW4p;9BiZ_I%l{t0R*`g|PN2P%Vrk)i
zK^n3RD`@W}rWdb7;Hj}#Nwm)Hp49zroj9%8G-LDF*kb(}fd8vzlSJPzI}WxJQ^l)8
zxiYMvBa!)t@e6acILpuX$tbO(k<-2h;FkbeqJ+C{SW9GH8d}g#BVnx6mV>ZG-9T10
z5rc3>knqCFrfFR7WL7(b33mWUHV%cfGrwnkLVN~$pg0)ekb*Yy>fvCzM^bl+3_9LQ
zTenGyFEm*CB7Hw<;RW%L`Vf>7f89*k_xcpHb{`mrg|;%`8R`Y|Y%^oKPp%Qs^sK&r
ze`>Y(NxlAxGafKAVgrqC_=H}Fjf__9eE^zliXp;Dg_O8PHe9vF(;pb-{t}lxH>foh
ziR=rrM{I^^_-K7h8xYiAJ8+&vz}G^#%1jIQAYw!|J+GccOg|lw&JW`>6CFFaCgKKy
zHgejZ<SXpsU7Fm#*5wRj7mJb89t3cR>^SR)Z-JQ>2M_;*?m(MS)K*HCnxM;R!2~f`
zyjDk|q?~G0`>4$wr{`|~HkT4${Xq#cA;zsA;xOO|oy@9-G0}bX$5nF1)6BGpZ<zN}
zB>5Mpx=V+czgEcD_phCJfS~o9b`1gFt~;vXCS)u#SBu@kIyh1D>K9v~9LbDrnRpE`
zx0?z3zH%XnmGYtGw6wxF7(|<c_+Nl>ZzcEQ%FSowv~~cK%k>)xKWE@tD=oe=q@azQ
z<_7g_DGLz}kP&H-s~V42z(~J{iQT#$$^d(eWehqjjHKHe{|RG@s&?m4^%x0!bD`5d
zF^u<sWInMgv-0!?zEn+ABn>P#(_&rx%ep7DnpMZQ5V?W;ax^z_U&eNCc~squoOVY4
zQSxxMUN+mrZdFw~b$@B{TDDYiQ3kHF(jt_<fJRQgGcGaRx17Di+uJGI)9yM!Cv)1j
z8Ia~1@8G>rP*r;YKhWMPd)gK-Q_osl$-H(DGu$skrJB>?@XlRR?H7akvvyp6N{J_`
zwbKma3HVMSEv_9PXd|cJE>V=%TV_IhHjKS(GN&ENzym%OZn2pbQ+)IrvWuS6uI-O$
zE@Og!WTx%Qg3h!4I3uq;14hY!_b}#>-v<5BOj}0|613(PZjt0l5M64ftx#$l`u)qp
zz>8K|>=<<MjGX5F(i~cLJmU&8BTg^d&qs&;sJx2vzxgm7wJvX(X|c^ZL67PfwS`mc
z`L`@y5S%>=>7x76Q+4Z)T5}I1N;U#=g|rA<kKD*>SA%g<xp~0&p_vgsFWb*Y2Ys==
z74`C)KDsu27bVg9NjE0m+e43P*QPoS+}eUNv=7WBVhhZL6AG9PwCP3dZ2~qfWsiVU
z3Tbh5&^di_*z5FS2XUbIN6>i&k27-GvvK7yfCvW{QeuH8Xd|or0EAHXbs;R&eP&u5
z9)g{9CXBpx3K&-oXOn^Ftsb!_ra@FQZ`rVc5Vsp^aT;0eau80d26r=zW#%7S8T;aX
zLF<12vA3yibYtdotc)Fc5RRTz&nBX|8y@S^Q)r>XD^1%vBu@`uw2{<q86x!7y^wH?
zxk`LDtV5!8g3hZ)g6R*9Ubn{2Pj{JVYo;e?J*O=rV5i1|^1dTZFQi4;J#P@KdRE_t
z$eF>Q&lB(w0gDSM@vz@SfPUxn0`m#en0TDR^bWN+_jXUQm-!uENk6S!+fH$K9+)--
z;nOmP{Z`^n(7tP5>Iq(X3C#qM2x=_MaSHLyjm&TqrZ0`KrRVi66^D0V;++6xcYwbN
zV6#SGsq>sgvr`!45<u+68_3aGdJ>y;P3!tV4m3@Gf<bLLb%$Qiflx53nZH{z(N@%d
z#ph93md;EF1CwCMf~VPV^leedEkis9;7>G@f6Vk1_X&LrF-vnp#Y~I%no&Je_7IXu
zRXdIeKawdRts2+e8!RMS@k~>QQ8)yJY8;ElR=~g#7)G~tG8pGZJ;xq{FCaau{gw#p
z;z=u@q9$Ei6Y8dGCaqaf6XUVbVHxPV4byuiz%!ys6Em(MBd5=o$q7Z_U264-E2;}s
zPuxaUJpx46NAqb-cadzjABb^CAtTC#Vb*hvN8DWfl?UztVdscB|A;GSsbT?`_&h6R
z|0H5WHXqz9M(L#8MZkd(a_(=gpryKY1;#yQMjR0#5}OxlUs87WSUoE1vE1E5uaxV1
zB(F4=*qenGZP&bVtB+^yN%C0jZb?(a4d&oI_X)j5wz}P<IA1DEDgLECD;CdEmVt%P
zj8^qg*^90+u-X+gmvyM#9SA=+Q^GB(6E{g1NG?i#l9gUJ$<3ycKpF~0mz;tI-Z2wm
z>oD#VN=$y_p!MI+bd$PBdzve&paJmVX4;l5i&Nx87&hQ!UcHgoiv^Lg$t>t6&9v>7
z7#>k=R9?$COy45#4h-)G%@W7K6~omO8IGK=><qTwU$yJia#z|Kv}oRzL%Ns3wPYxS
zsog1&Z4f#2ot8mHyLQzu7i|TYkM&i+JuEvVyw~&Uxx{pFeF-W*TmMU;Y@h8u2F}0>
zRzmDL686$YPCFC8FG?(%tth-_xv+q+?39wvm=27wi`u^!*r>eB>e|EmY$w;j%7*@*
zX{N=m>Pkz!C-Xjw>Hh|JY{{vK?le=@tYQ0vWygpAvIVvELv{~V<U0Bug3E5F1-mqJ
ze&}R2u{)EOe6d`6&rFM9E0cv~ryL0P=XzfMGBH2qr*9qmct_uEnb`yCIB9^X=oz!q
znixjr&H$6we2AXYCllCBkz20WW?Bqe`z9<q<v@5p@4Jio|B~HTbc2)R3LhPgOeXx!
zN(r|fcGEQ@YkUUeEHCF+xpZY=*(rx(?az&zdMiM){r0bYKe|i00RNIsSD7KS_JjtX
z!N_TU2C#1_3k*KjO52x|>Jye7Kc4tVQ|!k~Xnni@f7z~JmGO?5=(xd^k3wUlfri?$
z>W;lcPnM`0`<&S(CYH-#9hMzGROng#03vp`tWvbTD_D|UlJ&t%FEbx&W$dQQ7L?2-
z_5hT53~WD$hkFx_nDfz8eCUH8gk`7PT(TvL?7Jk}SE*E*GzR5J?Ekr&TI+jeN(`H?
z&Ziyuy3I$6K33mHad>BksNk@()Xvy1R}3^PJEbPhVw6EzSH;+BG+=ES1E~_tROstf
zW<s1k5)NJ}<fU%iWs27H63xh#3M{}%JW6OevXCygpOE5KPX@e$98H#_Kz*seT>oWC
z));U-R)G1`kyO+^AWxwVa|4xninbJK+dfX#=;eo&C!KCJj5G7>W_($!hLc*39hFN=
zaG<!CtR-mcrPDQX>JI_BR0330K_J3Og_Mw{l2=vEL}0LyQ)d7)Uk0cQKHo~)7s*(X
zA}~L(paWAEXrPhRe+uGIiaP}Yu->2nB`IVp8WhyISkOV43pUQksgDB`N^#U+2tFP)
zplFc$&qhwBvTniL^CjpGw2kUfx9Of@zYuoj{$Qx1IcjwK=uLVY`#k_H5_mAMtXrR;
zr7FA`h@*0X?mrg33&40V-UV@<p*+&!^gi1?uK0KCfnuPEN8lj8^&jg)%@Bn*<pLOt
zhEjso^ZGZ5`Kl7J5*9!&0C<IfH<<WcIQ%{cHY>^+^uk69RPJR`z?%@!CIumG8mXy&
zjhyyZ0J{cTsc=WFzwYuDuMgn!kb>?&o6)0R3+AH&m@GY{iKG8YIj-mRuM%@d=zIn=
zIArnq{(ZFU*Re{vJXp{Jwip4)Dl_aIQ;6+G+Ed!dY5xo0E487tVynx|wAgCxr~wH>
z^qh7L0pG6Jq$C5@7qp(!k0Y>K88%r<cm%qrkhadR<s35EPG;4^m`Iv@DGXd|rNz30
z{R0Fo8`w%0(i5~L<|Q@tY6cxw>G**CEl0sFVv6`@!12);wh$W`t=fx#R}WE&M$BI;
zWNbH^lh+2ObaMBbMQ!DV)mEjz?gzwg7&w4{9sP6;uMa(Cc3S&2>z&87JQ;cYwwk<)
z1YZbYCd4>Q!nzRF4RVx~tydj<@}?d+_)lN6Ih)LBC%QgL=GOu<Ee>8E(*}Z$;0+de
zI3}EGriA-xu&G-ARjY?(`^)X#P#Jt3Z^JB-efy;MM{3RJDwWvFpcAaLb#s+=q#16s
z8~c#sERrxwlF&(PzAA;)C7;ml4~?vLKM2#MVKrJndYS1&D`VXlE!Z2P^}aWQ9|U8x
zbiObiFf-z?!MKLZ^K0bQ!@+cqbWTJE5PP5VQr6t4#*64VeKvvJ@@~46v=bj;rtA$g
zI&|Xdr;#u|)ZPNHxs=XC1r*_aRfywPAB<H|fed%;S811mahk-5&EGRWAwDxy?9H&5
z*ky`!jf@zE2D+R<$6IMjn*0^R@!5B>s@w$d9&&R|mzrs7$T;j_1??4IRNx*KNLzkD
zZqf&!V*<}>NoYTivg~sQ+LE?@78CzKwl5h&tT8(dwi_-1d`YqDIc*UEnFt9-cBoy<
ze5qyGzs7X9iRPtfMqaxwB4yjaK-Nl&slyRhM$o>qVoI?v(E&jpl6Od<TrETT1tX{Z
z62KWz;ExqbSyQZGGqsl8PRJDZ8U?~D#MtXTaR_{~DeMJ}irO>s>XBfILTa^V&9vC9
z6vt%+9iJRlDAC~EO%U7{#~eA%lEUiZbC`+Vz~&gFwyWb?9oo9^gvgev%&R@DeL-nK
z<>|%(g9|orsFOio-=PO|>OiYuYcGSaZ7>+|sDKP~0rV2V`Mbk-6{NhafZu0QJ|w57
zsDOk6)<7UqlySWdZAx%H$xNRk#k*p*6M!*&bJNpsdQUc|7M~gt%UmeNzFMc02Phu{
ze%(xnFO*CBR`v<)+S7CT(FDFF;KIbi<Y2&I!VQU5_1vMpv`7}TzX4-@p3dH{t}m|p
z$`82r?Z*4+A9s?OffYn_PT_Iu#`U)$Mqc|B7^h1L{AIIK?C56;=1<UGe24lC5ZxiE
z!!fLi8Q>?0`Q$>T_>A{gIIA8-M7LFJrXB;BXZfnp==%xnf_4i!=Jlljf2kfm#B<bz
z0f!maX+?3anNT-xA$qAUvsN?-{l!dKd-;ut@%@B$F&KGcZ?LnZqF;oHz{i~%#J~yy
zoz37Y0E}u7hM}fqkTTIsnM?g*sz}g%qL%I&j$dEneo<q9>2@<?Rg`|BazQUNK8;q#
z{nOMIHGX2ekz$}5J<51<n)!Ams4Et9-&0yU4UEexnJDfXGf)u&j5ExPs90lx1l?E0
z!pl6lS4AM>&M^bN7~m((PJ3TJpXmmh3npmy%^|Pu<S@CPd=kDe#+_mY{4r2eh<EQ!
z+0XmyKCo9{LAz#>S$!@OUl3&CcudT|Pz(^$g@ueYHz+$*3EJCwY^**8qJ4q_h{weY
ztYd)r2~)NAFBh*-im~bh?Vd2T>z^g&=OhnoiB%&z1B5k9G{Kr;y<QE}ss-&%9*3A#
zvjp*2mjPxv&dONxs%0Y-L3{h@oO)9o6C_sacRXGq2Hg9Wg|r<?a?Q{LjfaplG|fF0
z-$f#>Vkq)6@HbP4iDBK=2~W^o#FoAd5xYU;<K*WtMkoOTD_Ehus@*rQ??<SD_V&|R
z{Qx4CF0r2kix)!}$bijE2U;2HkuZq~UC`csI;;OT6JHl5(AZXUF+fZw7BbfF!uF~r
zf_6d1nU}&|swT3>^fNPKom~r$Y9{Eu3jyjpfR3&O@YrTF86f6cye}H$=8Ory)lSeZ
z*1o%l_X0RHeCV;o2r}@X*(nYW5_II(*V+oYPt>YDMtd+$Ddu-cnzJ7Pxk8UP6w@GT
z>0#{!?V^7O$)u*;&p@h{&cwFmWPlj$1zSuH>sxavFY6;{7eNPfqo~~t;2=3^k5Sc#
zfdyupn1P8fYh-_b+4>2(fBRvK(QgBIMm?O1=V&+scblE!sCt&WtFNH@UlfyL)EnZs
zkA{n_rU1P7j86MowR`~_%7OX|+C{;jWM03R!ROSJ)!2AL7$DFkg_Lz(tv=1kv4<W4
zMKY(Kz~JA;*SH#@yIM?IB+yBPv~@!*jQg?Km?!jl$ogYH?u-MP{4AH$eO55jH^Pq1
zsMO<z3)%&&=k+a#agY4PYAU67r1Yn!necThWi4;C$5IH|BcTI&vZ!6fz_%JrN<6=R
z1_-#ZkPxR}5-k6tYS&X9LHGOUUguJnuavM9Z|zngf|d#R$RRp)aINh|yCR*Sy)B4)
z@wV5wExt|OXn71bKQCoPIV#M+{IEQgQqcWdkk+KFpU32V+KZFfgtg+;*(nm!B?Z;G
zxSCW0)j=pdT3$i-<L=AQq}&karLLt6{Me?a6vdg-J;h$;r+1_JNH1uQn7*Pm-v#4h
z$?_LBYTfENZ#M|%nXAN=^*;3r;$$=g{qYN<`+4tY0MCk(t_NA}ipDTNcQD~B89vAP
zMII?ZuXU=gl0fg}0PXG9(YRkF4DeD=%juP5&acFJE&E1N&>kV~6|bB+6GU!ezqmSA
z7%CzB0}fwcrtSHSh{FiSg)po%(#CwW=wtPx$l>$j;-G;S;&mpv&{}2vAqxBCQeH;)
z2|d`W4z%h;eHMYw1TZ1+(vF~k47>=U%dA%Gc3D5eRk|F_Bk1)!*W2|eaQOQKq~n*z
z4J5$?<iWV2kQR%gy0sWi=uIi;wa#jbwQZGNngixzLD-_w-}WZ!{~ka$I}YC<rixda
z%(r#!G_|1DdHFOF#)s;`U~+{$6@b>P3p&Uz0mdRIe2Y2Oeh7P@*zA6f3_-8AievNG
z*n~cvm}jEz7P{JGi)=H{4x&2^SP!g9VRe)FSJIskC+Goebf7KSqfU01rV_j-_tp_z
z{5Kg`q!2GEwAza?30)EOqiWbAThN2(Q?u&$Rw(;}oQVvY2;lQoGh7=3uMl_%SXt5o
z=l|@C{c>%liJsM1&?VMvRL7_-xTj}#2RwmT*@eN|6R=$!qyLIvyadn-AZHmdEhDw{
z+3rc*??z8*^+6m9x>BC|4st#P2U|mNw<yjw1lkNtn}T>89Bcx@Xn@A_nP&F|G}%8*
z0iga=SlkK58Yox^rWMS*0t&weC~v^Qn^5qkwaR)Y>IWT_(pzo+{{Z&FB7-%Vn2G=Z
N002ovPDHLkV1kmS{fhtq

diff --git a/app/src/main/res/drawable-xxxhdpi/ico_loading_wechat2.png b/app/src/main/res/drawable-xxxhdpi/ico_loading_wechat2.png
deleted file mode 100644
index 9055f493be4c25eef76308af1a694920e712bc34..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4326
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
UmzPY!TmS$707*qoM6N<$f*(CRBme*a

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_login_cn_wechat_image.png b/app/src/main/res/drawable-xxxhdpi/icon_login_cn_wechat_image.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b22f407b7fb9a697ff671644d8e3421e8a7daea
GIT binary patch
literal 2570
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
I?m80kKg-oO(EtDd

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_login_register_cn.xml b/app/src/main/res/layout/activity_login_register_cn.xml
index 3567d59..33be489 100644
--- a/app/src/main/res/layout/activity_login_register_cn.xml
+++ b/app/src/main/res/layout/activity_login_register_cn.xml
@@ -32,7 +32,7 @@
             <com.abbidot.tracker.widget.TypefaceTextView
                 android:id="@+id/login_cn_top_content"
                 style="@style/my_TextView_style"
-                android:text="@string/login_txt_seeyou"
+                android:text="@string/app_name"
                 android:textSize="@dimen/textSize24"
                 app:typeface="@string/roboto_regular_font" />
 
diff --git a/app/src/main/res/layout/activity_login_v2_cn.xml b/app/src/main/res/layout/activity_login_v2_cn.xml
new file mode 100644
index 0000000..d2d0971
--- /dev/null
+++ b/app/src/main/res/layout/activity_login_v2_cn.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".ui.activity.account.cn.LoginV2CNActivity">
+
+    <include
+        android:id="@+id/login_v2_cn_top_bar"
+        layout="@layout/layout_top_bar" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <RelativeLayout
+        style="@style/root_layout_style"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/dp_16">
+
+        <com.abbidot.tracker.widget.TypefaceTextView
+            android:id="@+id/tv_login_v2_cn_welcome_back_title"
+            style="@style/my_TextView_style_v2"
+            android:text="@string/txt_welcome_back"
+            android:textSize="@dimen/textSize28"
+            android:textStyle="bold" />
+
+
+        <include
+            android:id="@+id/il_login_v2_cn_phone"
+            layout="@layout/layout_input_edit_view"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_66"
+            android:layout_below="@id/tv_login_v2_cn_welcome_back_title"
+            android:layout_marginTop="@dimen/dp_18" />
+
+        <com.abbidot.tracker.widget.TypefaceTextView
+            android:id="@+id/tv_phone_error_tip_login_cn"
+            style="@style/my_TextView_style_v2"
+            android:layout_below="@id/il_login_v2_cn_phone"
+            android:layout_marginTop="@dimen/dp_10"
+            android:text="@string/txt_use_valid_phone"
+            android:textColor="@color/red_color2"
+            android:textSize="@dimen/textSize14"
+            android:visibility="gone"
+            app:typeface="@string/roboto_regular_font" />
+
+        <include
+            android:id="@+id/il_login_v2_cn_password"
+            layout="@layout/layout_input_edit_view"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_66"
+            android:layout_below="@id/tv_phone_error_tip_login_cn"
+            android:layout_marginTop="@dimen/dp_12" />
+
+        <com.abbidot.tracker.widget.TypefaceTextView
+            android:id="@+id/tv_password_error_tip_login_cn"
+            style="@style/my_TextView_style_v2"
+            android:layout_below="@id/il_login_v2_cn_password"
+            android:layout_marginTop="@dimen/dp_10"
+            android:text="@string/txt_please_enter_pws"
+            android:textColor="@color/red_color2"
+            android:textSize="@dimen/textSize14"
+            android:visibility="gone"
+            app:typeface="@string/roboto_regular_font" />
+
+        <com.abbidot.tracker.widget.TypefaceTextView
+            android:id="@+id/tv_login_v2_cn_forgot_password"
+            style="@style/my_TextView_style_v2"
+            android:layout_below="@id/tv_password_error_tip_login_cn"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="@dimen/dp_28"
+            android:background="@drawable/selector_transparent_pressed"
+            android:text="@string/login_txt_fogot"
+            android:textSize="@dimen/textSize14"
+            app:typeface="@string/roboto_bold_font" />
+
+        <com.abbidot.tracker.widget.TypefaceButton
+            android:id="@+id/btn_login_v2_cn_login"
+            style="@style/my_match_RoundRect_Button_style"
+            android:layout_below="@id/tv_login_v2_cn_forgot_password"
+            android:layout_marginTop="@dimen/dp_45"
+            android:layout_marginBottom="@dimen/dp_16"
+            android:text="@string/txt_login"
+            app:qmui_radius="@dimen/dp_64"
+            app:typeface="@string/roboto_bold_font" />
+
+
+        <com.abbidot.tracker.widget.TypefaceTextView
+            android:id="@+id/btn_login_v2_cn_login_code"
+            style="@style/my_TextView_style_v2"
+            android:layout_below="@id/btn_login_v2_cn_login"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginBottom="@dimen/dp_60"
+            android:text="@string/login_txt_login_code"
+            android:textColor="@color/gray_color50"
+            android:textSize="@dimen/textSize16"
+            app:typeface="@string/roboto_regular_font" />
+    </RelativeLayout>
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_say_hello.xml b/app/src/main/res/layout/activity_say_hello.xml
index 9bc2244..44866c2 100644
--- a/app/src/main/res/layout/activity_say_hello.xml
+++ b/app/src/main/res/layout/activity_say_hello.xml
@@ -33,13 +33,31 @@
         android:textSize="@dimen/textSize10"
         app:typeface="@string/roboto_regular_font" />
 
+    <com.abbidot.tracker.widget.TypefaceButton
+        android:id="@+id/btn_say_hello_login_wechat"
+        style="@style/my_QMUIRoundButton_very_small_style"
+        android:layout_above="@id/tv_say_hello_powered_by"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="@dimen/dp_40"
+        android:background="@color/transparent"
+        android:drawableEnd="@drawable/icon_login_cn_wechat_image"
+        android:drawablePadding="@dimen/dp_8"
+        android:text="@string/login_txt_login_wechat"
+        android:textColor="@color/select_color"
+        android:textSize="@dimen/textSize12"
+        android:visibility="gone"
+        app:qmui_borderColor="@color/line_color1"
+        app:qmui_borderWidth="@dimen/dp_1"
+        app:qmui_radius="@dimen/dp_38"
+        app:typeface="@string/roboto_bold_font" />
+
     <com.abbidot.tracker.widget.TypefaceButton
         android:id="@+id/btn_say_hello_login"
         style="@style/my_RoundRect_Button_style"
         android:layout_height="@dimen/dp_56"
-        android:layout_above="@id/tv_say_hello_powered_by"
+        android:layout_above="@id/btn_say_hello_login_wechat"
         android:layout_marginEnd="-2dp"
-        android:layout_marginBottom="@dimen/dp_66"
+        android:layout_marginBottom="@dimen/dp_70"
         android:layout_toStartOf="@id/view_say_hello_center_placeholder"
         android:background="@color/white_gray_color"
         android:text="@string/txt_login"
@@ -61,11 +79,12 @@
         app:qmui_radius="@dimen/dp_64"
         app:typeface="@string/roboto_bold_font" />
 
+
     <com.abbidot.tracker.widget.TypefaceTextView
         style="@style/my_TextView_style_v2"
         android:layout_width="match_parent"
         android:layout_above="@id/btn_say_hello_signup"
-        android:layout_marginBottom="@dimen/dp_32"
+        android:layout_marginBottom="@dimen/dp_24"
         android:text="@string/txt_say_hi_tip"
         android:textSize="@dimen/textSize32"
         android:textStyle="bold" />
diff --git a/app/src/main/res/layout/fragment_login_cn_account.xml b/app/src/main/res/layout/fragment_login_cn_account.xml
index e1eab11..0cb61ed 100644
--- a/app/src/main/res/layout/fragment_login_cn_account.xml
+++ b/app/src/main/res/layout/fragment_login_cn_account.xml
@@ -75,7 +75,7 @@
         android:layout_alignStart="@id/btn_start_login_cn_account"
         android:layout_marginTop="@dimen/dp_32"
         android:background="@drawable/text_view_pressed"
-        android:drawableTop="@drawable/ico_loading_wechat"
+        android:drawableTop="@drawable/icon_login_cn_wechat_image"
         android:drawablePadding="@dimen/dp_6"
         android:text="@string/login_txt_login_wechat"
         android:textColor="@color/gray_forget_color"
diff --git a/app/src/main/res/layout/fragment_login_cn_first.xml b/app/src/main/res/layout/fragment_login_cn_first.xml
index e6e26d7..dfd94ba 100644
--- a/app/src/main/res/layout/fragment_login_cn_first.xml
+++ b/app/src/main/res/layout/fragment_login_cn_first.xml
@@ -20,14 +20,14 @@
         android:layout_below="@id/ll_login_cn_policy_terms"
         android:layout_centerHorizontal="true"
         android:background="@drawable/shape28_yellow_bg"
-        android:drawableStart="@drawable/ico_loading_wechat2"
+        android:drawableStart="@drawable/icon_login_cn_wechat_image"
         android:drawablePadding="@dimen/dp_8"
         android:gravity="center"
         android:paddingStart="@dimen/dp_36"
         android:paddingTop="@dimen/dp_16"
         android:paddingEnd="@dimen/dp_36"
         android:paddingBottom="@dimen/dp_14"
-        android:text="@string/login_txt_btn_wechat"
+        android:text="@string/app_name"
         android:textSize="@dimen/textSize20"
         app:typeface="@string/roboto_regular_font" />
 
diff --git a/app/src/main/res/layout/fragment_paypal_payment.xml b/app/src/main/res/layout/fragment_paypal_payment.xml
index 9014bca..45eb1ec 100644
--- a/app/src/main/res/layout/fragment_paypal_payment.xml
+++ b/app/src/main/res/layout/fragment_paypal_payment.xml
@@ -5,12 +5,32 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingTop="@dimen/dp_200"
+    android:paddingTop="@dimen/dp_50"
     tools:context=".ui.fragment.subscribe.PaypalPaymentFragment">
 
     <com.abbidot.tracker.widget.TypefaceTextView
+        android:id="@+id/tv_no_paypal_payment_email"
         style="@style/my_TextView_style_v2"
         android:layout_width="match_parent"
+        android:layout_centerInParent="true"
+        android:text="@string/no_data"
+        android:textColor="@color/section_color_bg1"
+        android:textSize="@dimen/textSize16"
+        app:typeface="@string/roboto_regular_font" />
+
+    <com.abbidot.tracker.widget.TypefaceTextView
+        android:id="@+id/tv_paypal_payment_email"
+        style="@style/my_TextView_style_v2"
+        android:layout_width="match_parent"
+        android:textSize="@dimen/textSize20"
+        app:typeface="@string/roboto_regular_font" />
+
+    <com.abbidot.tracker.widget.TypefaceTextView
+        android:id="@+id/tv_paypal_payment_go_tip"
+        style="@style/my_TextView_style_v2"
+        android:layout_width="match_parent"
+        android:layout_below="@id/tv_paypal_payment_email"
+        android:layout_marginTop="@dimen/dp_60"
         android:text="@string/txt_redirect_paypal"
         android:textSize="@dimen/textSize20"
         android:textStyle="bold" />
@@ -18,13 +38,15 @@
     <com.abbidot.tracker.widget.TypefaceButton
         android:id="@+id/btn_sure_redirect_paypal"
         style="@style/my_match_RoundRect_Button_style"
+        android:layout_below="@id/tv_paypal_payment_go_tip"
         android:layout_marginHorizontal="@dimen/dp_16"
-        android:layout_marginTop="@dimen/dp_42"
+        android:layout_marginTop="@dimen/dp_10"
         android:background="@color/orange_color2"
         app:qmui_radius="@dimen/dp_64"
         app:typeface="@string/roboto_bold_font" />
 
     <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iv_sure_redirect_paypal_bg"
         android:layout_width="@dimen/dp_80"
         android:layout_height="wrap_content"
         android:layout_alignTop="@id/btn_sure_redirect_paypal"
diff --git a/app/src/main/res/layout/item_baidu_map_poi_result.xml b/app/src/main/res/layout/item_baidu_map_poi_result.xml
index bf4b023..3d750c7 100644
--- a/app/src/main/res/layout/item_baidu_map_poi_result.xml
+++ b/app/src/main/res/layout/item_baidu_map_poi_result.xml
@@ -10,7 +10,7 @@
         android:id="@+id/baidu_map_poi_name"
         style="@style/my_TextView_style"
         android:layout_width="wrap_content"
-        android:text="@string/register_txt_start"
+        android:text="@string/app_name"
         android:textSize="@dimen/textSize18"
         app:typeface="@string/roboto_bold_font" />
 
@@ -19,7 +19,7 @@
         style="@style/my_TextView_style"
         android:layout_width="wrap_content"
         android:layout_marginTop="@dimen/dp_2"
-        android:text="@string/register_txt_start"
+        android:text="@string/app_name"
         android:textColor="@color/deepGray"
         android:textSize="@dimen/textSize14"
         app:typeface="@string/roboto_regular_font" />
diff --git a/app/src/main/res/layout/layout_recharge_pay_options_cn.xml b/app/src/main/res/layout/layout_recharge_pay_options_cn.xml
new file mode 100644
index 0000000..a2b3fe5
--- /dev/null
+++ b/app/src/main/res/layout/layout_recharge_pay_options_cn.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <com.abbidot.tracker.widget.TypefaceTextView
+        android:id="@+id/tv_need_pay_money_cn"
+        style="@style/my_TextView_style"
+        android:layout_width="match_parent"
+        android:layout_marginTop="@dimen/dp_12"
+        android:text="@string/txt_payment_method"
+        android:textSize="@dimen/textSize14"
+        app:typeface="@string/roboto_bold_font" />
+
+    <RadioGroup
+        android:id="@+id/rg_pay_cn_chose"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_28"
+        android:layout_marginTop="@dimen/dp_28"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.AppCompatRadioButton
+            android:id="@+id/rb_pay_cn_chose_alipay"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:button="@drawable/selector_payment_method_check"
+            android:checked="true"
+            android:drawableEnd="@drawable/pic_alipay"
+            android:drawablePadding="@dimen/dp_18" />
+
+        <androidx.appcompat.widget.AppCompatRadioButton
+            android:id="@+id/rb_pay_cn_chose_wxpay"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:button="@drawable/selector_payment_method_check"
+            android:drawableEnd="@drawable/pic_wechatpay"
+            android:drawablePadding="@dimen/dp_18" />
+
+    </RadioGroup>
+
+    <com.abbidot.tracker.widget.TypefaceRoundButton
+        android:id="@+id/btn_pay_cn_chose_sure"
+        style="@style/my_QMUIRoundButton_big_style"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/dp_40"
+        android:layout_marginBottom="@dimen/dp_28"
+        android:text="@string/txt_sure"
+        android:textColor="@drawable/selector_button_enabled_text_color"
+        android:textSize="@dimen/textSize18"
+        app:qmui_backgroundColor="@color/btn_yellow_color"
+        app:typeface="@string/roboto_bold_font" />
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 926501e..3847426 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1059,4 +1059,6 @@
     <string name="txt_show_all_pet">显示所有宠物</string>
     <string name="txt_already_min_size">已是最小尺寸</string>
 
+    <string name="txt_use_valid_phone">请使用有效的手机号码</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e599b52..a671407 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1117,4 +1117,6 @@
     <string name="txt_show_all_pet">Display All Pets</string>
     <string name="txt_already_min_size">Already at minimum size</string>
 
+    <string name="txt_use_valid_phone">请使用有效的手机号码</string>
+
 </resources>
\ No newline at end of file
diff --git a/baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt b/baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt
index 53c0ba4..6ddf15c 100644
--- a/baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt
+++ b/baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt
@@ -93,7 +93,7 @@ class AppUtils {
          * 是否是国内
          */
         fun isChina(type: String = SWITCH_PAGE_TYPE): Boolean {
-            return false
+//            return false
             if (isDebug()) {
                 if (type == SWITCH_MAP_TYPE && MMKVUtil.getBoolean(MMKVKey.OnlyGoogleMap, false)) {
                     //只启用谷歌地图
@@ -102,11 +102,8 @@ class AppUtils {
                 return MMKVUtil.getBoolean(MMKVKey.DebugIp, true)
             }
             val locale = Locale.getDefault()
-            val lang = locale.language + "-" + locale.country
-            if (lang.contains("CN") || lang.contains("zh")) {
-                return true
-            }
-            return false
+            val lang = locale.language.uppercase() + "-" + locale.country.uppercase()
+            return lang.contains("CN") || lang.contains("ZH")
         }
 
         /**
diff --git a/gradle.properties b/gradle.properties
index 9814e49..8b4b14f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,40 +1,28 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
+## For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
 # When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
 # org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app"s APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-# 表示使用 AndroidX
-android.useAndroidX=true
-# Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
-
-# 表示将第三方库迁移到 AndroidX
-android.enableJetifier = true
-android.nonTransitiveRClass=false
-android.nonFinalResIds=false
-
-#mapbox key
-MAPBOX_DOWNLOADS_TOKEN=sk.eyJ1Ijoic2hhbnJlbnRlY2giLCJhIjoiY2t5bndlZnNuMDdjajJvcjBzOTcxcnVvbiJ9.VR_gh0uqZNVyUN92aACCiQ
-MAPBOX_ACCESS_TOKEN=pk.eyJ1Ijoic2hhbnJlbnRlY2giLCJhIjoiY2t5bzNnNm41MWQyZzJubjd4NzN6MXJnMyJ9.NPjPb__sEUug9PK4L0hlSA
-GOOGLE_MAP_KEY=AIzaSyCFEqlOoo2274NsX7tzoQjs_DA7B9N7-gY
+#Tue Jun 09 14:21:45 CST 2026
 BAIDU_MAP_KEY=YT2CmlqAkpMyzmw1AKNIBlYlBtHESEaW
 BUGLY_KEY=06fc0a9cd1
-#http请求头部加密key
-HTTP_REQUEST_KEY=8989JUIMSKHKehmasdfWEkjhf!*jfsadf8453
-
-#stripe支付
-STRIPE_TEST_KEY=pk_test_51N0gBGCUI9XSagUNC3i1ZTiavE2pncKF3cBPWCu4p0OWowHNh22P1xeEpowp6TUNEeFNfv4OEHmLyj7sihmNuSQl00x2pvl4xH
+GOOGLE_MAP_KEY=AIzaSyCFEqlOoo2274NsX7tzoQjs_DA7B9N7-gY
+HTTP_REQUEST_KEY=8989JUIMSKHKehmasdfWEkjhf\!*jfsadf8453
+MAPBOX_ACCESS_TOKEN=pk.eyJ1Ijoic2hhbnJlbnRlY2giLCJhIjoiY2t5bzNnNm41MWQyZzJubjd4NzN6MXJnMyJ9.NPjPb__sEUug9PK4L0hlSA
+MAPBOX_DOWNLOADS_TOKEN=sk.eyJ1Ijoic2hhbnJlbnRlY2giLCJhIjoiY2t5bndlZnNuMDdjajJvcjBzOTcxcnVvbiJ9.VR_gh0uqZNVyUN92aACCiQ
 STRIPE_RELEASE_KEY=pk_live_51N0gBGCUI9XSagUNNDNWc77OdwDWXVSGIdf8WHjvGfe5plUOfs7eq7uyTEQ3ma1xXHlavwInuw9WZOJQ6Z9FVjLq00VsFpc1Rv
-
-android.suppressUnsupportedCompileSdk=34
\ No newline at end of file
+STRIPE_TEST_KEY=pk_test_51N0gBGCUI9XSagUNC3i1ZTiavE2pncKF3cBPWCu4p0OWowHNh22P1xeEpowp6TUNEeFNfv4OEHmLyj7sihmNuSQl00x2pvl4xH
+android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
+android.suppressUnsupportedCompileSdk=34
+android.useAndroidX=true
+kotlin.code.style=official
+org.gradle.jvmargs=-Xmx1024M -Dkotlin.daemon.jvm.options\="-Xmx1536M" -Dfile.encoding\=UTF-8