护理项显示最多增加到8项

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivity.kt

@@ -140,7 +140,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
     }
 
     override fun getLayId(): Int {
-        return R.layout.callingbed_main_lay;
+        return R.layout.callingbed_main_lay
     }
 
     override fun bindDagger() {
@@ -684,9 +684,9 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
             for ((index, e) in list.withIndex()) {
                 if (index < configList.size) {
                     configList.set(index, e)
-                } else {
+                } /*else {
                     configList.add(e)
-                }
+                }*/
             }
             nurseConfigAdpter.updateData(configList)
             //护理灯刷新

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/adapter/NurseConfigAdpter.kt

@@ -6,6 +6,7 @@ import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.LinearLayout
 import android.widget.TextView
 import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.ncs.android.middleware.model.dto.NurseConfigDto
@@ -29,7 +30,7 @@ class NurseConfigAdpter : RecyclerView.Adapter<NurseConfigAdpter.ViewHolder> {
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         try {
-            holder.nurseColor.setBackgroundColor(Color.parseColor("#"+data.get(position).nurseColorRbg))
+            holder.nurseItem.setBackgroundColor(Color.parseColor("#"+data.get(position).nurseColorRbg))
             holder.nurseName.setText(data.get(position).nurseConfigName)
             holder.nurseValue.setText(data.get(position).nurseOptionName)
         } catch (e: Exception) {
@@ -47,14 +48,16 @@ class NurseConfigAdpter : RecyclerView.Adapter<NurseConfigAdpter.ViewHolder> {
     }
 
     class ViewHolder: RecyclerView.ViewHolder {
-        var nurseColor : TextView
+        //var nurseColor : TextView
         var nurseName : TextView
         var nurseValue : TextView
+        var nurseItem : LinearLayout
 
         constructor(itemView: View): super(itemView) {
-            nurseColor = itemView.findViewById(R.id.tv_nurse_color)
+            //nurseColor = itemView.findViewById(R.id.tv_nurse_color)
             nurseName = itemView.findViewById(R.id.tv_nurse_config_name)
             nurseValue = itemView.findViewById(R.id.tv_nurse_config_value)
+            nurseItem = itemView.findViewById(R.id.ll_nurse_item)
         }
     }
 }

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/MainFragment.kt

@@ -1,6 +1,7 @@
 package com.wdkl.app.ncs.callingbed.fragment
 
 import android.content.Intent
+import android.graphics.Color
 import android.text.TextUtils
 import android.util.Log
 import android.view.View
@@ -20,6 +21,7 @@ import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.common.MessageEvent
 import com.wdkl.ncs.android.middleware.logic.contract.callingbed.MainFragmentContract
 import com.wdkl.ncs.android.middleware.logic.presenter.callingbed.MainFragmentPresenter
+import com.wdkl.ncs.android.middleware.model.dto.NurseConfigDto
 import com.wdkl.ncs.android.middleware.model.vo.CustomerInfoVO
 import com.wdkl.ncs.android.middleware.utils.StringUtil
 import kotlinx.android.synthetic.main.main_view.*
@@ -106,6 +108,7 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
             AppTool.Time.delay(1800) {
                 if (activity != null) {
                     (activity as CallingbedActivity).updateNurseConfig(customInfo.list)
+                    updateMoreConfigs(customInfo.list)
                 }
             }
         }
@@ -154,6 +157,36 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
         tv_version.text = "V"+BuildConfig.VERSION_NAME+"_"+BuildConfig.VERSION_CODE
     }
 
