修改护理项超出宽度后无法自动滚动问题

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

@@ -9,12 +9,14 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.graphics.Color
 import android.net.ConnectivityManager
 import android.os.*
 import android.support.v4.app.Fragment
 import android.support.v7.widget.LinearLayoutManager
 import android.text.TextUtils
 import android.util.Log
+import android.view.Gravity
 import android.view.View
 import android.view.animation.AnimationUtils
 import com.alibaba.fastjson.JSON
@@ -103,8 +105,8 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
     //一定时间无操作返回主界面
     private var backTimeout = 0
 
-    private lateinit var linearLayout : LinearLayoutManager
-    private lateinit var nurseConfigAdapter : NurseConfigAdapter
+    //private lateinit var linearLayout : LinearLayoutManager
+    //private lateinit var nurseConfigAdapter : NurseConfigAdapter
     private var configList = ArrayList<NurseConfigDto>()
     private var sipServiceRunning :Boolean = false
     private var initialized :Boolean = false
@@ -393,17 +395,17 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
     private fun initNurseConfig() {
         //初始化默认护理项
         for (index in 1..5) {
-            var item = NurseConfigDto()
+            val item = NurseConfigDto()
             item.nurseConfigName = "护理"
             item.nurseOptionName = "暂无"
             item.nurseColorRbg = ""
             configList.add(item)
         }
 
-        linearLayout = LinearLayoutManager(activity)
-        nurseConfigAdapter = NurseConfigAdapter(activity, configList)
-        rv_left_list.layoutManager = linearLayout
-        rv_left_list.adapter = nurseConfigAdapter
+        //linearLayout = LinearLayoutManager(activity)
+        //nurseConfigAdapter = NurseConfigAdapter(activity, configList)
+        //rv_left_list.layoutManager = linearLayout
+        //rv_left_list.adapter = nurseConfigAdapter
     }
 
     //数据加载错误
@@ -646,7 +648,109 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
                     configList.add(e)
                 }*/
             }
