优化

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

@@ -172,7 +172,7 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
             showPlainDialog(true)
             viewModel.cancelAccount()
         }
-        if (isNightTheme()) {
+        if (isNightTheme() || true) {
             binding.tvDestroyAccount.setVisible()
         }
     }

BusinessAuth/src/main/res/layout/fragment_member_profile.xml

@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:background="#fff"
     android:focusable="true"
     android:focusableInTouchMode="true"
@@ -123,33 +123,37 @@
         android:textSize="@dimen/convert_36px"
         app:layout_constraintTop_toBottomOf="@+id/tv_choose_sex" />
 
+
+
+
+
     <TextView
+        android:layout_marginLeft="@dimen/convert_50px"
         android:id="@+id/tv_skip_for_now"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:paddingTop="@dimen/convert_40px"
-        android:paddingBottom="@dimen/convert_50px"
+        android:paddingTop="@dimen/convert_20px"
+        android:paddingBottom="@dimen/convert_20px"
         android:text="@string/skip_for_now"
         android:textColor="@color/skin_for_now"
         android:textSize="@dimen/convert_30px"
-        app:layout_constraintEnd_toStartOf="@+id/tv_destroy_account"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_save" />
 
     <TextView
+        android:layout_marginRight="@dimen/convert_50px"
         android:id="@+id/tv_destroy_account"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:paddingTop="@dimen/convert_40px"
-        android:paddingBottom="@dimen/convert_50px"
+        android:paddingTop="@dimen/convert_20px"
+        android:paddingBottom="@dimen/convert_20px"
         android:text="@string/cancellation_of_account"
         android:textColor="#E60012"
         android:textSize="@dimen/convert_30px"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/tv_skip_for_now"
         app:layout_constraintTop_toBottomOf="@+id/tv_save" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

BusinessCommon/src/main/java/com/develop/common/ui/CommonBindingActivity.kt

@@ -270,6 +270,13 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
             return
         }
 
+        if("hide" == event.action){
+            lastMsg = "";
+            cancelConfirmDialog.removeSelf()
+            return
+        }
+
+
         //            //已显示弹窗不重复显示
 //            if(FloatWindowManager.confirmCancelDialog.isAdded){
 //                return

BusinessCommon/src/main/java/com/develop/common/widget/HomeFunctionTopBar.kt

@@ -61,7 +61,7 @@ class HomeFunctionTopBar : RelativeLayout, View.OnClickListener {
             if (isNightTheme()){
                 binding.ivFunction.background_drawable = R.drawable.ic_night_white_back
             } else {
-                binding.ivFunction.background_drawable = R.drawable.ic_white_back
+                binding.ivFunction.background_drawable = R.drawable.ic_night_white_back
             }
 
             binding.functionName.text = resources.getString(R.string.back)

app/build.gradle

@@ -12,7 +12,7 @@ ext{
 
     versionCode=Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
-    brandCode="010D"
+    brandCode="000A"
     model="1039"
 
 }

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

@@ -191,21 +191,21 @@ fun getSN(): String {
 
 
 
-    return "010D10390020123010190001"
-
-//    //通过反射获取sn号
-//    try {
-//        val c = Class.forName("android.os.SystemProperties")
-//        val get = c.getMethod("get", String::class.java)
-//        serial = get.invoke(c, "ro.serialno") as String
-//        if (serial != "" && serial != "unknown") return serial
-//
-//        //9.0及以上无法获取到sn，此方法为补充，能够获取到多数高版本手机 sn
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) serial = Build.getSerial()
-//    } catch (e: java.lang.Exception) {
-//        serial = "unknown"
-//    }
-//    return serial
+//    return "010D10390020123010190001"
+
+    //通过反射获取sn号
+    try {
+        val c = Class.forName("android.os.SystemProperties")
+        val get = c.getMethod("get", String::class.java)
+        serial = get.invoke(c, "ro.serialno") as String
+        if (serial != "" && serial != "unknown") return serial
+
+        //9.0及以上无法获取到sn，此方法为补充，能够获取到多数高版本手机 sn
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) serial = Build.getSerial()
+    } catch (e: java.lang.Exception) {
+        serial = "unknown"
+    }
+    return serial
 }
 
 fun ImageView.load(data: Any?) {