refactor(更新)

- 图标更换和新增图标

app/src/main/assets/themes/Default/icons/back-up.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24">
+  <path d="m8.5,16c3.58,0,6.624-.839,8.5-2.173v1.74c0,1.621-3.635,3.434-8.5,3.434S0,17.188,0,15.566v-1.74c1.876,1.334,4.92,2.174,8.5,2.174ZM0,18.826v.96c0,2.767,4.276,4.214,8.5,4.214s8.5-1.447,8.5-4.214v-.96c-1.876,1.334-4.92,2.174-8.5,2.174s-6.624-.839-8.5-2.174ZM22,0v1.534c-1.078-.97-2.482-1.534-4-1.534-2.967,0-5.431,2.167-5.91,5h2.052c.447-1.72,1.999-3,3.858-3,1,0,1.928.367,2.644,1h-1.644v2h5V0h-2Zm-4,10c-.994,0-1.929-.368-2.646-1h1.646v-2h-5v5h2v-1.531c1.08.966,2.494,1.531,4,1.531,2.967,0,5.431-2.167,5.91-5h-2.052c-.447,1.72-1.999,3-3.858,3Zm-9.5-1c.513,0,1.012-.028,1.5-.074v-2.926c0-2.151.854-4.1,2.235-5.538-1.128-.293-2.393-.462-3.735-.462C3.806,0,0,2.015,0,4.5s3.806,4.5,8.5,4.5Zm0,5c.516,0,1.015-.024,1.5-.063v-3.003c-.489.04-.987.066-1.5.066-3.58,0-6.624-1.004-8.5-2.6v2.167c0,1.621,3.635,3.433,8.5,3.433Z"/>
+</svg>

app/src/main/assets/themes/Default/icons/file-export.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24" width="512" height="512"><path d="M23.13,18.09l-1.61,1.61c-.2,.2-.45,.29-.71,.29s-.51-.1-.71-.29c-.39-.39-.39-1.02,0-1.41l1.29-1.29h-7.4c-.55,0-1-.45-1-1s.45-1,1-1h7.4l-1.29-1.29c-.39-.39-.39-1.02,0-1.41s1.02-.39,1.41,0l1.61,1.61c1.15,1.15,1.15,3.03,0,4.19ZM13,8h6.54c-.35-.91-.88-1.75-1.59-2.46l-3.48-3.49c-.71-.71-1.55-1.24-2.46-1.59V7c0,.55,.45,1,1,1Zm4.81,11h-3.81c-1.65,0-3-1.35-3-3s1.35-3,3-3h3.81c0-.77,.29-1.54,.88-2.12,.37-.37,.82-.63,1.29-.76v-.12h-6.98c-1.65,0-3-1.35-3-3V.02c-.16-.01-.32-.02-.49-.02H5C2.24,0,0,2.24,0,5v14c0,2.76,2.24,5,5,5H15c1.81,0,3.4-.97,4.28-2.42-.21-.13-.41-.28-.59-.46-.58-.58-.88-1.35-.88-2.12Z"/></svg>

app/src/main/assets/themes/Default/icons/icon_bottom_menu_data_manage.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" data-name="Layer 1"><path d="m19.414 5h-4.414v-4.414zm.086 13c3.044 0 4.279-.811 4.5-1.079v-2.421c0-.883-1.85-1.5-4.5-1.5s-4.5.617-4.5 1.5v2.421c.221.268 1.456 1.079 4.5 1.079m0 6c2.859 0 4.5-.79 4.5-2.167v-2.833s-1 1-4.5 1-4.5-1-4.5-1v2.833c0 1.377 1.641 2.167 4.5 2.167m-6.5-2.167v-7.333c0-1.052.634-3.5 6.5-3.5.176 0 .333.009.5.013v-4.013h-7v-7h-10c-1.657 0-3 1.343-3 3v21h13.751c-.651-.842-.751-1.727-.751-2.167zm-7-1.833h-2v-4h2zm4 0h-2v-9h2z"/></svg>

app/src/main/assets/themes/Default/icons/icon_bottom_menu_exception_manage.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24" width="512" height="512"><path d="M23.843,22.248l-6.855-11.67c-.441-.771-1.533-.771-1.974,0l-6.855,11.67c-.444,.777,.105,1.752,.987,1.752h13.711c.882,0,1.432-.976,.987-1.752Zm-7.843-.248c-.552,0-1-.448-1-1s.448-1,1-1,1,.448,1,1-.448,1-1,1Zm1-4c0,.552-.447,1-1,1s-1-.448-1-1v-3c0-.552,.447-1,1-1s1,.448,1,1v3Zm-10.579,3.254l6.867-11.689c.549-.958,1.592-1.565,2.712-1.565s2.163,.607,2.723,1.584l5.277,8.982V5c0-2.757-2.243-5-5-5H5C2.243,0,0,2.243,0,5v14c0,2.757,2.243,5,5,5h1.252c-.352-.891-.314-1.901,.169-2.746ZM8,3c.552,0,1,.448,1,1s-.448,1-1,1-1-.448-1-1,.448-1,1-1Zm-4,2c-.552,0-1-.448-1-1s.448-1,1-1,1,.448,1,1-.448,1-1,1Z"/></svg>

app/src/main/assets/themes/Default/icons/icon_bottom_menu_hardware_manage.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24" width="512" height="512"><path d="M1,15V5C1,2.24,3.24,0,6,0h12c2.76,0,5,2.24,5,5V15H1Zm22,2v2c0,2.76-2.24,5-5,5H6c-2.76,0-5-2.24-5-5v-2H23Zm-7,3.5c0-.83-.67-1.5-1.5-1.5s-1.5,.67-1.5,1.5,.67,1.5,1.5,1.5,1.5-.67,1.5-1.5Zm4,0c0-.83-.67-1.5-1.5-1.5s-1.5,.67-1.5,1.5,.67,1.5,1.5,1.5,1.5-.67,1.5-1.5Z"/></svg>

