1、优化多语言设置

2、修复购物车内部可超量添加问题
3、优化购物车体验

lib_base/src/main/res/values-aa/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">მოდიფიკაცია ვერ მოხერხდა</string>
     <string name="currency_unit">ვალუტის ერთეული</string>
     <string name="sleep_state">ძილის მდგომარეობა</string>
+    <string name="more_language">მრავალენოვანი</string>
 
 </resources>
 <!--格鲁吉亚-->

lib_base/src/main/res/values-ab/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">修改失敗</string>
     <string name="currency_unit">貨幣單位</string>
     <string name="sleep_state">休眠狀態</string>
+    <string name="more_language">多語言</string>
 
 </resources>
 <!--繁体-->

lib_base/src/main/res/values-am/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">اصلاح ناموفق بود</string>
     <string name="currency_unit">واحد ارز</string>
     <string name="sleep_state">وضعیت خواب</string>
+    <string name="more_language">چندزبانه</string>
 
 </resources>
 <!--波斯语-->

lib_base/src/main/res/values-ar/strings.xml

@@ -318,6 +318,7 @@
     <string name="set_fail">فشل التعديل</string>
     <string name="currency_unit">وحدة العملة</string>
     <string name="sleep_state">حالة السكون</string>
+    <string name="more_language">متعدد اللغات</string>
 
 </resources>
 <!--阿拉伯语-->

lib_base/src/main/res/values-bg/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Модификацията е неуспешна</string>
     <string name="currency_unit">Валутна единица</string>
     <string name="sleep_state">Състояние на заспиване</string>
+    <string name="more_language">Многоезичен</string>
 
 </resources>
 <!--保加利亚-->

lib_base/src/main/res/values-cs/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Úprava selhala</string>
     <string name="currency_unit">Měnová jednotka</string>
     <string name="sleep_state">Stav spánku</string>
+    <string name="more_language">Vícejazyčný</string>
 
 </resources>
 <!--捷克语-->

lib_base/src/main/res/values-da/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Ændring mislykkedes</string>
     <string name="currency_unit">Valutaenhed</string>
     <string name="sleep_state">Dvaletilstand</string>
+    <string name="more_language">Flersproget</string>
 
 </resources>
 <!--丹麦-->

lib_base/src/main/res/values-de/strings.xml

@@ -317,5 +317,6 @@
     <string name="set_fail">Änderung fehlgeschlagen</string>
     <string name="currency_unit">Währungseinheit</string>
     <string name="sleep_state">Ruhezustand</string>
+    <string name="more_language">Mehrsprachig</string>
 
 </resources><!--德语-->

lib_base/src/main/res/values-en/strings.xml

@@ -317,6 +317,7 @@
     <string name="set_fail">Modification failed</string>
     <string name="currency_unit">Currency Unit</string>
     <string name="sleep_state">Sleep State</string>
+    <string name="more_language">Multi-language</string>
 
 </resources>
     <!--英语-->

lib_base/src/main/res/values-es/strings.xml

@@ -317,5 +317,6 @@
     <string name="set_fail">Error en la modificación</string>
     <string name="currency_unit">Unidad monetaria</string>
     <string name="sleep_state">Estado de suspensión</string>
+    <string name="more_language">Multilingüe</string>
 
 </resources><!--西班牙语-->

lib_base/src/main/res/values-et/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Muutmine ebaõnnestus</string>
     <string name="currency_unit">Valuutaühik</string>
     <string name="sleep_state">Uneolek</string>
+    <string name="more_language">Mitmekeelne</string>
 
 </resources>
 <!--爱沙尼亚语-->

lib_base/src/main/res/values-fi/strings.xml

@@ -317,5 +317,6 @@
     <string name="set_fail">Muokkaus epäonnistui</string>
     <string name="currency_unit">Valuuttayksikkö</string>
     <string name="sleep_state">Lepotila</string>
+    <string name="more_language">Monikielinen</string>
 
 </resources><!--芬兰语-->

lib_base/src/main/res/values-fr/strings.xml

@@ -316,5 +316,6 @@
     <string name="set_fail">Échec de la modification</string>
     <string name="currency_unit">Unité monétaire</string>
     <string name="sleep_state">État de veille</string>
+    <string name="more_language">Multilingue</string>
 
 </resources><!--法语-->

