调整跑马灯问题，注册成功，跳转到填写信息，如果点击退出的话，继续跳注册页面

BusinessAuth/src/main/java/com/develop/auth/ui/MemberProfileFragment.kt

@@ -18,6 +18,7 @@ import com.develop.base.util.GlobalToast
 import com.develop.base.util.MMkvUtils
 import com.develop.base.util.ThreadUtils
 import com.develop.common.data_repo.FoodDataProvider
+import com.develop.common.data_repo.db.AuthModel
 import com.develop.common.data_repo.db.entity.UserInfo
 import com.develop.common.data_repo.net.model.response.User
 import com.develop.common.dialog.AgeSelectDialog
@@ -97,6 +98,10 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
                     .beginTransaction()
                     .replace(R.id.fl_container, MemberLoginFragment())
                     .commitAllowingStateLoss()
+
+                viewModel.registerLiveData.postValue(AuthModel(false, ""))
+
+
             } else {
                 navigateTo(Screens.Main.ENTRANCE_CHOSEN)
             }

BusinessAuth/src/main/java/com/develop/auth/ui/MemberRegisterFragment.kt

@@ -35,7 +35,9 @@ class MemberRegisterFragment : CommonBVMFragment<FragmentMemberRegisterBinding,
         viewModel.registerLiveData.observe(viewLifecycleOwner) {
             dismissPlainDialog()
             it.msg?.apply {
-                showToast(this)
+                if (this.isNotEmpty()){
+                    showToast(this)
+                }
             }
             if (it.success) {
                 viewModel.fragmentChangeLiveData.postValue(FragmentTag.MEMBER_PROFILE)
@@ -80,10 +82,12 @@ class MemberRegisterFragment : CommonBVMFragment<FragmentMemberRegisterBinding,
             showToast("input not available")
             return false
         }
-        if (!isPasswordForm(inputPsd)) {
-            showToast("input not available")
-            return false
-        }
+
+        //2023.12.27客户可以输入其他符号 估这里代码注释
+//        if (!isPasswordForm(inputPsd)) {
+//            showToast("input not available")
+//            return false
+//        }
         return true
     }
 

BusinessCommon/src/main/res/layout/home_sort_filter_search_view.xml

@@ -110,20 +110,26 @@
             android:background="@drawable/shape_100px6fb1fb_corners">
 
             <ImageView
+
                 android:layout_width="@dimen/convert_46px"
                 android:layout_height="@dimen/convert_46px"
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="@dimen/convert_19px"
                 android:background="@drawable/ic_net" />
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <com.develop.common.widget.MarqueeTextView
                 android:id="@+id/tv_online"
-                android:layout_width="wrap_content"
+                android:layout_width="@dimen/convert_175px"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center|end"
                 android:layout_marginEnd="@dimen/convert_23px"
-                android:text="@string/online_recipes"
                 android:textColor="@color/white"
+                android:text="@string/online_recipes"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:marqueeRepeatLimit="marquee_forever"
+                android:singleLine="true"
                 android:textSize="@dimen/convert_26px" />
         </FrameLayout>
 
@@ -143,7 +149,7 @@
                 android:layout_marginStart="@dimen/convert_19px"
                 android:background="@drawable/ic_recipes" />
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <com.develop.common.widget.MarqueeTextView
                 android:id="@+id/tv_recipes"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -151,6 +157,11 @@
                 android:layout_marginEnd="@dimen/convert_23px"
                 android:text="@string/recipes"
                 android:textColor="@color/white"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:marqueeRepeatLimit="marquee_forever"
+                android:singleLine="true"
                 android:textSize="@dimen/convert_26px" />
         </FrameLayout>
 
@@ -170,14 +181,19 @@
                 android:layout_marginStart="@dimen/convert_29px"
                 android:background="@drawable/ic_download" />
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <com.develop.common.widget.MarqueeTextView
                 android:id="@+id/tv_download"
-                android:layout_width="wrap_content"
+                android:layout_width="@dimen/convert_130px"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center|end"
                 android:layout_marginStart="@dimen/convert_87px"
                 android:layout_marginEnd="@dimen/convert_25px"
                 android:text="@string/download"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:marqueeRepeatLimit="marquee_forever"