app/src/main/assets/themes/Default/icons/icon_bottom_menu_home.svg

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve" width="512" height="512">
+<g>
+	<path d="M256,319.841c-35.346,0-64,28.654-64,64v128h128v-128C320,348.495,291.346,319.841,256,319.841z"/>
+	<g>
+		<path d="M362.667,383.841v128H448c35.346,0,64-28.654,64-64V253.26c0.005-11.083-4.302-21.733-12.011-29.696l-181.29-195.99    c-31.988-34.61-85.976-36.735-120.586-4.747c-1.644,1.52-3.228,3.103-4.747,4.747L12.395,223.5    C4.453,231.496-0.003,242.31,0,253.58v194.261c0,35.346,28.654,64,64,64h85.333v-128c0.399-58.172,47.366-105.676,104.073-107.044    C312.01,275.383,362.22,323.696,362.667,383.841z"/>
+		<path d="M256,319.841c-35.346,0-64,28.654-64,64v128h128v-128C320,348.495,291.346,319.841,256,319.841z"/>
+	</g>
+</g>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</svg>

app/src/main/assets/themes/Default/icons/icon_bottom_menu_job_manage.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24">
+  <path d="m19,17.5c0,.827-.673,1.5-1.5,1.5s-1.5-.673-1.5-1.5.673-1.5,1.5-1.5,1.5.673,1.5,1.5Zm-9,4.5c0-1.654-1.346-3-3-3h-.443c.682-1.687,1.443-3.738,1.443-4.5,0-1.381-1.119-2.45-2.5-2.45s-2.5,1.069-2.5,2.45c0,.762.761,2.813,1.443,4.5h-.443c-1.654,0-3,1.346-3,3-.553,0-1,.447-1,1s.447,1,1,1h9c.553,0,1-.447,1-1s-.447-1-1-1ZM24,5v14c0,2.757-2.243,5-5,5h-6.184c.112-.314.184-.648.184-1,0-.979-.472-1.85-1.199-2.397-.389-1.336-1.322-2.443-2.543-3.063.637-1.793.742-2.551.742-3.039,0-2.284-1.756-4.15-4-4.399v-5.101c0-2.757,2.243-5,5-5h8c2.757,0,5,2.243,5,5Zm-14,1c0,.553.447,1,1,1h8c.553,0,1-.447,1-1s-.447-1-1-1h-8c-.553,0-1,.447-1,1Zm7,5c.553,0,1-.447,1-1s-.447-1-1-1h-6c-.553,0-1,.447-1,1s.447,1,1,1h6Zm4,6.5c0-1.93-1.57-3.5-3.5-3.5s-3.5,1.57-3.5,3.5,1.57,3.5,3.5,3.5,3.5-1.57,3.5-3.5Z"/>
+</svg>

app/src/main/assets/themes/Default/icons/leave.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24">
+  <path d="m23.473,16.247l-2.862,2.863-1.414-1.414,1.696-1.696h-6.892v-2h6.956l-1.76-1.761,1.414-1.414,2.862,2.862c.706.706.706,1.854,0,2.56Zm-9.473,1.753h2v5.999H0V4.199C0,2.775,1.014,1.538,2.411,1.258L8.412.057c.886-.174,1.793.051,2.491.622.428.351.728.812.908,1.319h1.19c1.654,0,3,1.346,3,3v7.001h-2v-7.001c0-.552-.449-1-1-1h-1v18h2v-3.999Zm-4.999-5.501c0-.829-.672-1.501-1.501-1.501s-1.501.672-1.501,1.501.672,1.501,1.501,1.501,1.501-.672,1.501-1.501Z"/>
+</svg>

app/src/main/assets/themes/Default/icons/new_sop.svg

