兼容新豪格10寸竖屏门口机

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivity.kt

@@ -204,6 +204,14 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
         if ("rk3128".equals(Build.MODEL)) {
             checkLaunch()
         }
+
+        val dm = resources.displayMetrics
+        Constant.DEVICE_WIDTH = dm.widthPixels
+        Constant.DEVICE_HEIGHT = dm.heightPixels
+        Constant.DEVICE_ORIENTATION = resources.configuration.orientation
+        //3288 15.6寸竖屏：width=1080, height=1920
+        //3288 10.1寸竖屏：width=800,  height=1280
+        Log.d(TAG, "device orientation: ${Constant.DEVICE_ORIENTATION}, width: ${dm.widthPixels}, height: ${dm.heightPixels}")
     }
 
     private fun checkAppExist() : Boolean {

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/adapter/FrameRoomAdapter.kt

@@ -61,8 +61,13 @@ class FrameRoomAdapter : RecyclerView.Adapter<FrameRoomAdapter.BedViewHolder> {
 
     override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): BedViewHolder {
         if ("rk3288".equals(Build.MODEL)) {
-            val view = LayoutInflater.from(parent?.context).inflate(R.layout.item_bed_rk3288, parent, false)
-            return BedViewHolder(view)
+            if (Constant.DEVICE_HEIGHT == 1280 && Constant.DEVICE_WIDTH == 800) {
+                val view = LayoutInflater.from(parent?.context).inflate(R.layout.item_bed_rk3288_800, parent, false)
+                return BedViewHolder(view)
+            } else {
+                val view = LayoutInflater.from(parent?.context).inflate(R.layout.item_bed_rk3288, parent, false)
+                return BedViewHolder(view)
+            }
         } else {
             val view = LayoutInflater.from(parent?.context).inflate(R.layout.item_bed, parent, false)
             return BedViewHolder(view)

callingdoor/src/main/res/layout/item_bed_rk3288_800.xml

@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="430dp"
+    android:layout_marginTop="10dp"
+    android:paddingLeft="32dp"
+    android:paddingRight="32dp"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/tv_bed_name_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:text="--床"
+        android:textColor="@color/main_color"
+        android:textSize="48sp"
+        android:background="#EAF2F9"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:baselineAligned="false">
+
+        <!--护理项-->
+        <LinearLayout
+            android:id="@+id/ll_nurse_configs"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="2"
+            android:baselineAligned="false"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/nurse_config_item_height_800"
+                android:layout_marginTop="10dp">
+                <View
+                    android:id="@+id/nurse_config_item_color1"
+                    android:layout_width="20dp"
+                    android:layout_height="match_parent"
+                    android:background="@color/nursing_default_color"/>
+                <TextView
+                    android:id="@+id/nurse_config_item_name1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@id/nurse_config_item_color1"
+                    android:paddingLeft="4dp"
+                    android:text="暂无"
+                    android:textColor="@color/text_name_color"
+                    android:textSize="20sp"/>
+                <TextView
+                    android:id="@+id/nurse_config_item_value1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@id/nurse_config_item_color1"
+                    android:layout_alignParentBottom="true"
+                    android:paddingRight="4dp"
+                    android:gravity="right"
+                    android:text="暂无"
+                    android:textColor="@color/main_color"
+                    android:textSize="22sp"/>
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/nurse_config_item_height_800"
+                android:layout_marginTop="16dp">
+                <View
+                    android:id="@+id/nurse_config_item_color2"
+                    android:layout_width="20dp"
+                    android:layout_height="match_parent"
+                    android:background="@color/nursing_default_color"/>
+                <TextView
+                    android:id="@+id/nurse_config_item_name2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@id/nurse_config_item_color2"
+                    android:paddingLeft="4dp"
+                    android:text="暂无"
+                    android:textColor="@color/text_name_color"
+                    android:textSize="20sp"/>
+                <TextView
+                    android:id="@+id/nurse_config_item_value2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@id/nurse_config_item_color2"
+                    android:layout_alignParentBottom="true"
+                    android:paddingRight="4dp"
+                    android:gravity="right"
+                    android:text="暂无"
+                    android:textColor="@color/main_color"
+                    android:textSize="22sp"/>
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/nurse_config_item_height_800"
+                android:layout_marginTop="16dp">
+                <View
+                    android:id="@+id/nurse_config_item_color3"
+                    android:layout_width="20dp"
+                    android:layout_height="match_parent"
+                    android:background="@color/nursing_default_color"/>
+                <TextView
+                    android:id="@+id/nurse_config_item_name3"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@id/nurse_config_item_color3"
+                    android:paddingLeft="4dp"
+                    android:text="暂无"
+                    android:textColor="@color/text_name_color"
+                    android:textSize="20sp"/>
+                <TextView
+                    android:id="@+id/nurse_config_item_value3"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@id/nurse_config_item_color3"
+                    android:layout_alignParentBottom="true"
+                    android:paddingRight="4dp"
+                    android:gravity="right"
+                    android:text="暂无"
+                    android:textColor="@color/main_color"
+                    android:textSize="22sp"/>
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/nurse_config_item_height_800"
+                android:layout_marginTop="16dp">
+                <View
+                    android:id="@+id/nurse_config_item_color4"
+                    android:layout_width="20dp"
+                    android:layout_height="match_parent"
+                    android:background="@color/nursing_default_color"/>
+                <TextView
+                    android:id="@+id/nurse_config_item_name4"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@id/nurse_config_item_color4"
+                    android:paddingLeft="4dp"
+                    android:text="暂无"
+                    android:textColor="@color/text_name_color"
+                    android:textSize="20sp"/>
+                <TextView
+                    android:id="@+id/nurse_config_item_value4"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@id/nurse_config_item_color4"
+                    android:layout_alignParentBottom="true"
+                    android:paddingRight="4dp"
+                    android:gravity="right"
+                    android:text="暂无"
+                    android:textColor="@color/main_color"
+                    android:textSize="22sp"/>
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/nurse_config_item_height_800"
+                android:layout_marginTop="16dp">
+                <View
+                    android:id="@+id/nurse_config_item_color5"
+                    android:layout_width="20dp"
+                    android:layout_height="match_parent"
+                    android:background="@color/nursing_default_color"/>
+                <TextView
+                    android:id="@+id/nurse_config_item_name5"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@id/nurse_config_item_color5"
+                    android:paddingLeft="4dp"
+                    android:text="暂无"
+                    android:textColor="@color/text_name_color"
+                    android:textSize="20sp"/>
+                <TextView
+                    android:id="@+id/nurse_config_item_value5"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@id/nurse_config_item_color5"
+                    android:layout_alignParentBottom="true"
+                    android:paddingRight="4dp"
+                    android:gravity="right"
+                    android:text="暂无"
+                    android:textColor="@color/main_color"
+                    android:textSize="22sp"/>
+            </RelativeLayout>
+
+        </LinearLayout>
+
+        <!--入住信息-->
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="3"
+            android:layout_marginTop="10dp"
+            android:baselineAligned="false"
+            android:orientation="vertical"
+            android:gravity="center_horizontal">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="10dp">
+                <TextView
+                    android:id="@+id/bed_customer_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawableLeft="@mipmap/ic_custom_empty2"
+                    android:drawablePadding="12dp"
+                    android:layout_centerHorizontal="true"
+                    android:gravity="center_vertical"
+                    android:text="王老五"
+                    android:textColor="@color/black"
+                    android:textSize="40sp"/>
+
+                <TextView
+                    android:id="@+id/bed_customer_age"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_below="@id/bed_customer_name"
+                    android:drawableLeft="@mipmap/ic_gender_male"
+                    android:drawablePadding="12dp"
+                    android:text="55岁"
+                    android:textSize="28sp"/>
+
+            </RelativeLayout>
+
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:gravity="center">
+                <ImageView
+                    android:id="@+id/bed_doctor_icon"
+                    android:layout_width="64dp"
+                    android:layout_height="64dp"
+                    android:src="@mipmap/ic_doctor_default2"/>
+
+                <TextView
+                    android:id="@+id/bed_doctor_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="20dp"
+                    android:layout_toRightOf="@id/bed_doctor_icon"
+                    android:text="责任医生"
+                    android:textColor="@color/text_name_color"
+                    android:textSize="20sp"/>
+
+                <TextView
+                    android:id="@+id/bed_doctor_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_toRightOf="@id/bed_doctor_icon"
+                    android:layout_below="@id/bed_doctor_title"
+                    android:text="暂无"
+                    android:textColor="@color/black"
+                    android:textSize="20sp"/>
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:gravity="center">
+                <ImageView
+                    android:id="@+id/bed_nurse_icon"
+                    android:layout_width="64dp"
+                    android:layout_height="64dp"
+                    android:src="@mipmap/ic_nurse_default2"/>
+
+                <TextView
+                    android:id="@+id/bed_nurse_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="20dp"
+                    android:layout_toRightOf="@id/bed_nurse_icon"
+                    android:text="责任护士"
+                    android:textColor="@color/text_name_color"
+                    android:textSize="20sp"/>
+
+                <TextView
+                    android:id="@+id/bed_nurse_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_toRightOf="@id/bed_nurse_icon"
+                    android:layout_below="@id/bed_nurse_title"
+                    android:text="暂无"
+                    android:textColor="@color/black"
+                    android:textSize="20sp"/>
+            </RelativeLayout>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>

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

@@ -51,6 +51,7 @@
 
     <!--护理项高度-->
     <dimen name="nurse_config_item_height">60dp</dimen>
+    <dimen name="nurse_config_item_height_800">54dp</dimen>
     
     <!--控件边距-->
     <dimen name="margin_to_side_5">5dp</dimen>

middleware/src/main/code/com/wdkl/ncs/android/middleware/common/Constant.java

@@ -28,6 +28,10 @@ public class Constant {
     //语音留言上传地址
     public static final String UPLOAD_VOICE_MSG_URL = "/ncs/upload/File";
 
+    public static int DEVICE_ORIENTATION = -1;
+    public static int DEVICE_WIDTH;
+    public static int DEVICE_HEIGHT;
+
     //0--白天，1--夜晚
     public static int day_state = -1;