[提交人]：王雪伟

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

app/src/main/java/com/zhangxin/magicbox/Appli.kt

@@ -52,7 +52,8 @@ class Appli : Application() {
             currencyCode = CurrencyCode.USD,//货币种类：CNY-人民币；HKD-港币；TWD-新台币；USD-美元...
             userAction = UserAction.PAY_NOW,
             settingsConfig = SettingsConfig(
-                loggingEnabled = true
+                loggingEnabled = true,
+                shouldFailEligibility = false
             )
         )
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {

cms/src/main/java/com/zxhl/cms/pay/PayActivity.kt

@@ -7,6 +7,18 @@ import android.text.TextUtils
 import android.util.Log
 import android.view.View
 import androidx.recyclerview.widget.GridLayoutManager
+import com.paypal.checkout.PayPalCheckout
+import com.paypal.checkout.approve.OnApprove
+import com.paypal.checkout.cancel.OnCancel
+import com.paypal.checkout.createorder.CreateOrder
+import com.paypal.checkout.createorder.CurrencyCode
+import com.paypal.checkout.createorder.OrderIntent
+import com.paypal.checkout.createorder.UserAction
+import com.paypal.checkout.error.OnError
+import com.paypal.checkout.order.Amount
+import com.paypal.checkout.order.AppContext
+import com.paypal.checkout.order.Order
+import com.paypal.checkout.order.PurchaseUnit
 import com.zxhl.cms.R
 import com.zxhl.cms.common.Constant
 import com.zxhl.cms.common.NetConfig
@@ -231,8 +243,11 @@ class PayActivity : BaseActivity(), PayContract.View,
 
         EventUtils.onEvent("member_page_show")
 //            startActivity(Intent(this,GooglePayActivity::class.java))
+        initPaypal()
+//        payPalPay()
     }
 
+
     fun checkChoose() {
         if (needPrice.equals("0")) {
             id_rl_buy_bg?.visibility = View.GONE
@@ -447,5 +462,81 @@ class PayActivity : BaseActivity(), PayContract.View,
         false
     }
 
+    private fun initPaypal() {
+        id_PayPal_btn.setup(
+            createOrder =
+            CreateOrder { createOrderActions ->
+                val order =
+                    Order(
+                        intent = OrderIntent.CAPTURE,
+                        appContext = AppContext(userAction = UserAction.PAY_NOW),
+                        purchaseUnitList =
+                        listOf(
+                            PurchaseUnit(
+                                amount =
+                                Amount(currencyCode = CurrencyCode.USD, value = "0.01")
+                            )
+                        )
+                    )
+//                createOrderActions.set("")
+                createOrderActions.create(order)
+                Log.i("id_PayPal_btn", "createOrderActions order: ${order.purchaseUnitList.size}")
+            },
+            onApprove =
+            OnApprove { approval ->
+                approval.orderActions.capture { captureOrderResult ->
+                    Log.i("id_PayPal_btn", "CaptureOrder CaptureOrderResult: $captureOrderResult")
+                    approval.data.orderId
+
+                }
+            },
+            onError = OnError { errorInfo ->
+                Log.d("id_PayPal_btn", "Wid_PayPal_btn OnError Error: $errorInfo")
+            },
+            onCancel = OnCancel {
+                Log.d("id_PayPal_btn", " OnCancel Buyer canceled the PayPal experience.")
+            }
+        )
+    }
+
+    fun payPalPay() {
+//        PayPalCheckout.startCheckout()
+        id_PayPal_btn.setup(
+            createOrder =
+            CreateOrder { createOrderActions ->
+                var orderId: String = "111111111111111111111111";
+//                val order =
+//                    Order(
+//                        intent = OrderIntent.CAPTURE,
+//                        appContext = AppContext(userAction = UserAction.PAY_NOW),
+//                        purchaseUnitList =
+//                        listOf(
+//                            PurchaseUnit(
+//                                amount =
+//                                Amount(currencyCode = CurrencyCode.USD, value = "0.01")
+//                            )
+//                        )
+//                    )
+                createOrderActions.set(orderId)
+//                createOrderActions.create(order)
+//                Log.i("id_PayPal_btn", "createOrderActions order: ${order.purchaseUnitList.size}")
+            },
+            onApprove =
+            OnApprove { approval ->
+                approval.orderActions.capture { captureOrderResult ->
+                    Log.i("id_PayPal_btn", "CaptureOrder CaptureOrderResult: $captureOrderResult")
+                    approval.data.orderId
+
+                }
+            },
+            onError = OnError { errorInfo ->
+                Log.d("id_PayPal_btn", "Wid_PayPal_btn OnError Error: $errorInfo")
+            },
+            onCancel = OnCancel {
+                Log.d("id_PayPal_btn", " OnCancel Buyer canceled the PayPal experience.")
+            }
+        )
+        id_PayPal_btn.callOnClick()
+    }
 
 }