@@ -0,0 +1,54 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="900.000000pt" height="900.000000pt" viewBox="0 0 900.000000 900.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.10, written by Peter Selinger 2001-2011
+</metadata>
+<g transform="translate(0.000000,900.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M1980 8403 c-85 -38 -104 -51 -151 -98 -59 -60 -82 -97 -109 -172
+-20 -57 -20 -83 -20 -3643 0 -3581 0 -3586 20 -3644 27 -74 57 -120 116 -177
+48 -46 72 -60 147 -93 34 -14 203 -16 1869 -16 1007 0 1833 1 1834 3 2 2 5
+282 7 623 4 674 4 671 62 765 37 59 61 85 120 128 108 80 65 75 770 81 l630 5
+3 2955 c2 2939 2 2955 -18 3013 -26 74 -56 121 -113 177 -44 43 -66 57 -150
+94 -35 15 -237 16 -2510 15 -2230 0 -2475 -2 -2507 -16z m999 -1259 c171 -42
+291 -152 351 -321 49 -139 11 -250 -92 -268 -81 -14 -149 37 -163 124 -16 96
+-72 172 -138 185 -89 18 -158 3 -205 -44 -52 -52 -68 -116 -47 -185 25 -86 95
+-135 193 -135 98 0 215 -44 296 -111 106 -87 176 -230 176 -358 0 -67 -27
+-167 -64 -236 -31 -56 -126 -151 -177 -176 -107 -53 -110 -53 -239 -53 -123 0
+-126 1 -202 37 -130 62 -213 160 -259 301 -41 127 -14 217 75 251 38 15 50 15
+82 5 40 -13 94 -65 94 -89 0 -8 7 -41 16 -72 35 -126 167 -194 272 -140 105
+53 146 152 103 246 -34 76 -97 107 -239 120 -121 11 -242 76 -314 172 -49 65
+-71 111 -93 198 -19 75 -19 103 1 184 45 187 172 319 354 365 74 20 140 19
+219 0z m1733 -3 c116 -33 202 -106 259 -218 l34 -68 3 -440 c4 -462 -1 -550
+-37 -625 -25 -54 -101 -144 -139 -164 -123 -65 -94 -61 -372 -61 -233 0 -260
+2 -300 20 -135 59 -223 168 -249 309 -15 81 -15 838 0 925 27 157 143 285 294
+324 94 24 419 23 507 -2z m1533 4 c193 -48 322 -196 342 -393 12 -119 -49
+-268 -144 -352 -82 -72 -172 -99 -368 -109 l-130 -6 -5 -322 -5 -322 -33 -34
+c-72 -74 -196 -48 -233 50 -5 14 -9 313 -9 707 l0 683 31 42 c16 23 45 49 62
+56 47 21 411 20 492 0z m-2691 -2565 c22 -5 53 -22 69 -38 58 -58 44 -168 -28
+-212 -31 -19 -49 -20 -430 -20 -387 0 -399 1 -432 21 -35 22 -73 83 -73 119 0
+31 35 93 62 110 13 8 37 18 53 21 48 10 736 9 779 -1z m2697 -15 c32 -24 69
+-86 69 -115 0 -36 -38 -97 -73 -119 -34 -21 -35 -21 -1109 -21 l-1075 0 -41
+30 c-34 24 -42 37 -47 74 -4 24 -4 57 -1 74 9 38 63 89 101 95 17 2 507 4
+1090 3 1041 -1 1060 -1 1086 -21z m-90 -936 c19 -6 49 -27 67 -47 26 -29 32
+-44 32 -80 0 -54 -29 -105 -73 -130 -30 -16 -140 -17 -1717 -17 -1433 0 -1690
+2 -1719 14 -42 18 -91 84 -91 123 0 33 25 86 49 106 52 43 -12 41 1747 42
+1184 0 1681 -3 1705 -11z m-2325 -958 c108 -49 111 -195 6 -247 -34 -18 -73
+-19 -522 -22 -329 -2 -501 0 -536 8 -120 26 -163 154 -78 232 54 49 46 48 584
+48 471 0 508 -2 546 -19z m1674 -3 c121 -62 99 -219 -35 -257 -55 -15 -1144
+-15 -1200 0 -51 14 -80 41 -101 95 -16 42 -16 45 7 91 18 36 35 53 69 71 l44
+22 586 0 586 0 44 -22z"/>
+<path d="M4333 6871 c-78 -6 -108 -19 -135 -56 -4 -5 -8 -213 -8 -462 l0 -452
+37 -28 c36 -28 37 -28 216 -31 197 -4 221 1 262 50 l25 30 0 431 c0 410 -1
+434 -20 464 -12 21 -32 36 -57 43 -48 15 -212 20 -320 11z"/>
+<path d="M5959 6862 c-17 -12 -19 -26 -19 -136 0 -91 4 -126 13 -135 16 -13
+183 -17 244 -7 138 24 148 233 14 277 -52 17 -228 18 -252 1z"/>
+<path d="M6055 1864 c-16 -9 -39 -28 -50 -42 -19 -26 -20 -45 -23 -625 -2
+-503 0 -598 11 -603 36 -13 112 54 460 404 594 598 726 734 763 790 63 94 109
+87 -551 89 -502 2 -584 0 -610 -13z"/>
+</g>
+</svg>

app/src/main/assets/themes/Default/icons/rfid.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24" width="512" height="512"><path d="M12,10c1.1,0,2,.9,2,2s-.9,2-2,2-2-.9-2-2,.9-2,2-2Zm8.49,10.49c4.68-4.68,4.68-12.29,0-16.97-.39-.39-1.02-.39-1.41,0s-.39,1.02,0,1.41c3.9,3.9,3.9,10.24,0,14.14-.39,.39-.39,1.02,0,1.41,.2,.2,.45,.29,.71,.29s.51-.1,.71-.29Zm-3.54-3.54c1.32-1.32,2.05-3.08,2.05-4.95s-.73-3.63-2.05-4.95c-.39-.39-1.02-.39-1.41,0s-.39,1.02,0,1.41c.94,.94,1.46,2.2,1.46,3.54s-.52,2.59-1.46,3.54c-.39,.39-.39,1.02,0,1.41,.2,.2,.45,.29,.71,.29s.51-.1,.71-.29Zm-12.02,3.54c.39-.39,.39-1.02,0-1.41-3.9-3.9-3.9-10.24,0-14.14,.39-.39,.39-1.02,0-1.41s-1.02-.39-1.41,0C-1.16,8.19-1.16,15.81,3.51,20.49c.2,.2,.45,.29,.71,.29s.51-.1,.71-.29Zm3.54-3.54c.39-.39,.39-1.02,0-1.41-1.95-1.95-1.95-5.12,0-7.07,.39-.39,.39-1.02,0-1.41s-1.02-.39-1.41,0c-2.73,2.73-2.73,7.17,0,9.9,.2,.2,.45,.29,.71,.29s.51-.1,.71-.29Z"/></svg>