lib_base/src/main/res/values-hr/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Izmjena nije uspjela</string>
     <string name="currency_unit">Nulatna jedinica</string>
     <string name="sleep_state">Stanje mirovanja</string>
+    <string name="more_language">Višejezičnost</string>
 
 </resources>
 <!--克罗地亚语-->

lib_base/src/main/res/values-hu/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Módosítás sikertelen</string>
     <string name="currency_unit">Pénznemegység</string>
     <string name="sleep_state">Alvó állapot</string>
+    <string name="more_language">Többnyelvű</string>
 
 </resources>
 <!--匈牙利语-->

lib_base/src/main/res/values-hy/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Փոփոխությունը ձախողվեց</string>
     <string name="currency_unit">Արժույթի միավոր</string>
     <string name="sleep_state">Քնի վիճակ</string>
+    <string name="more_language">Բազմալեզու</string>
 
 </resources>
 <!--亚美尼亚语-->

lib_base/src/main/res/values-it/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Modifica non riuscita</string>
     <string name="currency_unit">Unità di valuta</string>
     <string name="sleep_state">Stato di sospensione</string>
+    <string name="more_language">Multilingua</string>
 
 </resources>
 <!--意大利-->

lib_base/src/main/res/values-ja/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">変更に失敗しました</string>
     <string name="currency_unit">通貨単位</string>
     <string name="sleep_state">スリープ状態</string>
+    <string name="more_language">多言語</string>
 
 </resources>
 <!--日语-->

lib_base/src/main/res/values-ko/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">수정에 실패했습니다.</string>
     <string name="currency_unit">통화 단위</string>
     <string name="sleep_state">수면 상태</string>
+    <string name="more_language">다국어</string>
 
 </resources>
 <!--韩语-->

lib_base/src/main/res/values-lv/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Modifikācija neizdevās</string>
     <string name="currency_unit">Valūtas vienība</string>
     <string name="sleep_state">Miega stāvoklis</string>
+    <string name="more_language">Daudzvalodu</string>
 
 </resources>
 <!--拉脱维亚语-->

lib_base/src/main/res/values-mn/strings.xml

@@ -316,5 +316,6 @@
     <string name="set_fail">Өөрчлөлт амжилтгүй болсон</string>
     <string name = "currency_unit" >Валютын нэгж</string>
     <string name="sleep_state">Унтах төлөв</string>
+    <string name="more_language">Олон хэлтэй</string>
 
 </resources><!--蒙古语-->

lib_base/src/main/res/values-nl/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Wijziging mislukt</string>
     <string name="currency_unit">Valuta-eenheid</string>
     <string name="sleep_state">Slaaptoestand</string>
+    <string name="more_language">Meertalig</string>
 
 </resources>
 <!--荷兰语-->

lib_base/src/main/res/values-no/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Endringen mislyktes</string>
     <string name="currency_unit">Valutaenhet</string>
     <string name="sleep_state">Hviletilstand</string>
+    <string name="more_language">Flerspråklig</string>
 
 </resources>
 <!--挪威语-->

lib_base/src/main/res/values-pl/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Modyfikacja nie powiodła się</string>
     <string name="currency_unit">Jednostka walutowa</string>
     <string name="sleep_state">Stan uśpienia</string>
+    <string name="more_language">Wielojęzyczny</string>
 
 </resources>
 <!--波兰语-->

lib_base/src/main/res/values-pt/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Falha na modificação</string>
     <string name="currency_unit">Unidade Monetária</string>
     <string name="sleep_state">Estado de Suspensão</string>
+    <string name="more_language">Multilíngue</string>
 
 </resources>
 <!--葡萄牙语-->

lib_base/src/main/res/values-ro/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Modificarea a eșuat</string>
     <string name="currency_unit">Unitate monetară</string>
     <string name="sleep_state">Stare de repaus</string>
+    <string name="more_language">Multilingv</string>
 
 </resources>
 <!--罗马尼亚语-->

lib_base/src/main/res/values-ru/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Ошибка модификации</string>
     <string name="currency_unit">Денежная единица</string>
     <string name="sleep_state">Состояние сна</string>
+    <string name="more_language">Многоязычный</string>
 
 </resources>
 <!--俄语-->

