소스 검색

修改护理项颜色异常值报错问题

weizhengliang 1 년 전
부모
커밋
ee971e1ec7

+ 4 - 1
android_bed/src/main/h7_3128/java/com/wdkl/app/ncs/callingbed/adapter/NurseConfigAdapter.kt

@@ -10,6 +10,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.ncs.android.middleware.model.dto.NurseConfigDto
+import com.wdkl.ncs.android.middleware.utils.StringUtil
 import java.lang.Exception
 
 class NurseConfigAdapter : RecyclerView.Adapter<NurseConfigAdapter.ViewHolder> {
@@ -30,9 +31,11 @@ class NurseConfigAdapter : RecyclerView.Adapter<NurseConfigAdapter.ViewHolder> {
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         try {
-            holder.nurseItem.setBackgroundColor(Color.parseColor("#"+data.get(position).nurseColorRbg))
             holder.nurseName.setText(data.get(position).nurseConfigName)
             holder.nurseValue.setText(data.get(position).nurseOptionName)
+            if (StringUtil.notEmpty(data.get(position).nurseColorRbg)) {
+                holder.nurseItem.setBackgroundColor(Color.parseColor("#" + data.get(position).nurseColorRbg))
+            }
         } catch (e: Exception) {
             e.printStackTrace()
         }

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

@@ -164,47 +164,51 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainView2LayoutBinding>(
     }
 
     private fun updateMoreConfigs(data: List<NurseConfigDto>) {
-        if (data.size > 5) {
-            ll_nurse_more.visibility = View.VISIBLE
-            if (data.size == 6) {
-                if (!TextUtils.isEmpty(data[5].nurseColorRbg)) {
-                    ll_nurse_item6.setBackgroundColor(Color.parseColor("#" + data[5].nurseColorRbg))
+        try {
+            if (data.size > 5) {
+                ll_nurse_more.visibility = View.VISIBLE
+                if (data.size == 6) {
+                    if (StringUtil.notEmpty(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) {
+                    if (StringUtil.notEmpty(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
+
+                    if (StringUtil.notEmpty(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) {
+                    if (StringUtil.notEmpty(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
+
+                    if (StringUtil.notEmpty(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
+
+                    if (StringUtil.notEmpty(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
                 }
-                tv_nurse_name6.text = data[5].nurseConfigName
-                tv_nurse_value6.text = data[5].nurseOptionName
-            } else if (data.size == 7) {
-                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
-
-                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) {
-                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
-
-                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
-
-                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
+            } else {
+                ll_nurse_more.visibility = View.GONE
             }
-        } else {
-            ll_nurse_more.visibility = View.GONE
+        } catch (ex: Exception) {
+            ex.printStackTrace()
         }
     }
 

+ 4 - 0
middleware/src/main/code/com/wdkl/ncs/android/middleware/utils/StringUtil.java

@@ -7,4 +7,8 @@ public class StringUtil {
     public static String getResString(int resId) {
         return BaseApplication.appContext.getString(resId);
     }
+
+    public static boolean notEmpty(String str) {
+        return str != null && str.length() > 0 && !str.equalsIgnoreCase("null");
+    }
 }