app/src/main/assets/themes/Default/icons/target.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" height="512" viewBox="0 0 24 24" width="512" xmlns="http://www.w3.org/2000/svg" data-name="Layer 1"><path d="m12 0a12 12 0 1 0 12 12 12.013 12.013 0 0 0 -12-12zm1.5 20.865v-1.365a1.5 1.5 0 0 0 -3 0v1.365a9.014 9.014 0 0 1 -7.365-7.365h1.365a1.5 1.5 0 0 0 0-3h-1.365a9.014 9.014 0 0 1 7.365-7.365v1.365a1.5 1.5 0 0 0 3 0v-1.365a9.01 9.01 0 0 1 7.365 7.365h-1.365a1.5 1.5 0 0 0 0 3h1.365a9.01 9.01 0 0 1 -7.365 7.365zm2.5-8.865a1.5 1.5 0 0 1 -1.5 1.5h-1v1a1.5 1.5 0 0 1 -3 0v-1h-1a1.5 1.5 0 0 1 0-3h1v-1a1.5 1.5 0 0 1 3 0v1h1a1.5 1.5 0 0 1 1.5 1.5z"/></svg>

app/src/main/java/com/grkj/iscs/features/main/fragment/common/EditJobWorkflowSettingFragment.kt

@@ -20,6 +20,7 @@ import com.grkj.iscs.features.main.dialog.TextDropDownDialog
 import com.grkj.iscs.features.main.viewmodel.common.EditJobWorkflowSettingViewModel
 import com.grkj.iscs.features.main.viewmodel.common.WorkflowSettingViewModel
 import com.grkj.ui_base.base.BaseFormFragment
+import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.extension.smoothScrollToSmartPosition
 import com.kongzue.dialogx.dialogs.PopTip
@@ -241,9 +242,9 @@ class EditJobWorkflowSettingFragment : BaseFormFragment<FragmentWorkflowSettingB
         val previewStepTitle = GlobalDataTempStore.getInstance()
             .getData(DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA) ?: ""
         val previewStepIcon = GlobalDataTempStore.getInstance()
-            .getData(DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA) ?: 0
+            .getData(DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA) ?: ""
         binding.previewStepTitle.text = previewStepTitle