-            nurseConfigAdapter.updateData(configList)
+            //nurseConfigAdapter.updateData(configList)
+
+            try {
+                if (Constant.boolDisplayNcTitle == 0) {
+                    //隐藏护理名称
+                    tv_nurse_config_name1.visibility = View.GONE
+                    tv_nurse_config_value1.textSize = 36f
+                    tv_nurse_config_name2.visibility = View.GONE
+                    tv_nurse_config_value2.textSize = 36f
+                    tv_nurse_config_name3.visibility = View.GONE
+                    tv_nurse_config_value3.textSize = 36f
+                    tv_nurse_config_name4.visibility = View.GONE
+                    tv_nurse_config_value4.textSize = 36f
+                    tv_nurse_config_name5.visibility = View.GONE
+                    tv_nurse_config_value5.textSize = 36f
+                } else {
+                    //显示护理名称
+                    tv_nurse_config_name1.visibility = View.VISIBLE
+                    tv_nurse_config_value1.textSize = 28f
+                    tv_nurse_config_name2.visibility = View.VISIBLE
+                    tv_nurse_config_value2.textSize = 28f
+                    tv_nurse_config_name3.visibility = View.VISIBLE
+                    tv_nurse_config_value3.textSize = 28f
+                    tv_nurse_config_name4.visibility = View.VISIBLE
+                    tv_nurse_config_value4.textSize = 28f
+                    tv_nurse_config_name5.visibility = View.VISIBLE
+                    tv_nurse_config_value5.textSize = 28f
+                }
+
+                tv_nurse_config_name1.setText(configList.get(0).nurseConfigName)
+                tv_nurse_config_value1.setText(configList.get(0).nurseOptionName)
+                tv_nurse_config_name2.setText(configList.get(1).nurseConfigName)
+                tv_nurse_config_value2.setText(configList.get(1).nurseOptionName)
+                tv_nurse_config_name3.setText(configList.get(2).nurseConfigName)
+                tv_nurse_config_value3.setText(configList.get(2).nurseOptionName)
+                tv_nurse_config_name4.setText(configList.get(3).nurseConfigName)
+                tv_nurse_config_value4.setText(configList.get(3).nurseOptionName)
+                tv_nurse_config_name5.setText(configList.get(4).nurseConfigName)
+                tv_nurse_config_value5.setText(configList.get(4).nurseOptionName)
+
+                //护理项1
+                var color = configList[0].nurseColorRbg
+                if (TextUtils.isEmpty(configList.get(0).nurseOptionName)) {
+                    ll_nurse_item1.setBackgroundColor(Color.parseColor("#E7E7E7"))
+                } else {
+                    if (TextUtils.isEmpty(color)) {
+                        ll_nurse_item1.setBackgroundColor(Color.parseColor("#E7E7E7"))
+                    } else {
+                        ll_nurse_item1.setBackgroundColor(Color.parseColor("#$color"))
+                    }
+                }
+
+                //护理项2
+                color = configList[1].nurseColorRbg
+                if (TextUtils.isEmpty(configList.get(1).nurseOptionName)) {
+                    ll_nurse_item2.setBackgroundColor(Color.parseColor("#E7E7E7"))
+                } else {
+                    if (TextUtils.isEmpty(color)) {
+                        ll_nurse_item2.setBackgroundColor(Color.parseColor("#E7E7E7"))
+                    } else {
+                        ll_nurse_item2.setBackgroundColor(Color.parseColor("#$color"))
+                    }
+                }
+
+                //护理项3
+                color = configList[2].nurseColorRbg
+                if (TextUtils.isEmpty(configList.get(2).nurseOptionName)) {
+                    ll_nurse_item3.setBackgroundColor(Color.parseColor("#E7E7E7"))
+                } else {
+                    if (TextUtils.isEmpty(color)) {
+                        ll_nurse_item3.setBackgroundColor(Color.parseColor("#E7E7E7"))
+                    } else {
+                        ll_nurse_item3.setBackgroundColor(Color.parseColor("#$color"))
+                    }
+                }
+
+                //护理项4
+                color = configList[3].nurseColorRbg
+                if (TextUtils.isEmpty(configList.get(3).nurseOptionName)) {
+                    ll_nurse_item4.setBackgroundColor(Color.parseColor("#E7E7E7"))
+                } else {
+                    if (TextUtils.isEmpty(color)) {
+                        ll_nurse_item4.setBackgroundColor(Color.parseColor("#E7E7E7"))
+                    } else {
+                        ll_nurse_item4.setBackgroundColor(Color.parseColor("#$color"))
+                    }
+                }
+
+                //护理项5
+                color = configList[4].nurseColorRbg
+                if (TextUtils.isEmpty(configList.get(4).nurseOptionName)) {
+                    ll_nurse_item5.setBackgroundColor(Color.parseColor("#E7E7E7"))
+                } else {
+                    if (TextUtils.isEmpty(color)) {
+                        ll_nurse_item5.setBackgroundColor(Color.parseColor("#E7E7E7"))
+                    } else {
+                        ll_nurse_item5.setBackgroundColor(Color.parseColor("#$color"))
+                    }
+                }
+            } catch (ex: Exception) {
+                ex.printStackTrace()
+            }
+
             //护理灯刷新
             hasNurseValue = true
             if (Constant.day_state == 0) {

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

@@ -16,13 +16,179 @@
             android:layout_below="@id/activity_calling_bed_layout_title"
             android:layout_marginTop="4dp"
             android:paddingLeft="4dp"
-            android:paddingRight="4dp">
+            android:paddingRight="4dp"
+            android:orientation="vertical">
 
             <!--左侧护理列表-->
-            <android.support.v7.widget.RecyclerView
+            <!--<android.support.v7.widget.RecyclerView
                 android:id="@+id/rv_left_list"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent" />-->
+
+            <LinearLayout
+                android:id="@+id/ll_nurse_item1"
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:layout_marginTop="6dp"
+                android:padding="6dp"
+                android:background="#E7E7E7"
+                android:orientation="vertical">
+                <TextView
+                    android:id="@+id/tv_nurse_config_name1"
+                    android:layout_width="match_parent"
+                    android:layout_height="32dp"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    android:text="@string/default_nurse_config_name"
+                    android:textSize="20sp"
+                    android:textColor="@color/white" />
+
+                <com.wdkl.ncs.android.lib.widget.MarqueeTextView
+                    android:id="@+id/tv_nurse_config_value1"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:ellipsize="marquee"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:marqueeRepeatLimit="-1"
+                    android:singleLine="true"
+                    android:text="@string/str_empty"
+                    android:textSize="28sp"
+                    android:textColor="@color/white"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_nurse_item2"
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:layout_marginTop="6dp"
+                android:padding="6dp"
+                android:background="#E7E7E7"
+                android:orientation="vertical">
+                <TextView
+                    android:id="@+id/tv_nurse_config_name2"
+                    android:layout_width="match_parent"
+                    android:layout_height="32dp"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    android:text="@string/default_nurse_config_name"
+                    android:textSize="20sp"
+                    android:textColor="@color/white"/>
+
+                <com.wdkl.ncs.android.lib.widget.MarqueeTextView
+                    android:id="@+id/tv_nurse_config_value2"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:ellipsize="marquee"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:marqueeRepeatLimit="-1"
+                    android:singleLine="true"
+                    android:text="@string/str_empty"
+                    android:textSize="28sp"
+                    android:textColor="@color/white"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_nurse_item3"
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:layout_marginTop="6dp"
+                android:padding="6dp"
+                android:background="#E7E7E7"
+                android:orientation="vertical">
+                <TextView
+                    android:id="@+id/tv_nurse_config_name3"
+                    android:layout_width="match_parent"
+                    android:layout_height="32dp"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    android:text="@string/default_nurse_config_name"
+                    android:textSize="20sp"
+                    android:textColor="@color/white"/>
+
+                <com.wdkl.ncs.android.lib.widget.MarqueeTextView
+                    android:id="@+id/tv_nurse_config_value3"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:ellipsize="marquee"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:marqueeRepeatLimit="-1"
+                    android:singleLine="true"
+                    android:text="@string/str_empty"
+                    android:textSize="28sp"
+                    android:textColor="@color/white"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_nurse_item4"
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:layout_marginTop="6dp"
+                android:padding="6dp"
+                android:background="#E7E7E7"
+                android:orientation="vertical">
+                <TextView
+                    android:id="@+id/tv_nurse_config_name4"
+                    android:layout_width="match_parent"
+                    android:layout_height="32dp"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    android:text="@string/default_nurse_config_name"
+                    android:textSize="20sp"
+                    android:textColor="@color/white"/>
+
+                <com.wdkl.ncs.android.lib.widget.MarqueeTextView
+                    android:id="@+id/tv_nurse_config_value4"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:ellipsize="marquee"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:marqueeRepeatLimit="-1"
+                    android:singleLine="true"
+                    android:text="@string/str_empty"
+                    android:textSize="28sp"
+                    android:textColor="@color/white"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_nurse_item5"
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:layout_marginTop="6dp"
+                android:padding="6dp"
+                android:background="#E7E7E7"
+                android:orientation="vertical">
+                <TextView
+                    android:id="@+id/tv_nurse_config_name5"
+                    android:layout_width="match_parent"
+                    android:layout_height="32dp"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    android:text="@string/default_nurse_config_name"
+                    android:textSize="20sp"
+                    android:textColor="@color/white"/>
+
+                <com.wdkl.ncs.android.lib.widget.MarqueeTextView
+                    android:id="@+id/tv_nurse_config_value5"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:ellipsize="marquee"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:marqueeRepeatLimit="-1"
+                    android:singleLine="true"
+                    android:text="@string/str_empty"
+                    android:textSize="28sp"
+                    android:textColor="@color/white"/>
+            </LinearLayout>
 
         </LinearLayout>