\ No newline at end of file

cms/src/main/java/com/zxhl/cms/paypal/PayPaylHelper.kt

+package com.zxhl.cms.paypal
+
+import android.app.Activity
+import android.os.Build
+import android.util.Log
+import androidx.annotation.RequiresApi
+import com.paypal.checkout.PayPalCheckout
+import com.paypal.checkout.PayPalCheckout.start
+import com.paypal.checkout.approve.Approval
+import com.paypal.checkout.approve.OnApprove
+import com.paypal.checkout.cancel.OnCancel
+import com.paypal.checkout.createorder.*
+import com.paypal.checkout.error.ErrorInfo
+import com.paypal.checkout.error.OnError
+import com.paypal.checkout.order.*
+import com.paypal.checkout.shipping.OnShippingChange
+import com.paypal.checkout.shipping.ShippingChangeActions
+import com.paypal.checkout.shipping.ShippingChangeData
+import java.util.*
+import kotlin.collections.ArrayList
+
+
+/**
+ * @author (wangXuewei)
+ * @datetime 2022-03-10 16:06 GMT+8
+ * @detail :
+ */
+object PayPaylHelper {
+
+//    private val TAG = "PayPaylHelper"
+//    private var checkOrderMax: Int = 300//循环检测的最大次数
+//    private var checkOrderCount: Int = -1//循环检测的初始次数
+//    private var isCheckOrderFlag: Boolean = false//是否检测订单状态中
+//    @RequiresApi(Build.VERSION_CODES.M)
+//    private fun startPayPal(context: Activity, paypalOrderId: String) {
+//        PayPalCheckout.start(CreateOrder { createOrderActions ->
+//            createOrderActions.set(
+//                paypalOrderId
+//            )
+//        }, null, null,
+//            OnCancel {//实测取消订单后没走这个方法，走到了报错，报的returnUrl是空，但我们再paypal后台和sdk初始化均设置了的，而且在手机浏览器登录paypal买家账号后也是可以拉回我们app的，但是它还是会报这个错，无语子，估计还是paypal得bug
+//                resetCheckPaypalOrder()
+//                System.out.println("用户取消Paypal支付")
+//            },
+//            OnError { errorInfo ->
+//                resetCheckPaypalOrder()
+//                System.out.println("==========paypal onError=======ErrorInfo=======>: $errorInfo")
+//                System.out.println(
+//                    if (errorInfo?.reason.isNullOrBlank()) (if (errorInfo?.error?.message.isNullOrBlank())
+//                        "Paypal支付未知错误" else errorInfo.error.message) else errorInfo!!.reason
+//                )
+//            })
+//        checkOrderCount = 0
+//        isCheckOrderFlag = true
+//        startCheckPaypalOrder(context, paypalOrderId)
+//    }
+//
+//    private fun startCheckPaypalOrder(context: Activity, paypalOrderId: String) {
+//        System.out.println("======Stephen=======checkPaypalOrder====>Count:$checkOrderCount")
+//        if (!isCheckOrderFlag) return
+//        if (checkOrderCount >= checkOrderMax) {
+//            resetCheckPaypalOrder()
+//            System.out.println("Paypal订单支付等待超时")
+//            return
+//        }//end of if
+//        ApiRequestMethod.checkPaypalOrder(paypalOrderId, object : RequestAllCallback<String> {
+//            //这个是我们接口调用封装方法，换成你们自己的哈（REST v2订单详情接口：https://developer.paypal.com/api/orders/v2/#orders_get）
+//            override fun onSuccess(data: String?) {//接口返回正确json形如：{"paypal_status":"CREATED"}
+//                var isContinueLoop = true
+//                val jsonObject = ToolUtils.instance.fromJsonToObj(data)
+//                if (null != jsonObject && jsonObject.has("paypal_status")) {
+//                    when (jsonObject.getString("paypal_status")) {
+//                        "APPROVED" -> {//这个状态表示用户已经支付完成，后台开始捕获订单并开始执行确认了，实测这个状态有时差不多得持续1分多钟，快的话也是耗费20多秒，因此添加一个loading逻辑如下，此具体loading显示逻辑更换成你自己实际的loading框，注意loading框得依附在你自己App的当前支付界面上，因为你看到paypal的支付框实质是一个activity，依附在paypal上面会被误关闭
+//                            if (!ToolUtils.instance.isLoadingShow()) ToolUtils.instance.showLoading(
+//                                "确认支付结果中...",
+//                                appendActivity = context
+//                            )
+//                        }
+//                        "COMPLETED" -> {//这个状态表示后台捕获确认订单完成，也就是这笔订单真正的完成了
+//                            isContinueLoop = false
+//                            resetCheckPaypalOrder()
+//                            System.out.println("Paypal订单支付成功")
+//                        }
+//                    }
+//                }//end of if
+//                if (isContinueLoop) {
+////                ToolUtils.instance.delayExecute(1000L){//这个是我们延时调用封装方法，换成你们自己的哈
+////                    checkOrderCount++
+////                    startCheckPaypalOrder(context, paypalOrderId)
+////                }
+//                }//end of if
+//            }
+//
+//            override fun onFailure(aliErrorResponse: AliErrorResponse, httpCode: Int): Boolean {
+//                ToolUtils.instance.delayExecute(1000L) {
+//                    checkOrderCount++
+//                    startCheckPaypalOrder(context, paypalOrderId)
+//                }
+//                return false
+//            }
+//        })
+//    }
+//
+//    private fun resetCheckPaypalOrder() {
+//        checkOrderCount = 0
+//        isCheckOrderFlag = false
+//
+////        ToolUtils.instance.closeLoading()//关闭loading框
+//    }
+
+}
\ No newline at end of file

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