-        binding.previewStepIv.setImageResource(previewStepIcon)
+        binding.previewStepIv.loadSkinIcon(previewStepIcon)
         viewModel.getSettingData().observe(this) {
             viewModel.getWorkflowSteps().observe(this) {
                 if (viewModel.workflowSteps.isEmpty()) {

app/src/main/java/com/grkj/iscs/features/main/fragment/common/EditSopWorkflowSettingFragment.kt

@@ -20,6 +20,7 @@ import com.grkj.iscs.features.main.dialog.TextDropDownDialog
 import com.grkj.iscs.features.main.viewmodel.common.EditSopWorkflowSettingViewModel
 import com.grkj.iscs.features.main.viewmodel.common.WorkflowSettingViewModel
 import com.grkj.ui_base.base.BaseFormFragment
+import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.extension.smoothScrollToSmartPosition
 import com.kongzue.dialogx.dialogs.PopTip
@@ -241,9 +242,9 @@ class EditSopWorkflowSettingFragment : BaseFormFragment<FragmentWorkflowSettingB
         val previewStepTitle = GlobalDataTempStore.getInstance()
             .getData(DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA) ?: ""
         val previewStepIcon = GlobalDataTempStore.getInstance()
-            .getData(DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA) ?: 0
+            .getData(DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA) ?: ""
         binding.previewStepTitle.text = previewStepTitle
-        binding.previewStepIv.setImageResource(previewStepIcon)
+        binding.previewStepIv.loadSkinIcon(previewStepIcon)
         viewModel.getSettingData().observe(this) {
             viewModel.getWorkflowSteps().observe(this) {
                 if (viewModel.workflowSteps.isEmpty()) {

app/src/main/java/com/grkj/iscs/features/main/fragment/common/SelectMemberFragment.kt

@@ -27,6 +27,7 @@ import com.grkj.iscs.databinding.ItemSelectColockerMemberBinding
 import com.grkj.iscs.features.main.viewmodel.common.SelectMemberViewModel
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.listeners.BlankAreaTouchListener
+import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.extension.tip
 import com.kongzue.dialogx.dialogs.PopTip
@@ -57,13 +58,13 @@ class SelectMemberFragment : BaseFragment<FragmentSelectMemeberBinding>() {
         ticketId = GlobalDataTempStore.getInstance()
             .getData(DataTransferConstants.KEY_JOB_TICKET_ID)
         val previewStepIcon = GlobalDataTempStore.getInstance()
-            .getData<Int>(DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA)
+            .getData<String>(DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA)?:""
         val previewStepTitle = GlobalDataTempStore.getInstance()
             .getData<String>(DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA)
         canSelectColoker = GlobalDataTempStore.getInstance()
             .getData<Boolean>(DataTransferConstants.KEY_CAN_SELECT_COLOCKER) == true
         binding.previewStepTitle.text = previewStepTitle
-        binding.previewStepIv.setImageResource(previewStepIcon ?: 0)
+        binding.previewStepIv.loadSkinIcon(previewStepIcon)
         binding.back.setDebouncedClickListener {
             navController.popBackStack()
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/common/SelectPointFragment.kt

@@ -22,6 +22,7 @@ import com.grkj.iscs.databinding.ItemSelectPointBinding
 import com.grkj.iscs.features.main.viewmodel.common.SelectPointViewModel
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.listeners.BlankAreaTouchListener
+import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
 import com.sik.sikcore.data.GlobalDataTempStore
 import com.sik.sikcore.extension.setDebouncedClickListener
@@ -224,9 +225,9 @@ class SelectPointFragment : BaseFragment<FragmentSelectPointBinding>() {
         val previewStepTitle = GlobalDataTempStore.getInstance()
             .getData(DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA) ?: ""
         val previewStepIcon = GlobalDataTempStore.getInstance()
-            .getData(DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA) ?: 0
+            .getData(DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA) ?: ""
         binding.previewStepTitle.text = previewStepTitle
-        binding.previewStepIv.setImageResource(previewStepIcon)
+        binding.previewStepIv.loadSkinIcon(previewStepIcon)
         logger.info(
             "参数是否存在:${
                 GlobalDataTempStore.getInstance().hasData(DataTransferConstants.KEY_IS_UNLOCK_FIRST)

app/src/main/java/com/grkj/iscs/features/main/fragment/common/WorkflowSettingFragment.kt

@@ -18,6 +18,7 @@ import com.grkj.iscs.databinding.ItemWorkFlowStepFunctionBinding
 import com.grkj.iscs.features.main.dialog.TextDropDownDialog
 import com.grkj.iscs.features.main.viewmodel.common.WorkflowSettingViewModel
 import com.grkj.ui_base.base.BaseFormFragment
+import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.extension.smoothScrollToSmartPosition
 import com.kongzue.dialogx.dialogs.PopTip
@@ -241,9 +242,9 @@ class WorkflowSettingFragment : BaseFormFragment<FragmentWorkflowSettingBinding>
         val previewStepTitle = GlobalDataTempStore.getInstance()
             .getData(DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA) ?: ""
         val previewStepIcon = GlobalDataTempStore.getInstance()
-            .getData(DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA) ?: 0
+            .getData(DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA) ?: ""
         binding.previewStepTitle.text = previewStepTitle
-        binding.previewStepIv.setImageResource(previewStepIcon)
+        binding.previewStepIv.loadSkinIcon(previewStepIcon)
         viewModel.getSettingData().observe(this) {
             viewModel.getWorkflowSteps().observe(this) {
                 if (viewModel.workflowSteps.isEmpty()) {

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/DataManageHomeFragment.kt

@@ -39,7 +39,7 @@ class DataManageHomeFragment : BaseFragment<FragmentDataManageHomeBinding>() {
         ),
         MenuItemEntity(
             1,
-            "users-alt",
+            "users-alt.svg",
             RoleFunctionalPermissionsEnum.ROLE_MANAGE.description,
             RoleFunctionalPermissionsEnum.ROLE_MANAGE.functionalPermission
         ),

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/CreateJobFragment.kt

@@ -159,7 +159,7 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                    R.mipmap.icon_job_manage_create_job
+                    "document.svg"
                 )
             val isSaveSuccess = GlobalDataTempStore.getInstance()
                 .saveData(
@@ -209,7 +209,7 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                    R.mipmap.icon_job_manage_create_job
+                    "document.svg"
                 )
             navController.navigate(R.id.action_createJobFragment_to_selectMemberFragment)
         }
@@ -231,7 +231,7 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                    R.mipmap.icon_job_manage_create_job
+                    "document.svg"
                 )
             navController.navigate(R.id.action_createJobFragment_to_workflowSettingFragment)
         }
@@ -255,7 +255,7 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                    R.mipmap.icon_job_manage_create_job
+                    "document.svg"
                 )
             val isSaveSuccess = GlobalDataTempStore.getInstance()
                 .saveData(
@@ -302,7 +302,7 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                    R.mipmap.icon_job_manage_create_job
+                    "document.svg"
                 )
             navController.navigate(R.id.action_createJobFragment_to_selectMemberFragment)
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/CreateSopFragment.kt

@@ -118,7 +118,7 @@ class CreateSopFragment : BaseFormFragment<FragmentCreateSopBinding>() {
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                R.mipmap.icon_job_manage_create_sop
+                "new_sop.svg"
             )
             val isSaveSuccess = GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_IS_UNLOCK_FIRST, viewModel.isUnlockFirst
@@ -156,7 +156,7 @@ class CreateSopFragment : BaseFormFragment<FragmentCreateSopBinding>() {
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                R.mipmap.icon_job_manage_create_sop
+                "new_sop.svg"
             )
             navController.navigate(R.id.action_createSopFragment_to_selectMemberFragment)
         }
@@ -174,7 +174,7 @@ class CreateSopFragment : BaseFormFragment<FragmentCreateSopBinding>() {
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                R.mipmap.icon_job_manage_create_sop
+                "new_sop.svg"
             )
             navController.navigate(R.id.action_createSopFragment_to_workflowSettingFragment)
         }
@@ -194,7 +194,7 @@ class CreateSopFragment : BaseFormFragment<FragmentCreateSopBinding>() {
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                R.mipmap.icon_job_manage_create_sop
+                "new_sop.svg"
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_IS_UNLOCK_FIRST, viewModel.isUnlockFirst
@@ -228,7 +228,7 @@ class CreateSopFragment : BaseFormFragment<FragmentCreateSopBinding>() {
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                R.mipmap.icon_job_manage_create_sop
+                "new_sop.svg"
             )
             navController.navigate(R.id.action_createSopFragment_to_selectMemberFragment)
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/CreateSopJobFragment.kt

@@ -141,7 +141,7 @@ class CreateSopJobFragment : BaseFormFragment<FragmentCreateSopJobBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                    R.mipmap.icon_job_manage_create_job
+                    "sop.svg"
                 )
             navController.navigate(R.id.action_createSopJobFragment_to_workflowSettingFragment)
         }
@@ -184,7 +184,7 @@ class CreateSopJobFragment : BaseFormFragment<FragmentCreateSopJobBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                    R.mipmap.icon_data_manage_menu_point_manage
+                    "sop.svg"
                 )
             navController.navigate(R.id.action_createSopJobFragment_to_selectMemberFragment)
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/EditJobFragment.kt

@@ -143,7 +143,7 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                    R.mipmap.icon_job_manage_create_job
+                    "document.svg"
                 )
             navController.navigate(R.id.action_editJobFragment_to_editJobWorkflowSettingFragment)
         }
@@ -163,7 +163,7 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                R.mipmap.icon_data_manage_menu_point_manage
+                "document.svg"
             )
             GlobalDataTempStore.getInstance()
                 .saveData(
@@ -199,7 +199,7 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                R.mipmap.icon_data_manage_menu_point_manage
+                "document.svg"
             )
             navController.navigate(R.id.action_editJobFragment_to_selectMemberFragment)
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/EditSopFragment.kt

@@ -131,7 +131,7 @@ class EditSopFragment : BaseFormFragment<FragmentEditSopBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                    R.mipmap.icon_job_manage_create_sop
+                    "new_sop.svg"
                 )
             navController.navigate(R.id.action_editSopFragment_to_editSopWorkflowSettingFragment)
         }
