关闭按钮代码添加设置

BusinessSetting/src/main/java/com/develop/setting/ui/HelpDocsActivity.kt

@@ -1,5 +1,6 @@
 package com.develop.setting.ui
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.webkit.WebView
 import android.webkit.WebViewClient
@@ -38,8 +39,9 @@ class HelpDocsActivity : AppCompatActivity() {
         } else {
             webView.loadUrl("file:///android_asset/help/${language}/help-white.html")
         }
-
-        findViewById<ImageView>(R.id.iv_close).setOnClickListener {
+        var   iv_help_close  =  findViewById<ImageView>(R.id.iv_help_close)
+        iv_help_close.setImageResource(com.develop.common.R.drawable.ic_close)
+        iv_help_close.setOnClickListener {
             finish()
         }
     }

BusinessSetting/src/main/java/com/develop/setting/ui/LanguageActivity.kt

@@ -64,8 +64,8 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
             binding.ivLogo.setGone()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_054a)
         }
-        binding.ivClose.setVisible()
-        binding.ivClose.setImageResource( com.develop.common.R.drawable.ic_close)
+        binding.ivLanguageClose.setVisible()
+        binding.ivLanguageClose.setImageResource( com.develop.common.R.drawable.ic_close)
         isFromSetting = intent.extras?.getBoolean(LANGUAGE_FROM_SETTING) ?: false
         if (isFromSetting) {
             binding.apply {
@@ -73,9 +73,9 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
                 tvLanguage.visibility = View.GONE
                 binding.ivLogo.setGone()
 //                ivLogo.visibility = View.GONE
-                ivClose.visibility = View.VISIBLE
+                ivLanguageClose.visibility = View.VISIBLE
                 tvTitle.visibility = View.VISIBLE
-                ivClose.setOnClickListener {
+                ivLanguageClose.setOnClickListener {
                     finish()
                 }
                 tvTitle.updateText(getString(com.develop.common.R.string.language))

BusinessSetting/src/main/java/com/develop/setting/ui/RestoreActivity.kt

@@ -30,7 +30,8 @@ class RestoreActivity : CommonBindingActivity<ActivityRestoreBinding>() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding.tvTitle.updateText(getString(com.develop.common.R.string.restore_factory_settings))
-        binding.ivClose.setOnClickListener {
+        binding.ivRestoreClose.setImageResource(com.develop.common.R.drawable.ic_close)
+        binding.ivRestoreClose.setOnClickListener {
             finish()
         }
         dialog.title = getString(com.develop.common.R.string.restore_confirm_tips)

BusinessSetting/src/main/java/com/develop/setting/ui/TuyaActivity.kt

@@ -42,8 +42,8 @@ class TuyaActivity : CommonBindingActivity<ActivityTuyaBinding>() {
     override fun onCreate(savedInstanceState: Bundle?) {
 
         super.onCreate(savedInstanceState)
-        binding.ivClose.setOnClickListener {
-
+        binding.ivTuyaClose.setImageResource(com.develop.common.R.drawable.ic_close)
+        binding.ivTuyaClose.setOnClickListener {
             finish()
         }
         binding.tvTitle.updateText(getString(com.develop.common.R.string.tuya))

BusinessSetting/src/main/res/layout/activity_birghtness.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:background="@color/bg_color"
     android:layout_height="match_parent">
@@ -25,6 +26,7 @@
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_sound"
+        android:visibility="gone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
@@ -41,6 +43,7 @@
         android:id="@+id/sb_brightness"
         android:layout_width="match_parent"
         android:layout_height="@dimen/convert_60px"
+        android:visibility="gone"
         android:layout_below="@id/tv_sound"
         android:layout_marginTop="@dimen/convert_63px"
         android:duplicateParentState="true"
@@ -51,6 +54,7 @@
         android:layout_marginStart="@dimen/convert_272px"
         android:layout_marginTop="@dimen/convert_65px"
         android:layout_below="@id/tv_sound"
+        android:visibility="gone"
         android:background="@drawable/ic_brightness_night"
         android:layout_width="@dimen/convert_54px"
         android:layout_height="@dimen/convert_59px"/>
@@ -58,6 +62,7 @@
     <ImageView
         android:layout_alignParentEnd="true"
         android:layout_marginEnd="@dimen/convert_272px"
+        android:visibility="gone"
         android:layout_marginTop="@dimen/convert_65px"
         android:layout_below="@id/tv_sound"
         android:background="@drawable/ic_brightness_day"
@@ -70,7 +75,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/sb_brightness"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/convert_111px"
+        android:layout_marginTop="@dimen/convert_150px"
         android:text="@string/screen_lock_time"
         android:textColor="@color/brightness_content"
         android:textSize="@dimen/convert_30px" />

BusinessSetting/src/main/res/layout/activity_help_docs.xml

@@ -8,7 +8,7 @@
     tools:context=".ui.HelpDocsActivity">
 
     <ImageView
-        android:id="@+id/iv_close"
+        android:id="@+id/iv_help_close"
         android:layout_width="@dimen/convert_53px"
         android:layout_height="@dimen/convert_53px"
         android:layout_marginStart="@dimen/convert_21px"

BusinessSetting/src/main/res/layout/activity_language.xml

@@ -7,7 +7,7 @@
 
     <ImageView
         android:visibility="invisible"
-        android:id="@+id/iv_close"
+        android:id="@+id/iv_language_close"
         android:layout_width="@dimen/convert_73px"
         android:layout_height="@dimen/convert_73px"
         android:layout_marginStart="@dimen/convert_21px"

BusinessSetting/src/main/res/layout/activity_restore.xml

@@ -7,7 +7,7 @@
 
 
     <ImageView
-        android:id="@+id/iv_close"
+        android:id="@+id/iv_restore_close"
         android:layout_width="@dimen/convert_53px"
         android:layout_height="@dimen/convert_53px"
         android:layout_marginStart="@dimen/convert_21px"

BusinessSetting/src/main/res/layout/activity_tuya.xml

@@ -6,7 +6,7 @@
     android:layout_height="match_parent">
 
     <ImageView
-        android:id="@+id/iv_close"
+        android:id="@+id/iv_tuya_close"
         android:layout_width="@dimen/convert_53px"
         android:layout_height="@dimen/convert_53px"
         android:layout_marginStart="@dimen/convert_21px"

BusinessStep/src/main/java/com/develop/step/ui/FoodListActivity.kt

@@ -50,9 +50,9 @@ class FoodListActivity : CommonBVMActivity<ActivityFoodListBinding, FoodListView
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val bundle = intent.extras
-        binding.ivClose.setVisible()
-        binding.ivClose.setImageResource(com.develop.common.R.drawable.ic_close)
-        binding.ivClose.setOnClickListener {
+        binding.ivFoodClose.setVisible()
+        binding.ivFoodClose.setImageResource(com.develop.common.R.drawable.ic_close)
+        binding.ivFoodClose.setOnClickListener {
             finish()
         }
         loadingDialog.showDialog(supportFragmentManager, "loadingDialog")

BusinessStep/src/main/res/layout/activity_food_list.xml

@@ -5,7 +5,7 @@
     android:layout_height="match_parent">
 
     <ImageView
-        android:id="@+id/iv_close"
+        android:id="@+id/iv_food_close"
         android:layout_width="@dimen/convert_53px"
         android:layout_height="@dimen/convert_53px"
         android:layout_marginStart="@dimen/convert_21px"

app/build.gradle

@@ -13,8 +13,8 @@ ext{
     versionCode=Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="036I"
-    brandCode="010D"
-    model="1039"
+    brandCode="017A"
+    model="5037"
 
 }
 
@@ -229,10 +229,10 @@ android {
 
         debug{
             debuggable true
-            productFlavors.brand010D.signingConfig signingConfigs.debug
-            buildConfigField("String", "UpdatePlatform", "\"054A\"")
-//            buildConfigField("String", "FLAVOR", "\"brand054ATuya\"")
-            resValue("string", "app_theme", "@style/Splash054ATheme")
+            productFlavors.brand017ATuya.signingConfig signingConfigs.debug
+//            buildConfigField("String", "UpdatePlatform", "\"054A\"")
+////            buildConfigField("String", "FLAVOR", "\"brand054ATuya\"")
+//            resValue("string", "app_theme", "@style/Splash054ATheme")
         }
     }
 

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

@@ -189,11 +189,11 @@ fun getSN(): String {
 //    return "045A10220020123010120023"
 //    return "000A30150020123010190001"
 //     return "002A30150020123010190001"
-     return "000A10390020123010190001"
+//     return "000A10390020123010190001"
 //    return "010D10390020123010190001"
 //    return "011A30150020123010190001"
 //    return "007D20020020123010190001"
-//    return "036I21060020123010180001"
+//    return "036I21060020123010190003"
 //    return  "030A10390020123010190001"
 //    return  "017A20060020123010190001"
 //    return "010D10390020123010190001"