@@ -299,5 +299,11 @@
         android:layout_marginLeft="15dp"
         android:layout_marginTop="6dp" />
 
+    <com.paypal.checkout.paymentbutton.PayPalButton
+        android:id="@+id/id_PayPal_btn"
+        android:layout_width="wrap_content"
+
+        android:layout_centerInParent="true"
+        android:layout_height="wrap_content"/>
 
 </RelativeLayout>
\ No newline at end of file

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

@@ -30,11 +30,11 @@
     <string name="get_value">100% get value</string>
     //仓库
     <string name="time_limit">Limited time offer</string>
-    <string name="immediate_recycling">Recycle</string>
+    <string name="immediate_recycling">Reclaim</string>
     <string name="take_delivery">Deliver</string>
     <string name="to_be_picked_up">待提货</string>
     <string name="to_be_received">待收货</string>
-    <string name="recycled">Recycled</string>
+    <string name="recycled">Reclaimed</string>
     <string name="to_be_recycled">My Goods</string>
     <string name="finished">已完成</string>
     <string name="make_sure_recycle">Confirm</string>
@@ -82,27 +82,27 @@
     <string name="box_detail_open_box_five_lottery_btn">Open 5x</string>
     <string name="box_detail_open_box_shop_pool_tips">爆率按商品等级划分</string>
     <string name="box_detail_open_box_bottom_desc">No more data～</string>
-    <string name="box_detail_open_box_shop_pool_gailv">概率%1$s</string>
+    <string name="box_detail_open_box_shop_pool_gailv">%1$s chance</string>
     <string name="box_detail_open_box_result_btn_happy">Take it</string>