@@ -155,7 +155,7 @@ class EditSopFragment : BaseFormFragment<FragmentEditSopBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                    R.mipmap.icon_data_manage_menu_point_manage
+                    "new_sop.svg"
                 )
             GlobalDataTempStore.getInstance()
                 .saveData(
@@ -197,7 +197,7 @@ class EditSopFragment : BaseFormFragment<FragmentEditSopBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                    R.mipmap.icon_data_manage_menu_point_manage
+                    "new_sop.svg"
                 )
             navController.navigate(R.id.action_editSopFragment_to_selectMemberFragment)
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/EditSopJobFragment.kt

@@ -160,7 +160,7 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                    R.mipmap.icon_job_manage_create_job
+                    "sop.svg"
                 )
             navController.navigate(R.id.action_editSopJobFragment_to_editJobWorkflowSettingFragment)
         }
@@ -187,7 +187,7 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                R.mipmap.icon_data_manage_menu_point_manage
+                "sop.svg"
             )
             navController.navigate(R.id.action_editSopJobFragment_to_selectMemberFragment)
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/JobExecuteFragment.kt

@@ -372,7 +372,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
-                R.mipmap.icon_data_manage_menu_point_manage
+                "ballot-check.svg"
             )
             GlobalDataTempStore.getInstance()
                 .saveData(DataTransferConstants.KEY_JOB_TICKET_ID, viewModel.ticketId)

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/MyTodoListFragment.kt

@@ -555,7 +555,8 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
                 jobExecuteViewModel.ticketData!!.ticketName
             )
             GlobalDataTempStore.getInstance().saveData(
-                DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA, R.mipmap.icon_my_todo
+                DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
+                "to-do.svg"
             )
             GlobalDataTempStore.getInstance()
                 .saveData(DataTransferConstants.KEY_JOB_TICKET_ID, jobExecuteViewModel.ticketId)

app/src/main/res/drawable/table_border.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@android:color/white" />
+    <solid android:color="?attr/colorContainerBg" />
     <stroke
         android:width="@dimen/iscs_stroke_sm"
         android:color="?attr/colorBlack" />

app/src/main/res/drawable/table_row_border.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@android:color/white" />
+    <solid android:color="?attr/colorContainerBg" />
     <stroke
         android:width="@dimen/iscs_stroke_sm"
         android:color="?attr/colorBlack" />

app/src/main/res/layout-land/fragment_point_manage.xml

@@ -19,7 +19,7 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src='@{"location-crosshairs.svg"}' />
+                app:skinSrc='@{"location-crosshairs.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout-land/item_home_menu.xml

@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <LinearLayout
-        android:layout_width="@dimen/home_menu_width"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:orientation="vertical"

app/src/main/res/layout-land/item_home_quick_entrance.xml

@@ -20,6 +20,7 @@
                 android:id="@+id/home_menu_iv"
                 android:layout_width="@dimen/home_item_quick_entrance_iv"
                 android:layout_height="@dimen/home_item_quick_entrance_iv"
+                android:tint="?attr/colorPrimary"
                 android:layout_gravity="center" />
         </cn.bingoogolapple.badgeview.BGABadgeFrameLayout>
 

app/src/main/res/layout-land/item_quick_entrance_not_config.xml

@@ -20,6 +20,7 @@
                 android:id="@+id/home_menu_iv"
                 android:layout_width="@dimen/home_item_quick_entrance_iv"
                 android:layout_height="@dimen/home_item_quick_entrance_iv"
+                android:tint="?attr/colorPrimary"
                 android:layout_gravity="center" />
 
             <ImageView

app/src/main/res/layout/fragment_backup_and_restore.xml

@@ -25,7 +25,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src='@{"back-up.svg"}' />
+                app:skinSrc='@{"back-up.svg"}'
+                android:tint="?attr/colorPrimary"/>
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_card_manage.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"cards-blank.png"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_create_job.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_job_manage_create_job" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"document.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_create_sop.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_job_manage_create_sop" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"new_sop.svg"}'/>
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_create_sop_job.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_job_manage_create_job" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"sop.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_edit_job.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_job_manage_create_job" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"document.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_edit_sop.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_job_manage_create_sop" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"new_sop.svg"}'/>
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_edit_sop_job.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_job_manage_create_job" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"sop.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_exception_detail.xml

@@ -7,7 +7,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -22,7 +21,7 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@drawable/icon_info"
+                app:skinSrc='@{"message-alert.svg"}'
                 android:tint="?attr/colorStatusRed" />
 
             <TextView

