Forráskód Böngészése

修改护理项颜色值为空时导致app崩溃问题

weizhengliang 2 éve
szülő
commit
80cfabc29e

+ 21 - 6
android_bed/src/main/h10_w_yld/java/com/wdkl/app/ncs/callingbed/fragment/MainFragment.kt

@@ -161,24 +161,39 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainView2LayoutBinding>(
         if (data.size > 5) {
             ll_nurse_more.visibility = View.VISIBLE
             if (data.size == 6) {
-                ll_nurse_item6.setBackgroundColor(Color.parseColor("#"+data[5].nurseColorRbg))
+                if (!TextUtils.isEmpty(data[5].nurseColorRbg)) {
+                    ll_nurse_item6.setBackgroundColor(Color.parseColor("#" + data[5].nurseColorRbg))
+                }
                 tv_nurse_name6.text = data[5].nurseConfigName
                 tv_nurse_value6.text = data[5].nurseOptionName
             } else if (data.size == 7) {
-                ll_nurse_item6.setBackgroundColor(Color.parseColor("#"+data[5].nurseColorRbg))
+                if (!TextUtils.isEmpty(data[5].nurseColorRbg)) {
+                    ll_nurse_item6.setBackgroundColor(Color.parseColor("#" + data[5].nurseColorRbg))
+                }
                 tv_nurse_name6.text = data[5].nurseConfigName
                 tv_nurse_value6.text = data[5].nurseOptionName
-                ll_nurse_item7.setBackgroundColor(Color.parseColor("#"+data[6].nurseColorRbg))
+
+                if (!TextUtils.isEmpty(data[6].nurseColorRbg)) {
+                    ll_nurse_item7.setBackgroundColor(Color.parseColor("#" + data[6].nurseColorRbg))
+                }
                 tv_nurse_name7.text = data[6].nurseConfigName
                 tv_nurse_value7.text = data[6].nurseOptionName
             } else if (data.size >= 8) {
-                ll_nurse_item6.setBackgroundColor(Color.parseColor("#"+data[5].nurseColorRbg))
+                if (!TextUtils.isEmpty(data[5].nurseColorRbg)) {
+                    ll_nurse_item6.setBackgroundColor(Color.parseColor("#" + data[5].nurseColorRbg))
+                }
                 tv_nurse_name6.text = data[5].nurseConfigName
                 tv_nurse_value6.text = data[5].nurseOptionName
-                ll_nurse_item7.setBackgroundColor(Color.parseColor("#"+data[6].nurseColorRbg))
+
+                if (!TextUtils.isEmpty(data[6].nurseColorRbg)) {
+                    ll_nurse_item7.setBackgroundColor(Color.parseColor("#" + data[6].nurseColorRbg))
+                }
                 tv_nurse_name7.text = data[6].nurseConfigName
                 tv_nurse_value7.text = data[6].nurseOptionName
-                ll_nurse_item8.setBackgroundColor(Color.parseColor("#"+data[7].nurseColorRbg))
+
+                if (!TextUtils.isEmpty(data[7].nurseColorRbg)) {
+                    ll_nurse_item8.setBackgroundColor(Color.parseColor("#" + data[7].nurseColorRbg))
+                }
                 tv_nurse_name8.text = data[7].nurseConfigName
                 tv_nurse_value8.text = data[7].nurseOptionName
             }

+ 21 - 6
android_bed/src/main/h5_3128/java/com/wdkl/app/ncs/callingbed/fragment/MainFragment.kt

@@ -164,24 +164,39 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
         if (data.size > 5) {
             ll_nurse_more.visibility = View.VISIBLE
             if (data.size == 6) {
-                ll_nurse_item6.setBackgroundColor(Color.parseColor("#"+data[5].nurseColorRbg))
+                if (!TextUtils.isEmpty(data[5].nurseColorRbg)) {
+                    ll_nurse_item6.setBackgroundColor(Color.parseColor("#" + data[5].nurseColorRbg))
+                }
                 tv_nurse_name6.text = data[5].nurseConfigName
                 tv_nurse_value6.text = data[5].nurseOptionName
             } else if (data.size == 7) {
-                ll_nurse_item6.setBackgroundColor(Color.parseColor("#"+data[5].nurseColorRbg))
+                if (!TextUtils.isEmpty(data[5].nurseColorRbg)) {
+                    ll_nurse_item6.setBackgroundColor(Color.parseColor("#" + data[5].nurseColorRbg))
+                }
                 tv_nurse_name6.text = data[5].nurseConfigName
                 tv_nurse_value6.text = data[5].nurseOptionName
-                ll_nurse_item7.setBackgroundColor(Color.parseColor("#"+data[6].nurseColorRbg))
+
+                if (!TextUtils.isEmpty(data[6].nurseColorRbg)) {
+                    ll_nurse_item7.setBackgroundColor(Color.parseColor("#" + data[6].nurseColorRbg))
+                }
                 tv_nurse_name7.text = data[6].nurseConfigName
                 tv_nurse_value7.text = data[6].nurseOptionName
             } else if (data.size >= 8) {
-                ll_nurse_item6.setBackgroundColor(Color.parseColor("#"+data[5].nurseColorRbg))
+                if (!TextUtils.isEmpty(data[5].nurseColorRbg)) {
+                    ll_nurse_item6.setBackgroundColor(Color.parseColor("#" + data[5].nurseColorRbg))
+                }
                 tv_nurse_name6.text = data[5].nurseConfigName
                 tv_nurse_value6.text = data[5].nurseOptionName
-                ll_nurse_item7.setBackgroundColor(Color.parseColor("#"+data[6].nurseColorRbg))
+
+                if (!TextUtils.isEmpty(data[6].nurseColorRbg)) {
+                    ll_nurse_item7.setBackgroundColor(Color.parseColor("#" + data[6].nurseColorRbg))
+                }
                 tv_nurse_name7.text = data[6].nurseConfigName
                 tv_nurse_value7.text = data[6].nurseOptionName
-                ll_nurse_item8.setBackgroundColor(Color.parseColor("#"+data[7].nurseColorRbg))
+
+                if (!TextUtils.isEmpty(data[7].nurseColorRbg)) {
+                    ll_nurse_item8.setBackgroundColor(Color.parseColor("#" + data[7].nurseColorRbg))
+                }
                 tv_nurse_name8.text = data[7].nurseConfigName
                 tv_nurse_value8.text = data[7].nurseOptionName
             }

+ 21 - 6
android_bed/src/main/h7_3128/java/com/wdkl/app/ncs/callingbed/fragment/MainFragment.kt

@@ -161,24 +161,39 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainView2LayoutBinding>(
         if (data.size > 5) {
             ll_nurse_more.visibility = View.VISIBLE
             if (data.size == 6) {
-                ll_nurse_item6.setBackgroundColor(Color.parseColor("#"+data[5].nurseColorRbg))
+                if (!TextUtils.isEmpty(data[5].nurseColorRbg)) {
+                    ll_nurse_item6.setBackgroundColor(Color.parseColor("#" + data[5].nurseColorRbg))
+                }
                 tv_nurse_name6.text = data[5].nurseConfigName
                 tv_nurse_value6.text = data[5].nurseOptionName
             } else if (data.size == 7) {
-                ll_nurse_item6.setBackgroundColor(Color.parseColor("#"+data[5].nurseColorRbg))
+                if (!TextUtils.isEmpty(data[5].nurseColorRbg)) {
+                    ll_nurse_item6.setBackgroundColor(Color.parseColor("#" + data[5].nurseColorRbg))
+                }
                 tv_nurse_name6.text = data[5].nurseConfigName
                 tv_nurse_value6.text = data[5].nurseOptionName
-                ll_nurse_item7.setBackgroundColor(Color.parseColor("#"+data[6].nurseColorRbg))
+
+                if (!TextUtils.isEmpty(data[6].nurseColorRbg)) {
+                    ll_nurse_item7.setBackgroundColor(Color.parseColor("#" + data[6].nurseColorRbg))
+                }
                 tv_nurse_name7.text = data[6].nurseConfigName
                 tv_nurse_value7.text = data[6].nurseOptionName
             } else if (data.size >= 8) {
-                ll_nurse_item6.setBackgroundColor(Color.parseColor("#"+data[5].nurseColorRbg))
+                if (!TextUtils.isEmpty(data[5].nurseColorRbg)) {
+                    ll_nurse_item6.setBackgroundColor(Color.parseColor("#" + data[5].nurseColorRbg))
+                }
                 tv_nurse_name6.text = data[5].nurseConfigName
                 tv_nurse_value6.text = data[5].nurseOptionName
-                ll_nurse_item7.setBackgroundColor(Color.parseColor("#"+data[6].nurseColorRbg))
+
+                if (!TextUtils.isEmpty(data[6].nurseColorRbg)) {
+                    ll_nurse_item7.setBackgroundColor(Color.parseColor("#" + data[6].nurseColorRbg))
+                }
                 tv_nurse_name7.text = data[6].nurseConfigName
                 tv_nurse_value7.text = data[6].nurseOptionName
-                ll_nurse_item8.setBackgroundColor(Color.parseColor("#"+data[7].nurseColorRbg))
+
+                if (!TextUtils.isEmpty(data[7].nurseColorRbg)) {
+                    ll_nurse_item8.setBackgroundColor(Color.parseColor("#" + data[7].nurseColorRbg))
+                }
                 tv_nurse_name8.text = data[7].nurseConfigName
                 tv_nurse_value8.text = data[7].nurseOptionName
             }