-    <string name="box_detail_open_box_result_btn_try">Try my luck</string>
+    <string name="box_detail_open_box_result_btn_try">Try 1x</string>
     <string name="box_detail_open_box_result_btn_konw">Got it</string>
     <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_btn_five_again">Open 5x</string>
+    <string name="box_detail_open_box_result_btn_receive">Take it</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_desc3">Congratulations on getting the reopen card. You can use it next time you open the box</string>
     <string name="box_detail_open_box_result_re_pumping_desc4">使用重抽卡可免费重新开箱</string>
-    <string name="box_detail_open_box_result_try_play_desc">该商品为试玩结果，仅供参考</string>
+    <string name="box_detail_open_box_result_try_play_desc">It\'s trial result, for reference only</string>
 
     <!--充值-->
-    <string name="pay_title">充值幸运币</string>
-    <string name="pay_coin_balance">金币余额</string>
+    <string name="pay_title">Top-up center</string>
+    <string name="pay_coin_balance">Balance</string>
     <string name="pay_record">充值记录</string>
-    <string name="pay_button">立即充值</string>
+    <string name="pay_button">Top-up</string>
     <string name="pay_wechat">微信支付</string>
     <string name="pay_zfb">支付宝支付</string>
-    <string name="pay_need_desc">本次所需：</string>
+    <string name="pay_need_desc">Needed：</string>
 
     <!--    填写地址-->
     <string name="ShippingAddress">Shipping address</string>

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

