[提交人]：王雪伟

[提交简述] ：添加翻译
[实现方案] ：

app/build.gradle

@@ -116,6 +116,7 @@ android {
         zhihu{}
         tuia{}
         source1{}
+        google{}
     }
 
     productFlavors.all {

app/src/main/AndroidManifest.xml

@@ -10,12 +10,12 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" /> <!-- 用于写入缓存数据到扩展存储卡 -->
+<!--    <uses-permission android:name="android.permission.READ_PHONE_STATE" /> &lt;!&ndash; 用于写入缓存数据到扩展存储卡 &ndash;&gt;-->
 
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
+<!--    <uses-permission android:name="android.permission.READ_CONTACTS" />-->
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
 
     <!--必要权限，解决安全风险漏洞，发送和注册广播事件需要调用带有传递权限的接口-->

build.gradle

@@ -27,7 +27,7 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 ext {
-    targetSdkVersion = 29
+    targetSdkVersion = 30
     minSdkVersion = 17
     compileSdkVersion = 29
 }

cms/build.gradle

@@ -87,5 +87,6 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
     implementation(name: 'alipaySdk-15.6.4-20190611174341', ext: 'aar')
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     //implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
 }

cms/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.zxhl.cms">
 
     <application>
-
+        <activity android:name=".googlepay.GooglePayActivity"></activity>
         <activity android:name=".common.WebActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data
                     android:host="web"
                     android:scheme="magicbox" />
-
             </intent-filter>
         </activity>
         <activity android:name=".pay.PayActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data
                     android:host="pay"
                     android:scheme="magicbox" />
-
             </intent-filter>
-        </activity>
-        <!-- 友盟配置 -->
+        </activity> <!-- 友盟配置 -->
         <meta-data
             android:name="UMENG_APPKEY"
             android:value="617f57fde014255fcb63fb6f" />
         <meta-data
             android:name="UMENG_CHANNEL"
-            android:value="${UMENG_CHANNEL_VALUE}" /> <!-- QQ配置 -->
+            android:value="${UMENG_CHANNEL_VALUE}" />
     </application>
+
 </manifest>
\ No newline at end of file

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

+package com.zxhl.cms.googlepay
+
+import android.view.View
+import com.zxhl.cms.R
+import com.zxhl.cms.common.base.BaseActivity
+
+class GooglePayActivity : BaseActivity() {
+
+    override fun onClick(v: View?) {
+        TODO("Not yet implemented")
+    }
+
+    override fun layoutID(): Int {
+        return R.layout.activity_google_pay
+    }
+
+    override fun init() {
+
+    }
+}
\ No newline at end of file

cms/src/main/res/layout/activity_google_pay.xml

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    tools:context=".googlepay.GooglePayActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -80,8 +80,8 @@
     <string name="box_detail_open_box_result_btn_one_again">Open</string>
     <string name="box_detail_open_box_result_btn_five_again">再来五发</string>
     <string name="box_detail_open_box_result_btn_receive">立即收下</string>
-    <string name="box_detail_open_box_result_re_pumping_desc">抽到商品不满意?点击使用重抽卡</string>
-    <string name="box_detail_open_box_result_re_pumping_desc2">对抽到商品不满意，使用重抽卡可重新抽取盲盒</string>
+    <string name="box_detail_open_box_result_re_pumping_desc">Not satisfied with the product, click here to reopen the box</string>
+    <string name="box_detail_open_box_result_re_pumping_desc2">Not satisfied with the product, you can use the reopen card to reopen the box for free</string>
     <string name="box_detail_open_box_result_re_pumping_desc3">恭喜您获得重抽卡，下次抽盒\n即可使用</string>
     <string name="box_detail_open_box_result_re_pumping_desc4">使用重抽卡可免费重新开箱</string>
     <string name="box_detail_open_box_result_try_play_desc">该商品为试玩结果，仅供参考</string>

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

@@ -585,7 +585,7 @@ class GoodsDetailActivity : BaseActivity(), GoodsDetailContract.View,
                 cardNum,
                 useStatus,
                 descStr,
-                "对抽到商品不满意，使用重抽卡可重新抽取盲盒",
+                "Not satisfied with the product, you can use the reopen card to reopen the box for free",
                 {
                     //left
                 }, {

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

@@ -701,7 +701,7 @@ class LotteryRuslutActivity : BaseActivity(), LotteryContract.View, AdCallback<S
                 1,
                 2,
                 "恭喜您获得重抽卡，下次抽盒\n即可使用",
-                "对抽到商品不满意，使用重抽卡可重新抽取盲盒",
+                "Not satisfied with the product, you can use the reopen card to reopen the box for free",
                 {
                     //left
                 }, {
@@ -797,7 +797,7 @@ class LotteryRuslutActivity : BaseActivity(), LotteryContract.View, AdCallback<S
                 cardNum,
                 status,
                 descStr,
-                "对抽到商品不满意，使用重抽卡可重新抽取盲盒",
+                "Not satisfied with the product, you can use the reopen card to reopen the box for free",
                 {
                     //left
                 }, {