lib_base/src/main/res/values-sk/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Úprava zlyhala</string>
     <string name="currency_unit">Menná jednotka</string>
     <string name="sleep_state">Stav spánku</string>
+    <string name="more_language">Viacjazyčný</string>
 
 </resources>
 <!--斯洛伐克语-->

lib_base/src/main/res/values-sl/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Sprememba ni uspela</string>
     <string name="currency_unit">Valutna enota</string>
     <string name="sleep_state">Stanje mirovanja</string>
+    <string name="more_language">Večjezičnost</string>
 
 </resources>
 <!--斯洛文尼亚语-->

lib_base/src/main/res/values-sq/strings.xml

@@ -316,5 +316,6 @@
     <string name="set_fail">השינוי נכשל</string>
     <string name="currency_unit">יחידת מטבע</string>
     <string name="sleep_state">מצב שינה</string>
+    <string name="more_language">ריבוי שפות</string>
 
 </resources><!--希伯来语 以色列-->

lib_base/src/main/res/values-sv/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Ändringen misslyckades</string>
     <string name="currency_unit">Valutaenhet</string>
     <string name="sleep_state">Viloläge</string>
+    <string name="more_language">Flerspråkig</string>
 
 </resources>
 <!--瑞典语-->

lib_base/src/main/res/values-th/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">การแก้ไขล้มเหลว</string>
     <string name="currency_unit">หน่วยสกุลเงิน</string>
     <string name="sleep_state">สถานะการนอนหลับ</string>
+    <string name="more_language">หลายภาษา</string>
 
 </resources>
 <!--泰语-->

lib_base/src/main/res/values-tn/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Modifikacija nije uspjela</string>
     <string name="currency_unit">Nulatna jedinica</string>
     <string name="sleep_state">Stanje mirovanja</string>
+    <string name="more_language">Višejezičnost</string>
 
 </resources>
 <!--波斯尼亚语-->

lib_base/src/main/res/values-tr/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Değişiklik başarısız oldu</string>
     <string name="currency_unit">Para Birimi</string>
     <string name="sleep_state">Uyku Durumu</string>
+    <string name="more_language">Çoklu dil</string>
 
 </resources>
 <!--土耳其语-->

lib_base/src/main/res/values-uk/strings.xml

@@ -316,6 +316,7 @@
     <string name="set_fail">Модифікація не вдалася</string>
     <string name="currency_unit">Валюта</string>
     <string name="sleep_state">Режим сну</string>
+    <string name="more_language">Багатомовний</string>
 
 </resources>
 <!--乌克兰语-->

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

@@ -316,6 +316,7 @@
     <string name="set_fail">修改失败</string>
     <string name="currency_unit">货币单位</string>
     <string name="sleep_state">休眠状态</string>
+    <string name="more_language">多语言</string>
 
 </resources>
 <!--中文-->

lib_common/src/main/java/com/quyunshuo/sbm10/common/constant/MMKVName.kt

@@ -279,6 +279,9 @@ abstract class MMKVName {
             //存储离线订单
             get() = "offline_order"
 
+        val LANGUAGE_SWITCH: String
+            //多语言切换
+            get() = "language_switch"
 
     }
     // 这里可以继续添加其他常量

module_backstage/src/main/java/com/module/backstage/repo/SystemSettingsFragmentRepo.kt

@@ -79,6 +79,7 @@ class SystemSettingsFragmentRepo @Inject constructor() : BaseRepository() {
         OtherEnum.SLEEP_STATE,
         OtherEnum.SLEEP_TEXT,
         OtherEnum.CURRENCY_UNIT,
+        OtherEnum.LANGUAGE_SWITCH,
     )
     //其他
     var otherSetListLogo: MutableList<OtherEnum> = Arrays.asList(
@@ -90,6 +91,7 @@ class SystemSettingsFragmentRepo @Inject constructor() : BaseRepository() {
         OtherEnum.SLEEP_TEXT,
         OtherEnum.LOGO_TEXT,
         OtherEnum.CURRENCY_UNIT,
+        OtherEnum.LANGUAGE_SWITCH,
     )
 
 }

module_home/src/main/java/com/quyunshuo/module/home/adapter/ShoppingCartAdapter.kt

@@ -1,6 +1,8 @@
 package com.quyunshuo.module.home.adapter
 