app/src/main/res/layout/fragment_exception_job.xml

@@ -22,7 +22,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_job_execute" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"message-alrert.svg"}' />
 
             <TextView
                 android:id="@+id/job_name_tv"

app/src/main/res/layout/fragment_exception_job_manage.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"icon_bottom_menu_exception_manage.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_exception_manage.xml

@@ -7,7 +7,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -21,7 +20,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"icon_bottom_menu_exception_manage.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_exception_report.xml

@@ -7,7 +7,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -21,7 +20,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"limit-hand.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_in_progress_job_manage.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"ballot-check.svg"}'/>
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_job_execute.xml

@@ -7,7 +7,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -21,7 +20,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_job_execute" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"ballot-check.svg"}' />
 
             <TextView
                 android:id="@+id/job_name_tv"
@@ -209,6 +209,7 @@
                             android:layout_alignParentRight="true"
                             android:layout_centerVertical="true"
                             android:layout_marginRight="@dimen/iscs_space_3"
+                            android:tint="?attr/colorBgStroke"
                             android:src="@mipmap/icon_full_screen" />
                     </RelativeLayout>
 

app/src/main/res/layout/fragment_job_manage.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"icon_bottom_menu_job_manage.svg"}'/>
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_key_manage.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"key.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_lock_manage.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"lock.svg"}'/>
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_locked_point.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"target.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_my_todo_list.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_my_todo" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"to-do.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_point_manage.xml

@@ -19,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src='@{"location-crosshairs.svg"}' />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"location-crosshairs.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_reset_password.xml

@@ -7,7 +7,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -21,7 +20,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"password-lock.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_rfid_token_manage.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"rfid.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_role_manage.xml

@@ -19,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src='@{"users-alt.svg"}' />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"users-alt.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_select_memeber.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -21,7 +20,7 @@
                 android:id="@+id/preview_step_iv"
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary" />
 
             <TextView
                 android:id="@+id/preview_step_title"
@@ -38,12 +37,14 @@
                 android:layout_height="match_parent"
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:scaleType="fitXY"
+                android:tint="?attr/colorPrimary"
                 android:src="@mipmap/icon_title_arrow_divider" />
 
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_role_manage" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"selection.svg"}' />
 
             <TextView
                 android:layout_width="wrap_content"

app/src/main/res/layout/fragment_select_point.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -21,7 +20,7 @@
                 android:id="@+id/preview_step_iv"
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary" />
 
             <TextView
                 android:id="@+id/preview_step_title"
@@ -31,6 +30,7 @@
                 app:i18nKey='@{"create_sop_title"}'
                 android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/normal_text_size_25"
+                android:tint="?attr/colorPrimary"
                 android:textStyle="bold" />
 
             <ImageView
@@ -43,7 +43,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_point_manage" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"choose.svg"}'  />
 
             <TextView
                 android:layout_width="wrap_content"

app/src/main/res/layout/fragment_set_face.xml

@@ -7,7 +7,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -21,8 +20,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_login_menu_face"
-                android:tint="?attr/colorBlack" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"face-id-svgrepo-com.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_set_fingerprint.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,8 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_login_menu_fingerprint"
-                android:tint="?attr/colorBlack" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"fingerprint.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_set_job_card.xml

@@ -7,7 +7,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -21,8 +20,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_login_menu_card"
-                android:tint="?attr/colorBlack" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"cards-blank.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_slots_manage.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/dock_no_key"/>
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"slot.svg"}'/>
 
             <TextView
                 android:layout_width="match_parent"
@@ -69,7 +69,8 @@
                 android:id="@+id/loading_tip"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="?attr/colorWhite"
+                android:background="?attr/colorContainerBg"
+                android:textColor="?attr/colorTextPrimary"
                 app:i18nKey='@{"loading_device"}'
                 android:textSize="@dimen/common_text_size_big"
                 android:textStyle="bold"

app/src/main/res/layout/fragment_sop_manage.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"ballot.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_user_info.xml

@@ -7,7 +7,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -21,7 +20,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"chalkboard-user.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_user_manage.xml

@@ -19,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src='@{"user.svg"}' />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"user.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_workflow_manage.xml

@@ -6,7 +6,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -20,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_workflow_setting" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"workflow-alt.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_workflow_setting.xml

@@ -7,7 +7,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -22,7 +21,7 @@
                 android:id="@+id/preview_step_iv"
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary" />
 
             <TextView
                 android:id="@+id/preview_step_title"
@@ -39,12 +38,14 @@
                 android:layout_height="match_parent"
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:scaleType="fitXY"
+                android:tint="?attr/colorPrimary"
                 android:src="@mipmap/icon_title_arrow_divider" />
 
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_workflow_setting" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"workflow-alt.svg"}' />
 
             <TextView
                 android:layout_width="wrap_content"

app/src/main/res/layout/fragment_workstation_manage.xml

@@ -19,7 +19,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src='@{"land-location.svg"}' />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"land-location.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/item_home_menu.xml

@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <LinearLayout
-        android:layout_width="@dimen/home_menu_width"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:orientation="vertical"

app/src/main/res/layout/item_home_quick_entrance.xml

@@ -21,6 +21,7 @@
                 android:id="@+id/home_menu_iv"
                 android:layout_width="@dimen/home_item_quick_entrance_iv"
                 android:layout_height="@dimen/home_item_quick_entrance_iv"
+                android:tint="?attr/colorPrimary"
                 android:layout_gravity="center" />
         </cn.bingoogolapple.badgeview.BGABadgeFrameLayout>
 