@@ -40,9 +40,9 @@ class ShopGoodsDetailActivity : BaseActivity() {
 
         id_shop_detail_goods_img.setLoadImageUrl(goodsDetail?.mainImage, false)
         id_shop_detail_goods_price.text = goodsDetail?.salePriceStr
-        id_shop_detail_goods_oldPrice.text = "¥${goodsDetail?.originalPrice}"
+        id_shop_detail_goods_oldPrice.text = "$${goodsDetail?.originalPrice}"
         id_shop_detail_goods_oldPrice.paint?.flags = Paint.STRIKE_THRU_TEXT_FLAG //中划线
-        id_shop_detail_goods_sell_num.text = "售出: ${goodsDetail?.salesVolume}"
+        id_shop_detail_goods_sell_num.text = "sold: ${goodsDetail?.salesVolume}"
         id_shop_detail_goods_name.text = goodsDetail?.productName
         //解析商品详情图
         var goodsImgList: List<String> =

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

@@ -386,7 +386,7 @@ class ShopOrderActivity : BaseActivity(), ShopOrderContract.View, PayContract.Vi
     var ifUseDiscount: Boolean? = true
     var mdiscount: String? = ""
     fun useDisCount() {
-        id_tv_youhui.text = "-¥ ${discount}"
+        id_tv_youhui.text = "-$ ${discount}"
         ifUseDiscount = true
         id_img_chosse_youhui.setImageResource(R.drawable.icon_xuanzhong)
         id_tv_pay_money.text = totalPrice
@@ -398,7 +398,7 @@ class ShopOrderActivity : BaseActivity(), ShopOrderContract.View, PayContract.Vi
     //不使用优惠
     fun noUseDiscount() {
         ifUseDiscount = false
-        id_tv_youhui.text =  "-¥ ${discount}"
+        id_tv_youhui.text =  "-$ ${discount}"
         id_img_chosse_youhui.setImageResource(R.drawable.icon_xuanzhong_default)
         id_tv_pay_money.text = totalPrice2
         payId = payGoodsId2

moduleMain/src/main/java/com/zxhl/main/page/adapter/BoxOrderAdapter.kt

@@ -32,7 +32,7 @@ class BoxOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, BoxOrderAdapter.Vie
         holder.img_order_no_copy?.setOnClickListener {
             copy(holder.id_tv_order_no?.text.toString())
         }
-        holder.id_tv_total_price?.text = "¥${bean.cash}"
+        holder.id_tv_total_price?.text = "$${bean.cash}"
         var mPrice = bean.cash?.toDouble()?.plus(bean.discount?.toDouble())
         var total=AppContext.get().getString(R.string.total)
         var discount=AppContext.get().getString(R.string.discount)

moduleMain/src/main/java/com/zxhl/main/page/adapter/ItemGoodsAdapter.kt

@@ -25,7 +25,7 @@ class ItemGoodsAdapter : BaseRecyclerAdapter<GoodList, ItemGoodsAdapter.ViewHold
         var bean = mList[position]
         holder.item_goods_img?.setLoadImageUrl(bean.mainImage, false)
         holder.item_goods_name?.text = bean.productName
-        holder.item_goods_price?.text = "¥${bean.salePriceStr}"
+        holder.item_goods_price?.text = "$${bean.salePriceStr}"
     }
 
 

moduleMain/src/main/java/com/zxhl/main/page/adapter/OrderAdapter.kt

@@ -26,7 +26,7 @@ class OrderAdapter : BaseRecyclerAdapter<GoodList, OrderAdapter.ViewHolder> {
         holder?.item_order_img?.setLoadImageUrl(bean.mainImage, false)
         holder?.item_order_name?.text = bean.productName
         holder?.item_order_num?.text = "x ${bean.amount}"
-        holder?.id_tv_sale_price?.text="¥ ${bean.salePriceStr}"
+        holder?.id_tv_sale_price?.text="$ ${bean.salePriceStr}"
     }
 
 

moduleMain/src/main/java/com/zxhl/main/page/adapter/ShopListAdapter.kt

@@ -64,9 +64,9 @@ class ShopListAdapter : BaseRecyclerAdapter<ShopListEntity, RecyclerView.ViewHol
             holder.goodsName?.text = bean.productName
             holder.goodsPrice?.text = bean.salePriceStr
             holder.goodsImg?.setLoadImageUrl(bean.mainImage, false)
-            holder.goodsOldPrice?.text="¥${bean.originalPrice}"
+            holder.goodsOldPrice?.text="$${bean.originalPrice}"
             holder.goodsOldPrice?.paint?.flags=Paint.STRIKE_THRU_TEXT_FLAG //中划线
-            holder.sellNum?.text="已售:${bean.salesVolume}"
+            holder.sellNum?.text="sold:${bean.salesVolume}"
 
 
 

moduleMain/src/main/java/com/zxhl/main/page/adapter/ShopOrderAdapter.kt

@@ -43,7 +43,7 @@ class ShopOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, ShopOrderAdapter.V
         }
         holder.id_tv_total_price?.text = "$${bean.cash}"
         var mPrice = bean.cash?.toDouble()?.plus(bean.discount?.toDouble())
-        //holder.id_tv_pricedesc?.text = "总价:¥${mPrice}｜优惠:¥${bean.discount}｜运费:¥${bean.freight}｜"
+        //holder.id_tv_pricedesc?.text = "总价:$${mPrice}｜优惠:$${bean.discount}｜运费:$${bean.freight}｜"
         var total=AppContext.get().getString(R.string.total)
         var discount=AppContext.get().getString(R.string.discount)
         var express_fee=AppContext.get().getString(R.string.express_fee)

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

@@ -25,7 +25,7 @@ class ShopFragment : BaseFragment(), ShopContract.View {
         shop_viewPager?.currentItem = 1
         val user = SettingPreference.getUserInfoData()
         if (user != null) {
-            id_my_mobi_num.text = "我的魔币：${user.avaMagic ?: "0"}"
+            id_my_mobi_num.text = "${user.avaMagic ?: "0"}"
         }
     }
 

moduleMain/src/main/java/com/zxhl/main/page/view/BoxResultDialog.kt

@@ -145,6 +145,7 @@ object BoxResultDialog : LotteryContract.View {
             )
         var btnClose = mDialogView.findViewById<ImageView>(R.id.id_result_close)
         var oneGoodsImg = mDialogView.findViewById<ImageView>(R.id.id_result_one_goods)
+        var oneGoodsName = mDialogView.findViewById<TextView>(R.id.id_result_test_goods_name)
         var goodsImg1 = mDialogView.findViewById<ImageView>(R.id.id_result_list_goods_1)
         var goodsImg2 = mDialogView.findViewById<ImageView>(R.id.id_result_list_goods_2)
         var goodsImg3 = mDialogView.findViewById<ImageView>(R.id.id_result_list_goods_3)
@@ -186,6 +187,7 @@ object BoxResultDialog : LotteryContract.View {
             resultDesc2.text = Html.fromHtml(desc2)
         }
         oneGoodsImg.visibility = View.GONE
+        oneGoodsName.visibility = View.GONE
         fiveGoodsLine1.visibility = View.GONE
         fiveGoodsLine2.visibility = View.GONE
         btnOk.visibility = View.GONE
@@ -195,7 +197,9 @@ object BoxResultDialog : LotteryContract.View {
             Constant.Key.TEST_LOTTERY -> {
                 //试用
                 oneGoodsImg.visibility = View.VISIBLE
+                oneGoodsName.visibility = View.VISIBLE
                 Glide.with(mActivity).load(lotteryList[0].mainImage).into(oneGoodsImg)
+                oneGoodsName.text = lotteryList[0].productName
                 btnOk.visibility = View.VISIBLE
                 btnOneAgain.visibility = View.VISIBLE
                 btnOneAgain.text =

moduleMain/src/main/res/layout/activity_layout_goods_receive.xml

@@ -143,7 +143,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginRight="11dp"
-                    android:text="花费"
+                    android:text="cost"
                     android:textColor="@color/color_333333"
                     android:textSize="12sp" />
 

moduleMain/src/main/res/layout/activity_layout_order_detail.xml

@@ -326,7 +326,7 @@
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
             android:layout_toRightOf="@id/id_tv_yingfu"
-            android:text="¥"
+            android:text="$"
             android:textColor="#FF2E31"
             android:textSize="13sp" />
 

moduleMain/src/main/res/layout/activity_layout_shop_goods_detail.xml

@@ -23,7 +23,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:text="商品详情"
+            android:text="Good detail"
             android:textColor="@color/color_333333"
             android:textSize="18sp"
             android:textStyle="bold" />
@@ -86,7 +86,7 @@
                     android:id="@+id/id_shop_detail_goods_oldPrice"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="¥0"
+                    android:text="$0"
                     android:textColor="@color/color_999999"
                     android:textSize="15sp"
                     android:textStyle="bold" />
@@ -96,7 +96,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="right|center_vertical"
-                    android:text="售出: 0"
+                    android:text=""
                     android:textColor="@color/color_999999"
                     android:textSize="15sp" />
             </LinearLayout>
@@ -123,7 +123,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="10dp"
                 android:layout_marginBottom="20dp"
-                android:text="商品详情"
+                android:text="good detail"
                 android:textColor="@color/color_333333"
                 android:textSize="14sp"
                 android:textStyle="bold" />
@@ -154,7 +154,7 @@
         android:layout_marginBottom="10dp"
         android:background="@drawable/shape_ff2e31_r25"
         android:gravity="center"
-        android:text="立即购买"
+        android:text="Buy now"
         android:textColor="@color/white"
         android:textSize="18sp"
         android:textStyle="bold" />

moduleMain/src/main/res/layout/activity_layout_shop_order.xml

@@ -239,7 +239,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginRight="10dp"
                         android:layout_toLeftOf="@+id/id_img_chosse_youhui"
-                        android:text="-¥0"
+                        android:text="-$0"
                         android:textColor="#FF2E31"
                         android:textSize="14sp"
                         android:textStyle="bold" />
@@ -269,7 +269,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="¥ "
+                        android:text="$ "
                         android:textColor="#FF2E31"
                         android:textSize="14sp"
                         android:textStyle="bold" />

moduleMain/src/main/res/layout/dialog_layout_box_result.xml

@@ -23,6 +23,17 @@
             android:layout_marginBottom="15dp"
             android:background="@drawable/shape_ededed_r5_stroke" />
 
+        <TextView
+            android:id="@+id/id_result_test_goods_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:paddingLeft="10dp"
+            android:gravity="center"
+            android:paddingRight="10dp"
+            android:textColor="@color/color_333333"
+            android:textSize="14sp" />
+
         <LinearLayout
             android:id="@+id/id_result_five_goods_line1"
             android:layout_width="match_parent"

moduleMain/src/main/res/layout/fragment_layout_shop.xml

@@ -6,20 +6,36 @@
     android:background="#F6F6F6"
     android:orientation="vertical">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="70dp"
+        android:paddingTop="20dp"
+        android:background="@color/white"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingLeft="15dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableRight="@drawable/icon_mobi"
+            android:text="Balance："
+            android:textColor="@color/color_333333"
+            android:textSize="15sp"
+            android:textStyle="bold" />
+
         <TextView
             android:id="@+id/id_my_mobi_num"
             android:layout_width="match_parent"
-        android:layout_height="70dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
             android:background="@color/white"
-        android:drawableLeft="@drawable/icon_mobi"
-        android:drawablePadding="5dp"
-        android:gravity="center|left"
-        android:paddingLeft="10dp"
-        android:paddingTop="28dp"
-        android:text="我的魔币：0"
+            android:text="0"
             android:textColor="@color/color_333333"
             android:textSize="15sp"
             android:textStyle="bold" />
+    </LinearLayout>
+
 
     <com.zxhl.cms.widget.TabPagerIndicator
         android:id="@+id/id_fragment_shop_tab"

moduleMain/src/main/res/layout/fragment_recycled_layout.xml

@@ -99,7 +99,7 @@
                 android:id="@+id/id_tv_all_choose"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="全选"
+                android:text="Select all"
                 android:textColor="@color/color_333333"
                 android:textSize="13sp" />
         </LinearLayout>

moduleMain/src/main/res/layout/fragment_warehouse.xml

@@ -32,7 +32,7 @@
             android:drawablePadding="5dp"
             android:paddingRight="15dp"
             android:drawableLeft="@drawable/icon_cangku"
-            android:text="@string/ware_house"
+            android:text=""
             android:textColor="@color/color_333333"
             android:textSize="13sp" />
     </RelativeLayout>

moduleMain/src/main/res/layout/fragment_warehouse_layout.xml

@@ -98,7 +98,7 @@
                 android:id="@+id/id_tv_all_choose"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="全选"
+                android:text="Select all"
                 android:textColor="@color/color_333333"
                 android:textSize="13sp" />
         </LinearLayout>

moduleMain/src/main/res/layout/item_goods_pool.xml

@@ -48,7 +48,7 @@
         android:layout_marginBottom="10dp"
         android:layout_toRightOf="@+id/id_tv_cankao_jia"
         android:includeFontPadding="false"
-        android:text="¥"
+        android:text="$"
         android:textColor="#FF2E31"
         android:textSize="13sp" />
 

moduleMain/src/main/res/layout/item_layout_pick_up.xml

@@ -57,9 +57,9 @@
         android:layout_marginBottom="10dp"
         android:layout_toRightOf="@+id/id_goods_img"
         android:includeFontPadding="false"
-        android:text="花费"
+        android:text="cost"
         android:textColor="@color/color_333333"
-        android:textSize="12sp" />
+        android:textSize="14sp" />
 
     <TextView
         android:id="@+id/id_tv_good_price"

moduleMain/src/main/res/layout/item_layout_receive.xml

@@ -92,9 +92,9 @@
         android:layout_marginBottom="13dp"
         android:layout_toRightOf="@+id/id_rl_bg"
         android:includeFontPadding="false"
-        android:text="花费"
+        android:text="cost"
         android:textColor="@color/color_333333"
-        android:textSize="12sp" />
+        android:textSize="14sp" />
 
     <TextView
         android:id="@+id/id_tv_good_price"

moduleMain/src/main/res/layout/item_layout_recover.xml

@@ -14,8 +14,8 @@
         android:layout_width="70dp"
         android:layout_height="70dp"
         android:layout_centerVertical="true"
-        android:layout_marginRight="15dp"
         android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
         android:layout_toRightOf="@+id/id_img_choose"
         android:background="@drawable/shape_ffffff_r5_stroke">
 
@@ -48,10 +48,10 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:layout_marginRight="5dp"
-        android:lines="2"
-        android:ellipsize="end"
         android:layout_toRightOf="@+id/id_rl_bg"
+        android:ellipsize="end"
         android:includeFontPadding="false"
+        android:lines="2"
         android:textColor="@color/color_333333"
         android:textSize="14sp"
         android:textStyle="bold" />
@@ -64,9 +64,9 @@
         android:layout_marginBottom="13dp"
         android:layout_toRightOf="@+id/id_rl_bg"
         android:includeFontPadding="false"
-        android:text="花费"
+        android:text="cost"
         android:textColor="@color/color_333333"
-        android:textSize="12sp" />
+        android:textSize="14sp" />
 
     <TextView
         android:id="@+id/id_tv_good_price"

moduleMain/src/main/res/layout/item_layout_recover_detail.xml

@@ -36,7 +36,7 @@
         android:layout_marginBottom="13dp"
         android:layout_toRightOf="@+id/id_goods_img"
         android:includeFontPadding="false"
-        android:text="花费"
+        android:text="cost"
         android:textColor="@color/color_999999"
         android:textSize="12sp" />
 

moduleMain/src/main/res/layout/item_layout_shop_order.xml

@@ -87,7 +87,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
                     android:layout_toRightOf="@+id/id_tv_goods_name"
-                    android:text="¥199"
+                    android:text="$199"
                     android:textColor="@color/color_333333"
                     android:textSize="14sp" />
             </LinearLayout>

moduleMain/src/main/res/layout/items_layout_box_order.xml

@@ -21,7 +21,7 @@
             android:id="@+id/id_tv_pricedesc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="总价:¥2999｜优惠:¥20｜运费:¥25｜"
+            android:text="总价:$2999｜优惠:$20｜运费:$25｜"
             android:textColor="@color/color_999999"
             android:textSize="12sp" />
 
@@ -36,7 +36,7 @@
             android:id="@+id/id_tv_total_price"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="¥79"
+            android:text="$79"
             android:textColor="@color/color_4c84ff"
             android:textSize="12sp" />
     </LinearLayout>

moduleMain/src/main/res/layout/items_order_layout.xml

@@ -86,7 +86,7 @@ iPhone13手机iPhone13…"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
                     android:layout_toRightOf="@+id/id_tv_goods_name"
-                    android:text="¥199"
+                    android:text="$199"
                     android:textColor="@color/color_333333"
                     android:textSize="14sp" />
             </LinearLayout>

moduleMain/src/main/res/layout/layout_detail_content.xml

@@ -32,7 +32,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
             android:layout_marginRight="3dp"
-            android:text="¥"
+            android:text="$"
             android:textColor="@color/color_333333"
             android:textSize="15sp" />
 

moduleMain/src/main/res/layout/layout_detail_content2.xml

@@ -110,6 +110,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="1.5dp"
+            android:visibility="gone"
             android:layout_toRightOf="@id/id_detail_shop_pool_title"
             android:text="@string/box_detail_open_box_shop_pool_tips"
             android:textColor="@color/color_999999"

moduleMain/src/main/res/layout/layout_home_top.xml

@@ -20,7 +20,7 @@
         android:layout_centerVertical="true"
         android:drawableLeft="@drawable/icon_kefu_hei"
         android:drawablePadding="5dp"
-        android:text="@string/customer_service"
+        android:text=""
         android:textColor="@color/color_333333"
         android:textSize="14sp"
         android:paddingRight="15dp"/>

moduleUc/src/main/res/layout/fragment_user_center.xml

@@ -64,7 +64,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="5dp"
-                android:text="我的幸运币"
+                android:text="Lucky coin"
                 android:textColor="@color/color_666666"
                 android:textSize="14sp" />
 
@@ -93,7 +93,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="8dp"
-                android:text="我的魔币"
+                android:text="Magic coin"
                 android:textColor="@color/color_666666"
                 android:textSize="14sp" />
 

moduleUc/src/main/res/layout/item_layout_recomend.xml

@@ -39,7 +39,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
             android:includeFontPadding="false"
-            android:text="¥29"
+            android:text="$29"
             android:textColor="@color/color_4c84ff"
             android:layout_centerVertical="true"
             android:textSize="14sp"