+    private fun updateMoreConfigs(data: List<NurseConfigDto>) {
+        if (data.size > 5) {
+            ll_nurse_more.visibility = View.VISIBLE
+            if (data.size == 6) {
+                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))
+                tv_nurse_name6.text = data[5].nurseConfigName
+                tv_nurse_value6.text = data[5].nurseOptionName
+                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))
+                tv_nurse_name6.text = data[5].nurseConfigName
+                tv_nurse_value6.text = data[5].nurseOptionName
+                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))
+                tv_nurse_name8.text = data[7].nurseConfigName
+                tv_nurse_value8.text = data[7].nurseOptionName
+            }
+        } else {
+            ll_nurse_more.visibility = View.GONE
+        }
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
         when (messageEvent.getType()) {

callingbed/src/main/res/layout/callingbed_main_lay.xml

@@ -11,12 +11,12 @@
 
         <LinearLayout
             android:id="@+id/rl_left_view"
-            android:layout_width="220dp"
+            android:layout_width="188dp"
             android:layout_height="match_parent"
             android:layout_below="@id/activity_calling_bed_layout_title"
             android:layout_marginTop="4dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp">
+            android:paddingLeft="4dp"
+            android:paddingRight="4dp">
 
             <!--左侧护理列表-->
             <android.support.v7.widget.RecyclerView

callingbed/src/main/res/layout/item_nurse_config.xml

@@ -1,38 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ll_nurse_item"
     android:layout_width="match_parent"
     android:layout_height="80dp"
     android:layout_marginTop="6dp"
-    android:background="@color/white">
+    android:background="#E7E7E7"
+    android:orientation="vertical">
 
-    <TextView
+    <!--<TextView
         android:id="@+id/tv_nurse_color"
         android:layout_width="8dp"
         android:layout_height="match_parent"
-        android:background="@color/main_color"/>
+        android:background="@color/main_color"/>-->
 
     <TextView
         android:id="@+id/tv_nurse_config_name"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
         android:layout_weight="1"
         android:paddingLeft="6dp"
         android:paddingTop="6dp"
+        android:singleLine="true"
+        android:ellipsize="end"
         android:text="@string/default_nurse_config_name"
         android:textSize="20sp"
-        android:textColor="#B4B4B4"/>
+        android:textColor="@color/white"/>
 
     <TextView
         android:id="@+id/tv_nurse_config_value"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
         android:layout_weight="1"
         android:paddingRight="6dp"
         android:paddingBottom="6dp"
+        android:singleLine="true"
+        android:ellipsize="end"
         android:gravity="right|bottom"
         android:text="@string/str_empty"
-        android:textSize="24sp"
-        android:textColor="@color/main_color"/>
+        android:textSize="22sp"
+        android:textColor="@color/white"/>
 
 </LinearLayout>

callingbed/src/main/res/layout/main_view.xml

@@ -122,10 +122,126 @@
                 android:id="@+id/ll_custom_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="16dp"
+                android:paddingTop="10dp"
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
                 android:background="@color/white"
                 android:orientation="vertical"
                 android:visibility="gone">
+
+                <LinearLayout
+                    android:id="@+id/ll_nurse_more"
+                    android:layout_width="match_parent"
+                    android:layout_height="80dp"
+                    android:layout_marginTop="6dp"
+                    android:layout_alignParentBottom="true"
+                    android:gravity="center_horizontal"
+                    android:visibility="gone">
+                    <LinearLayout
+                        android:id="@+id/ll_nurse_item6"
+                        android:layout_width="140dp"
+                        android:layout_height="match_parent"
+                        android:background="#E7E7E7"
+                        android:orientation="vertical">
+                        <TextView
+                            android:id="@+id/tv_nurse_name6"
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1"
+                            android:paddingLeft="6dp"
+                            android:paddingTop="6dp"
+                            android:singleLine="true"
+                            android:ellipsize="end"
+                            android:text="@string/default_nurse_config_name"
+                            android:textSize="20sp"
+                            android:textColor="@color/white"/>
+
+                        <TextView
+                            android:id="@+id/tv_nurse_value6"
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1"
+                            android:paddingRight="6dp"
+                            android:paddingBottom="6dp"
+                            android:singleLine="true"
+                            android:ellipsize="end"
+                            android:gravity="right|bottom"
+                            android:text="@string/str_empty"
+                            android:textSize="22sp"
+                            android:textColor="@color/white"/>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/ll_nurse_item7"
+                        android:layout_width="140dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="10dp"
+                        android:background="#E7E7E7"
+                        android:orientation="vertical">
+                        <TextView
+                            android:id="@+id/tv_nurse_name7"
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1"
+                            android:paddingLeft="6dp"
+                            android:paddingTop="6dp"
+                            android:singleLine="true"
+                            android:ellipsize="end"
+                            android:text="@string/default_nurse_config_name"
+                            android:textSize="20sp"
+                            android:textColor="@color/white"/>
+
+                        <TextView
+                            android:id="@+id/tv_nurse_value7"
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1"
+                            android:paddingRight="6dp"
+                            android:paddingBottom="6dp"
+                            android:singleLine="true"
+                            android:ellipsize="end"
+                            android:gravity="right|bottom"
+                            android:text="@string/str_empty"
+                            android:textSize="22sp"
+                            android:textColor="@color/white"/>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/ll_nurse_item8"
+                        android:layout_width="140dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="10dp"
+                        android:background="#E7E7E7"
+                        android:orientation="vertical">
+                        <TextView
+                            android:id="@+id/tv_nurse_name8"
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1"
+                            android:paddingLeft="6dp"
+                            android:paddingTop="6dp"
+                            android:singleLine="true"
+                            android:ellipsize="end"
+                            android:text="@string/default_nurse_config_name"
+                            android:textSize="20sp"
+                            android:textColor="@color/white"/>
+
+                        <TextView
+                            android:id="@+id/tv_nurse_value8"
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1"
+                            android:paddingRight="6dp"
+                            android:paddingBottom="6dp"
+                            android:singleLine="true"
+                            android:ellipsize="end"
+                            android:gravity="right|bottom"
+                            android:text="@string/str_empty"
+                            android:textSize="22sp"
+                            android:textColor="@color/white"/>
+                    </LinearLayout>
+                </LinearLayout>
+
                 <TextView
                     android:id="@+id/tv_custom_name"
                     android:layout_width="wrap_content"
@@ -157,11 +273,11 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/tv_custom_name"
-                    android:layout_marginTop="20dp"
+                    android:layout_marginTop="10dp"
                     android:textSize="28sp"
                     android:textColor="#B4B4B4"
                     android:text="@string/indate"/>
-                <TextView
+                <!--<TextView
                     android:id="@+id/tv_order_title"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -173,12 +289,14 @@
                     android:drawablePadding="10dp"
                     android:textSize="24sp"
                     android:textColor="@color/black"
-                    android:text=""/>
+                    android:text=""/>-->
                 <com.wdkl.ncs.android.lib.widget.MarqueeTextView
                     android:id="@+id/tv_order_content"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/tv_order_title"
+                    android:layout_height="match_parent"
+                    android:layout_below="@id/tv_custom_indate"
+                    android:layout_above="@id/ll_nurse_more"
+                    android:layout_marginTop="8dp"
                     android:padding="10dp"
                     android:ellipsize="marquee"
                     android:focusable="true"