app/src/main/res/layout/item_quick_entrance_not_config.xml

@@ -20,6 +20,7 @@
                 android:id="@+id/home_menu_iv"
                 android:layout_width="@dimen/home_item_quick_entrance_iv"
                 android:layout_height="@dimen/home_item_quick_entrance_iv"
+                android:tint="?attr/colorPrimary"
                 android:layout_gravity="center" />
 
             <ImageView

app/src/main/res/values/dimens.xml

@@ -86,5 +86,4 @@
     <dimen name="item_locker_group_min_width">100dp</dimen>
     <dimen name="locker_item_min_height">50dp</dimen>
     <dimen name="common_badge_icon_size">15dp</dimen>
-    <dimen name="home_menu_width">85dp</dimen>
 </resources>

app/src/main/res/values/styles.xml

@@ -4,7 +4,7 @@
     <style name="TableCellKey">
         <item name="android:padding">@dimen/common_spacing</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:textColor">?attr/colorBlack</item>
+        <item name="android:textColor">?attr/colorTextPrimary</item>
         <item name="android:textSize">@dimen/common_text_size</item>
         <item name="android:gravity">center_vertical|right</item>
         <item name="android:layout_height">match_parent</item>
@@ -18,7 +18,7 @@
 
     <style name="TableCellValue">
         <item name="android:padding">@dimen/common_spacing</item>
-        <item name="android:textColor">?attr/colorBlack</item>
+        <item name="android:textColor">?attr/colorTextPrimary</item>
         <item name="android:textSize">@dimen/common_text_size</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:layout_height">match_parent</item>

ui-base/src/main/java/com/grkj/ui_base/skin/databinding/SkinIconExtension.kt

@@ -13,7 +13,9 @@ import coil.decode.SvgDecoder
 import coil.request.ImageRequest
 import com.grkj.ui_base.R
 import com.grkj.ui_base.skin.*
+import com.sik.sikcore.SIKCore
 import java.io.File
+import kotlin.math.log
 
 // 全局 ImageLoader（含 SvgDecoder），避免每次 new
 private fun svgImageLoader(view: ImageView): ImageLoader =
@@ -39,7 +41,7 @@ private fun svgImageLoader(view: ImageView): ImageLoader =
  *   app:skinPlaceholder='@{@drawable/ic_home_fallback}' />
  */
 @BindingAdapter(
-    value = ["android:src", "skinTheme", "skinDefaultAssetsBase", "skinPlaceholder", "skinTint"],
+    value = ["skinSrc", "skinTheme", "skinDefaultAssetsBase", "skinPlaceholder", "skinTint"],
     requireAll = false
 )
 fun bindSkinIcon(
@@ -54,50 +56,17 @@ fun bindSkinIcon(
     tint?.let { ImageViewCompat.setImageTintList(view, it) }
 
     if (logicalPath.isNullOrBlank()) {
-        if (placeholderRes != null) view.setImageResource(placeholderRes) else view.setImageDrawable(null)
+        if (placeholderRes != null) view.setImageResource(placeholderRes) else view.setImageDrawable(
+            null
+        )
         return
     }
-
-    val app = (view.context.applicationContext as? Application)
-
-    // 1) 选主题：优先入参，其次当前皮肤，否则 null（走 assets）
-    val theme = themeSpec ?: run {
-        val skin = app?.let { SkinManager.currentSkin(it) }
-        when {
-            skin?.iconBaseTreeUri != null ->
-                ThemeSpec(skin.skinName, IconBase.Saf(Uri.parse(skin.iconBaseTreeUri)))
-            skin?.iconBasePath != null ->
-                ThemeSpec(skin.skinName, IconBase.FilePath(File(skin.iconBasePath)))
-            else -> null
-        }
-    }
-
-    // 2) 解析实际 Uri（支持 SAF / File / Assets）
-    val uri: Uri? = when {
-        app == null -> null
-        theme != null -> SkinIcons.resolveIconUri(app, theme, logicalPath)
-        !defaultAssetsBase.isNullOrBlank() -> {
-            // 走内置 assets
-            val clean = listOf(defaultAssetsBase.trim('/'), logicalPath.trim('/'))
-                .filter { it.isNotEmpty() }
-                .joinToString("/")
-            Uri.parse("file:///android_asset/$clean")
-        }
-        else -> null
-    }
-
-    // 3) Coil 加载（含 SVG 支持）
-    val req = ImageRequest.Builder(view.context)
-        .data(uri ?: placeholderRes)
-        .target(view)
-        .allowHardware(false)
-        .apply {
-            if (placeholderRes != null) {
-                placeholder(placeholderRes)
-                error(placeholderRes)
-            }
-        }
-        .build()
-
-    svgImageLoader(view).enqueue(req)
+    val app = (view.context.applicationContext as? Application)?: SIKCore.getApplication()
+    view.loadSkinIcon(
+        logicalPath = logicalPath,
+        app = app,
+        theme = themeSpec,
+        placeholderRes = placeholderRes,
+        defaultAssetsBase = defaultAssetsBase?:"themes/Default/icons"
+    )
 }

ui-base/src/main/res/drawable/common_layout_bg.xml

@@ -3,7 +3,7 @@
     android:shape="rectangle">
     <stroke
         android:width="@dimen/iscs_stroke_sm"
-        android:color="?attr/colorBlack" />
-    <solid android:color="?attr/colorWhite20" />
+        android:color="?attr/colorBgStroke" />
+    <solid android:color="?attr/colorSecBg" />
     <corners android:radius="@dimen/iscs_radius_xs" />
 </shape>