Merge branch 'dev_commodity' of...

Merge branch 'dev_commodity' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness into dev_commodity

Components/commodity/src/main/java/com/yidian/shenghuoquan/commodity/ui/coupon/adapter/CommodityListAdapter.kt

@@ -141,21 +141,25 @@ class CommodityListAdapter(private val context: Context, private val status: Com
         holder.binding.setVariable(BR.vm, CommodityListItemViewModel())
         holder.binding.vm?.commodityOfflineOperationEvent?.observe(context as LifecycleOwner, {
           // 弹出确认下架弹窗
-          CommonHintDialog(context, "确认下架优惠券?", arrayListOf("取消", "下架"), object : CommonHintDialog.OnHintOptionCallback {
-            override fun onLeftOption() {
+          CommonHintDialog(
+            context,
+            context.resources.getString(R.string.commodity_down_shelves_confirm),
+            arrayListOf(context.resources.getString(R.string.cancel), context.resources.getString(R.string.down_shelves)),
+            object : CommonHintDialog.OnHintOptionCallback {
+              override fun onLeftOption() {
 
-            }
+              }
 
-            override fun onRightOption() {
-              // 下架商品
-              holder.binding.vm?.requestCommodityOffline(it.goodsSpuId)
-            }
+              override fun onRightOption() {
+                // 下架商品
+                holder.binding.vm?.requestCommodityOffline(it.goodsSpuId)
+              }
 
-          }).show()
+            }).show()
         })
         holder.binding.vm?.commodityOfflineSuccessEvent?.observe(context as LifecycleOwner, {
           // 下架成功 刷新列表
-          ToastUtil.showToast(context, "下架成功")
+          ToastUtil.showToast(context, context.resources.getString(R.string.down_shelves_success))
           commodityData.remove(data)
           notifyItemRemoved(position)
           commodityDataChange.value = commodityData
@@ -173,7 +177,7 @@ class CommodityListAdapter(private val context: Context, private val status: Com
         holder.binding.setVariable(BR.vm, CommodityListItemViewModel())
         holder.binding.vm?.commodityOnlineSuccessEvent?.observe(context as LifecycleOwner, {
           // 上架成功 刷新列表
-          ToastUtil.showToast(context, "上架成功")
+          ToastUtil.showToast(context, context.resources.getString(R.string.up_shelves_success))
           commodityData.remove(data)
           notifyItemRemoved(position)
           commodityDataChange.value = commodityData

Components/commodity/src/main/res/layout/commodity_item_commodity_reject_list.xml

@@ -119,13 +119,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:onClick="@{() -> vm.commodityEdit(data)}"
-            android:text="@string/edit"
+            android:text="@string/modify"
             android:textColor="@color/color_1852F1"
             android:textSize="@dimen/sp14"
             app:layout_constraintBottom_toBottomOf="@id/tv_commodity_price"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tv_commodity_price"
-            tools:text="编辑" />
+            tools:text="修改" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

Components/commodity/src/main/res/values/strings.xml

@@ -13,4 +13,9 @@
     <string name="click_post_coupon">点击下方发布优惠券</string>
     <string name="no_search_result">暂无搜索结果</string>
     <string name="click_search_again">请点击搜索框重新进行搜索</string>
+    <string name="commodity_down_shelves_confirm">确认下架商品？</string>
+    <string name="cancel">取消</string>
+    <string name="down_shelves_success">下架成功</string>
+    <string name="up_shelves_success">上架成功</string>
+    <string name="modify">修改</string>
 </resources>
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountIDCardAuthFragmentV2.kt

@@ -56,7 +56,6 @@ import java.io.File
  * description: 生活号身份证认证 接入XInsight
  */
 // TODO: 7/15/21 活体检测临时数据删除
-// TODO: 7/15/21 接入Luban压缩
 class LifeAccountIDCardAuthFragmentV2 : BaseFragment<FragmentLifeAccountIdCardAuthBinding>(), View.OnClickListener,
   BottomSelectAdapter.OnItemClickListener<BottomSelectBean>, IAuthPersonalCheckCallback, IAuthLiveIdentityCallback,
   LifeAccountAuthImageView.OnLifeAccountAuthImageViewCallback,

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt

@@ -152,8 +152,6 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
     if (configData.isShowWallet == Constant.MERCHANT_SERVICE_SHOW) {
       viewBind.avMerchantAsset.isVisible = true
       viewBind.avMerchantAsset.setMerchantAssetData("0.00", "0.00")
-    } else {
-      viewBind.avMerchantAsset.isVisible = false
     }
     // 展示底部浮窗
     showMerchantCenterBottomHint(lifeAccountData)

Components/newscontent/src/main/res/layout/activity_merchant_center.xml

@@ -38,6 +38,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="15dp"
                 android:layout_marginEnd="15dp"
+                android:visibility="gone"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/lv_life_account_label" />