+import android.util.Log
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -12,6 +14,8 @@ import com.quyunshuo.sbm10.common.listener.AdapterClickListener
 import com.quyunshuo.sbm10.common.util.UiUtil
 import com.quyunshuo.module.home.R
 import com.quyunshuo.module.home.databinding.HomeItemShoppingCartBinding
+import com.quyunshuo.sbm10.base.utils.SpUtils
+import com.quyunshuo.sbm10.common.constant.MMKVName
 
 /**
  * 购物车内容列表
@@ -21,6 +25,7 @@ class ShoppingCartAdapter(var productList:List<ShoppingCartBean>): RecyclerView.
     private val _position = MutableLiveData<Int>()
     val clickPosition:LiveData<Int> =  _position
     var listener:AdapterClickListener? = null
+    private val shopCartSize = SpUtils.getString(MMKVName.SHOPPING_CART_SIZE, "3")?.toInt()
 
     inner class MyViewHolder(binding: HomeItemShoppingCartBinding): RecyclerView.ViewHolder(binding.root){
         private val mBinding = binding
@@ -31,13 +36,18 @@ class ShoppingCartAdapter(var productList:List<ShoppingCartBean>): RecyclerView.
                 tvPrice.text = UiUtil.getStringRes(R.string.univalent)+"："+payTypeBean.price
                 homeImageview9.setImageResource(UiUtil.getResId(payTypeBean.imgID, R.drawable::class.java))
                 tvDelete.setOnClickListener{
-                    listener?.onClickListener(it, this@MyViewHolder.absoluteAdapterPosition,"")
+                    listener?.onClickListener(it, this@MyViewHolder.absoluteAdapterPosition,"0")
                 }
                 tvAdd.setOnClickListener{
-                    tvCount.text = (tvCount.text.toString().toInt()+1).toString()
-                    homeImageview9.setImageResource(UiUtil.getResId(payTypeBean.imgID, R.drawable::class.java))
-                    listener?.onClickListener(it, this@MyViewHolder.absoluteAdapterPosition,tvCount.text.toString())
-
+                    var i = 0
+                    for (productList in productList){
+                        i += productList.count
+                    }
+                    if (i<shopCartSize!!){
+                        tvCount.text = (tvCount.text.toString().toInt()+1).toString()
+                        homeImageview9.setImageResource(UiUtil.getResId(payTypeBean.imgID, R.drawable::class.java))
+                        listener?.onClickListener(it, this@MyViewHolder.absoluteAdapterPosition,tvCount.text.toString())
+                    }
                 }
                 tvSubtract.setOnClickListener {
                     tvCount.text = (tvCount.text.toString().toInt()-1).toString()

module_home/src/main/java/com/quyunshuo/module/home/dialog/ShoppingCartDialogFragment.kt

@@ -1,6 +1,7 @@
 package com.quyunshuo.module.home.dialog
 
 import android.os.Handler
+import android.util.Log
 import android.util.TypedValue
 import android.view.View
 import androidx.fragment.app.Fragment
@@ -75,18 +76,19 @@ class ShoppingCartDialogFragment :
                         R.id.tv_delete-> {
                             homeFragmentVM?.shoppingTrolleyRemove(position)
                             shoppingCartAdapter?.notifyItemRemoved(position)
+                            getCartProductCount(0)
                         }
                         R.id.tv_add->{
                             homeFragmentVM?.shoppingTrolleyUpdateCount(data?.toInt()!!,position)
                         }
                         R.id.tv_subtract->{
+                            getCartProductCount(-1)
                             if (data.toString().toInt()<=0){
                                 homeFragmentVM?.shoppingTrolleyRemove(position)
                                 shoppingCartAdapter?.notifyItemRemoved(position)
                                 return
                             }
                             homeFragmentVM?.shoppingTrolleyUpdateCount(data?.toInt()!!,position)
-
                         }
                         else -> {}
                     }
@@ -100,6 +102,16 @@ class ShoppingCartDialogFragment :
         initUI()
     }
 
+    private fun getCartProductCount(int: Int) {
+        var i = int
+        for (list in shoppingTrolleyList) {
+            i += list.count
+        }
+        if (i == 0) {
+            dismiss()
+        }
+    }
+
     private fun initUI() {
 
         if (!SpUtils.getBoolean(MMKVName.PROMOTION_CODE, false)!!) {

module_home/src/main/java/com/quyunshuo/module/home/fragment/fragment/HomeFragment.kt

@@ -250,6 +250,9 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
         if (!SpUtils.getBoolean(MMKVName.SHOPPING_TROLLEY, true)!!) {
             mBinding.clShoppingCart.setVisible(false)
         }
+        if (!SpUtils.getBoolean(MMKVName.LANGUAGE_SWITCH,true)!!){
+            mBinding.llLanguageSwitch.setVisible(false)
+        }
 
     }
 
@@ -315,7 +318,7 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
                 return
             }
         }
-        if (checkToBuy()) return//是否开机
+//        if (checkToBuy()) return//是否开机
 //        selectProductDataBean = ProTypeEnum.getEnumByValue(product!!.nameChinese)
         //todo 测试做糖 传递价格等信息过去。
 //        gotoMake(product.nameChinese)

module_home/src/main/res/layout/home_item_shopping_cart.xml

@@ -47,42 +47,40 @@
 
         <TextView
             android:id="@+id/tv_delete"
-            android:layout_width="160dp"
-            android:layout_height="80dp"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
             android:layout_marginRight="20dp"
-            android:background="@drawable/backstage_shape_other_select_red"
+            android:background="@drawable/icon_cancel"
             android:gravity="center"
-            android:text="@string/delete"
-            android:textColor="@color/white"
-            android:textSize="34sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/tv_add"
-            android:layout_width="70dp"
-            android:layout_height="80dp"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
             android:layout_marginRight="30dp"
             android:background="@color/white"
             android:gravity="center"
             android:textColor="#576478"
             android:text="+"
-            android:textSize="40sp"
+            android:textSize="60sp"
+            android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="@+id/tv_delete"
             app:layout_constraintEnd_toStartOf="@+id/tv_delete"
             app:layout_constraintTop_toTopOf="@+id/tv_delete" />
 
         <TextView
             android:id="@+id/tv_count"
-            android:layout_width="90dp"
-            android:layout_height="80dp"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
             android:layout_marginEnd="10dp"
             android:background="@color/white"
             android:gravity="center"
             android:text="1"
             android:textColor="#576478"
-            android:textSize="40sp"
+            android:textSize="60sp"
             app:layout_constraintBottom_toBottomOf="@+id/tv_delete"
             app:layout_constraintEnd_toStartOf="@+id/tv_add"
             app:layout_constraintTop_toTopOf="@+id/tv_delete"
@@ -90,13 +88,14 @@
 
         <TextView
             android:id="@+id/tv_subtract"
-            android:layout_width="70dp"
-            android:layout_height="80dp"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
             android:background="@color/white"
-            android:textSize="40sp"
+            android:textSize="60sp"
+            android:textStyle="bold"
             android:layout_marginEnd="10dp"
             android:gravity="center"
-            android:text="-"
+            android:text="—"
             android:textColor="#576478"
             app:layout_constraintBottom_toBottomOf="@+id/tv_delete"
             app:layout_constraintEnd_toStartOf="@+id/tv_count"

module_pay/src/main/java/com/module/pay/common/OtherEnum.kt

@@ -55,6 +55,7 @@ enum class OtherEnum(var nameId:Int,var nameS:String,var category:String,var def
     SLEEP_TEXT(R.string.sleep_text,"休眠中文本","其他","", 7,MMKVName.SLEEP_TEXT),
     LOGO_TEXT(R.string.logo_text,"图标变更","其他","7777", 2,MMKVName.LOGO_TEXT),
     CURRENCY_UNIT(R.string.currency_unit,"货币单位","其他",ArrayList<String>(MMKVName.UNIT_DATA), 3,MMKVName.CURRENCY_UNIT),
+    LANGUAGE_SWITCH(R.string.more_language,"多语言","其他",true, 1,MMKVName.LANGUAGE_SWITCH),
 
     SHOPPING_TROLLEY(R.string.shopping_trolley,"购物车功能","购物车设置",true, 1,MMKVName.SHOPPING_TROLLEY),
     SHOPPING_CART_SIZE(R.string.shopping_cart_size,"购物车可添加数量","购物车设置","3", 2,MMKVName.SHOPPING_CART_SIZE),