提交人：jtm

提交内容：图标显示问题

BusinessCommon/src/main/java/com/develop/common/dialog/NoteEditDialog.kt

@@ -7,19 +7,20 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import com.blankj.utilcode.util.KeyboardUtils
+import com.develop.base.ext.src
 import com.develop.base.mvvm.FullScreenTransparentDialog
 import com.develop.base.util.MMkvUtils
 import com.develop.common.R
 import com.develop.common.databinding.ItemNoteDialogBinding
 
 
-class NoteEditDialog: FullScreenTransparentDialog() {
+class NoteEditDialog : FullScreenTransparentDialog() {
 
     private lateinit var binding: ItemNoteDialogBinding
 
-    var listener:OnDialogClickListener?=null;
+    var listener: OnDialogClickListener? = null;
 
-    var text:String?="";
+    var text: String? = "";
 
     @SuppressLint("ClickableViewAccessibility")
     override fun onCreateView(
@@ -32,25 +33,25 @@ class NoteEditDialog: FullScreenTransparentDialog() {
             inflater, container, false
         )
 
+        binding.ivClose.src = R.drawable.ic_close
+        binding.root.setOnTouchListener { v, event ->
+            when (event.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    val x = event.x.toInt()
+                    val y = event.y.toInt()
 
-
-       binding.root.setOnTouchListener { v, event ->
-           when (event.action) {
-               MotionEvent.ACTION_DOWN -> {
-                   val x = event.x.toInt()
-                   val y = event.y.toInt()
-
-                   // 在这里使用 x 和 y 进行相应的操作
-                   // ...
-                    if(x != 0 && y != 0){
+                    // 在这里使用 x 和 y 进行相应的操作
+                    // ...
+                    if (x != 0 && y != 0) {
                         KeyboardUtils.hideSoftInput(binding.etNote)
                     }
-                   true
-               }
-               else -> false
-           }
+                    true
+                }
 
-       }
+                else -> false
+            }
+
+        }
 
         binding.ivClose.setOnClickListener {
             removeSelf()
@@ -64,19 +65,19 @@ class NoteEditDialog: FullScreenTransparentDialog() {
             binding.etNote.text.clear();
             listener?.onClear();
         }
-        if(text != null){
-            binding.etNote.text.insert(0,text)
+        if (text != null) {
+            binding.etNote.text.insert(0, text)
 
         }
         return binding.root
     }
 
-    fun configListener(listener:OnDialogClickListener){
+    fun configListener(listener: OnDialogClickListener) {
         this.listener = listener;
     }
 
     interface OnDialogClickListener {
-        fun onComplete(remark:String)
+        fun onComplete(remark: String)
         fun onClear()
     }
 

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

@@ -42,6 +42,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
         super.onCreate(savedInstanceState)
         dataList = DataFactory.genSettingModesList(resources)
         binding.tvTitle.updateText(getString(com.develop.common.R.string.settings))
+        binding.ivClose.src = com.develop.common.R.drawable.ic_close
         binding.ivClose.setOnClickListener {
             finish()
         }
@@ -68,9 +69,11 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
                         SettingType.BRIGHTNESS -> {
                             navigateTo(Screens.Setting.BRIGHTNESS)
                         }
+
                         SettingType.SOUND -> {
                             navigateTo(Screens.Setting.SOUND)
                         }
+
                         SettingType.WIFI -> {
                             navigateTo(Screens.Setting.WIFI) {
                                 val bundle = Bundle()
@@ -78,6 +81,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
                                 with(bundle)
                             }
                         }
+
                         SettingType.USER_ACCOUNT -> {
                             navigateTo(Screens.Auth.MEMBER) {
                                 withBoolean("enter_from_home", true)
@@ -91,14 +95,17 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
                                 with(bundle)
                             }
                         }
+
                         SettingType.ABOUT -> {
                             navigateTo(Screens.Setting.ABOUT)
                         }
+
                         SettingType.RESTORE_FACTORY_SETTINGS -> {
                             navigateTo(Screens.Setting.RESTORE)
                         }
+
                         SettingType.STORAGE -> {
-                           openFileManager()
+                            openFileManager()
                         }
                     }
                 }