+                android:singleLine="true"
                 android:textColor="@color/white"
                 android:textSize="@dimen/convert_26px" />
         </FrameLayout>

BusinessCommon/src/main/res/values/colors.xml

@@ -8,7 +8,7 @@
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="color_FFA627">#FFA627</color>
-
+    <color name="color_E03E52">#E03E52</color>
     <color name="color_F4A12E">#F4A12E</color>
     <color name="color_fff">#fff</color>
     <color name="color_33000000">#33000000</color>
@@ -35,7 +35,7 @@
     <color name="color_A3A3A2">#A3A3A2</color>
     <color name="color_E4E4E4">#E4E4E4</color>
     <color name="color_6FB1FB">#6FB1FB</color>
-
+    <color name="color_00000000">#00000000</color>
     <color name="color_00FFFFFF">#00FFFFFF</color>
 
     <color name="bg_color">#ffffff</color>

BusinessMain/src/main/java/com/develop/main/adapter/LetterTextAdapter.kt

@@ -25,14 +25,14 @@ class LetterTextAdapter:  RecyclerView.Adapter<RecyclerView.ViewHolder>() {
         var letter_layout = holder.itemView.findViewById<LinearLayout>(R.id.letter_layout)
         text.text = data
         if (isType){
-            letter_layout.background = mContext.resources.getDrawable(com.develop.common.R.color.color_00FFFFFF)
+            letter_layout.background = mContext.resources.getDrawable(com.develop.common.R.color.color_00000000)
         }else{
             letter_layout.background = mContext.resources.getDrawable(com.develop.common.R.color.bg_color)
         }
         if (position==positions){
             text.textSize = mContext.resources.getDimension(com.develop.base.R.dimen.convert_20px)
             if (isType){
-                text.setTextColor(mContext.resources.getColor(com.develop.common.R.color.color_EE8F08))
+                text.setTextColor(mContext.resources.getColor(com.develop.common.R.color.color_E03E52))
             }else{
                 text.setTextColor(mContext.resources.getColor(com.develop.common.R.color.color_EE8F08))
             }
@@ -41,7 +41,7 @@ class LetterTextAdapter:  RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
             text.textSize = mContext.resources.getDimension(com.develop.base.R.dimen.convert_15px)
             if (isType){
-                text.setTextColor(mContext.resources.getColor(com.develop.common.R.color.color_000000))
+                text.setTextColor(mContext.resources.getColor(com.develop.common.R.color.color_fff))
 
             }else{
 

app/build.gradle

@@ -13,7 +13,7 @@ ext{
     versionCode=Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="036I"
-    brandCode="000A"
+    brandCode="010D"
     model="1039"
 
 }
@@ -139,8 +139,8 @@ android {
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
             resValue("string", "app_theme", "@style/SplashTheme")
-            buildConfigField("String", "UpdatePlatform", "\"036I\"")
-            resValue("string", "app_theme", "@style/Splash036IDTheme")
+
+
         }
 
         brand010D {
@@ -148,6 +148,7 @@ android {
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"night\"")
             resValue("string", "app_theme", "@style/Splash010DTheme")
+
         }
 
         brand030A {
@@ -220,6 +221,13 @@ android {
             productFlavors.brand002DTuya.signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+
+        debug{
+            debuggable true
+            productFlavors.brand010D.signingConfig signingConfigs.debug
+            buildConfigField("String", "UpdatePlatform", "\"night\"")
+            resValue("string", "app_theme", "@style/Splash010DTheme")
+        }
     }
 
 

libBase/src/main/java/com/develop/base/ext/GlobaExt.kt

@@ -190,11 +190,11 @@ fun getSN(): String {
 //    return "000A30150020123010190001"
 //     return "002A30150020123010190001"
 //     return "000A10390020123010190001"
-//    return "010D30150020123010190001"
+    return "010D10390020123010190001"
 //    return "011A30150020123010190001"
 //    return "007D20020020123010190001"
 //    return "036I21060020123010180001"
-    return  "030A10390020123010190001"
+//    return  "030A10390020123010190001"
 //    return  "017A20060020123010190001"
     //通过反射获取sn号
     try {