罗格朗门口机UI修改

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

@@ -1686,13 +1686,13 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
         if(state.equals(mainFragment)){
             //首页
             menu_home.setBackgroundResource(R.drawable.shape_main_bt_bg2)
-            menu_home.setTextColor(getResources().getColor(R.color.delete_text_color));
+            menu_home.setTextColor(getResources().getColor(R.color.legrand_main_color))
         }else if(state.equals(yhFragment)){
             menu_medical_care.setBackgroundResource(R.drawable.shape_main_bt_bg2)
-            menu_medical_care.setTextColor(getResources().getColor(R.color.delete_text_color));
+            menu_medical_care.setTextColor(getResources().getColor(R.color.legrand_main_color))
         }else{
             menu_more.setBackgroundResource(R.drawable.shape_main_bt_bg2)
-            menu_more.setTextColor(getResources().getColor(R.color.delete_text_color));
+            menu_more.setTextColor(getResources().getColor(R.color.legrand_main_color))
         }
 
 

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

@@ -84,6 +84,7 @@ class NewFrameRoomAdapter : RecyclerView.Adapter<NewFrameRoomAdapter.BedViewHold
     }
 
     private fun showBedInfo(holder: BedViewHolder, bedVO: FrameBedVO) {
+        holder.tv_bed_sex.setBackgroundResource(R.drawable.shape_bed_sex_male_txt_bg)
         if (TextUtils.isEmpty(bedVO.customerName)) {
             //空床位
             holder.tv_bed_name_title.text = CommonUtils.subStringAfter2(bedVO.frameBed.fullName, "-")
@@ -98,8 +99,10 @@ class NewFrameRoomAdapter : RecyclerView.Adapter<NewFrameRoomAdapter.BedViewHold
             holder.tv_bed_age.text =StringUtil.getResString(R.string.str_age)+ bedVO.customerAge + bedVO.customerAgeUnit
             if (bedVO.customerSex == 0) {
                 holder.tv_bed_sex.text = StringUtil.getResString(R.string.str_gender_female)
+                holder.tv_bed_sex.setBackgroundResource(R.drawable.shape_bed_sex_txt_bg)
             } else if (bedVO.customerSex == 1) {
                 holder.tv_bed_sex.text = StringUtil.getResString(R.string.str_gender_male)
+                holder.tv_bed_sex.setBackgroundResource(R.drawable.shape_bed_sex_male_txt_bg)
             } else {
                 holder.tv_bed_sex.text = StringUtil.getResString(R.string.str_gender_none)+StringUtil.getResString(R.string.empty)
             }

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/fragment/YhFragment.kt

@@ -8,9 +8,9 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.enation.javashop.net.engine.model.NetState
 import com.wdkl.app.ncs.callingdoor.R
-import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivity
 import com.wdkl.app.ncs.callingdoor.adapter.YhMianAdapter
 import com.wdkl.app.ncs.callingdoor.databinding.CallingdoorNurseBinding
+import com.wdkl.app.ncs.callingdoor.helper.Utils
 import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
 import com.wdkl.app.ncs.callingdoor.util.SPUtils
 import com.wdkl.ncs.android.lib.base.BaseFragment
@@ -84,17 +84,21 @@ class  YhFragment : BaseFragment<YhFragmentPresenter, CallingdoorNurseBinding>()
         nurse_bt_1.setOnClickListener {
             if (!passno.equals("")){
                 YhUtil.sendLanding(Constant.DEVICE_ID, passno)
-                SPUtils.put(getActivity(), Constant.YH_NO, passno);
-                SPUtils.put(getActivity(), Constant.YH_NAME, yh_name);
+                SPUtils.put(getActivity(), Constant.YH_NO, passno)
+                SPUtils.put(getActivity(), Constant.YH_NAME, yh_name)
             }else{
                 showMessage("no part id")
             }
 
         }
+
+        ll_yh_login_view.setOnClickListener {
+            Utils.hideInputKeyboard(activity.window.decorView.windowToken)
+        }
     }
     /**执行其他销毁操作*/
     override fun destory() {
-
+        Utils.hideInputKeyboard(activity.window.decorView.windowToken)
     }
 
 

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/helper/CallbedDialogHelper.java

@@ -5,6 +5,7 @@ import android.app.AlertDialog;
 
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
+import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -25,6 +26,9 @@ public class CallbedDialogHelper {
     private static AlertDialog alertDialog;
 
     public static void showDialog(Activity activity, ClickListener clickListener) {
+        if (alertDialog != null) {
+            alertDialog.dismiss();
+        }
 
         View contentView = LayoutInflater.from(activity).inflate(R.layout.call_bed_dialog_lay, null);
         AlertDialog.Builder builder = new AlertDialog.Builder(activity);
@@ -32,7 +36,7 @@ public class CallbedDialogHelper {
 
         Button btn_cancel = contentView.findViewById(R.id.button_cancel);
         btn_cancel.setOnClickListener(v -> {
-            if (alertDialog != null && alertDialog.isShowing()) {
+            if (alertDialog != null) {
                 alertDialog.dismiss();
             }
         });
@@ -73,14 +77,8 @@ public class CallbedDialogHelper {
             try {
                 Window window = alertDialog.getWindow();
                 WindowManager.LayoutParams lp = window.getAttributes();
-                if (Constant.Window_size == 1){
-                    lp.width = 440;
-                    lp.height = 680;
-                }else {
-                    lp.width = 980;
-                    lp.height = 840;
-                }
-
+                lp.width = WindowManager.LayoutParams.MATCH_PARENT;
+                lp.height = 800;
                 lp.gravity = Gravity.CENTER;
                 window.setAttributes(lp);
             } catch (Exception e) {
@@ -90,15 +88,14 @@ public class CallbedDialogHelper {
             try {
                 Window window = alertDialog.getWindow();
                 WindowManager.LayoutParams lp = window.getAttributes();
-                lp.width = 680;
-                lp.height = 440;
+                lp.width = 800;
+                lp.height = 600;
                 lp.gravity = Gravity.CENTER;
                 window.setAttributes(lp);
             } catch (Exception e) {
                 e.printStackTrace();
             }
         }
-        //设置dialog宽高及位置
 
     }
 

callingdoor/src/main/res/drawable/selector_call_beds_bt.xml

@@ -0,0 +1,18 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <layer-list>
+            <item android:drawable="@mipmap/sel_beds" />
+            <item>
+                <shape>
+                    <corners android:radius="10dp"/>
+                    <solid android:color="#51000000" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+    <item>
+        <layer-list>
+            <item android:drawable="@mipmap/sel_beds" />
+        </layer-list>
+    </item>
+</selector>

callingdoor/src/main/res/drawable/selector_call_cancel_bt.xml

@@ -1,7 +1,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <layer-list>
-            <item android:drawable="@mipmap/cancel_bg" />
+            <item android:drawable="@mipmap/sel_cancel" />
             <item>
                 <shape>
                     <corners android:radius="10dp"/>
@@ -12,7 +12,7 @@
     </item>
     <item>
         <layer-list>
-            <item android:drawable="@mipmap/cancel_bg" />
+            <item android:drawable="@mipmap/sel_cancel" />
         </layer-list>
     </item>
 </selector>

callingdoor/src/main/res/drawable/selector_callhu_bt.xml

@@ -1,7 +1,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <layer-list>
-            <item android:drawable="@mipmap/hu_bg" />
+            <item android:drawable="@mipmap/sel_nurse" />
             <item>
                 <shape>
                     <corners android:radius="10dp"/>
@@ -12,7 +12,7 @@
     </item>
     <item>
         <layer-list>
-            <item android:drawable="@mipmap/hu_bg" />
+            <item android:drawable="@mipmap/sel_nurse" />
         </layer-list>
     </item>
 </selector>

callingdoor/src/main/res/drawable/selector_zengyuan_bt.xml

@@ -1,7 +1,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <layer-list>
-            <item android:drawable="@mipmap/zeng_bg" />
+            <item android:drawable="@mipmap/sel_reinforce" />
             <item>
                 <shape>
                     <corners android:radius="10dp"/>
@@ -12,7 +12,7 @@
     </item>
     <item>
         <layer-list>
-            <item android:drawable="@mipmap/zeng_bg" />
+            <item android:drawable="@mipmap/sel_reinforce" />
         </layer-list>
     </item>
 </selector>

callingdoor/src/main/res/drawable/shape_bed_land_bg.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#369890" />
+</shape>

callingdoor/src/main/res/drawable/shape_bed_sex_male_txt_bg.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#d6e6f2"
+        />
+    <corners
+        android:topLeftRadius="@dimen/d3"
+        android:topRightRadius="@dimen/d3"
+        android:bottomLeftRadius="@dimen/d3"
+        android:bottomRightRadius="@dimen/d3"
+        />
+</shape>

callingdoor/src/main/res/drawable/shape_room_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#369890" />
+    <corners
+        android:radius="@dimen/d20" />
+
+</shape>

callingdoor/src/main/res/layout-land/callingdoor_main_new.xml

@@ -12,8 +12,7 @@
         <FrameLayout
             android:id="@+id/call_frame_new"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            />
+            android:layout_height="match_parent" />
         <!--右侧按钮区域-->
 
 
@@ -21,7 +20,7 @@
                 android:id="@+id/main_rl_1"
                 android:layout_width="120dp"
                 android:layout_height="match_parent"
-                android:background="@mipmap/bg"
+                android:background="@color/legrand_main_color"
                 android:orientation="vertical">
 
                 <TextView

callingdoor/src/main/res/layout-land/callingdoor_nurse.xml

@@ -79,6 +79,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/ll_yh_login_view"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginRight="@dimen/d10"

callingdoor/src/main/res/layout-land/item_bed.xml

@@ -44,7 +44,7 @@
             android:id="@+id/tv_bed_name_title"
             android:layout_width="match_parent"
             android:layout_height="@dimen/d80"
-            android:background="@mipmap/fang_bg"
+            android:background="@drawable/shape_bed_land_bg"
             android:gravity="center"
             android:ellipsize="end"
             android:singleLine="true"
@@ -131,13 +131,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/d8"
-            android:background="@drawable/shape_bed_sex_txt_bg"
+            android:background="@drawable/shape_bed_sex_male_txt_bg"
             android:paddingLeft="@dimen/d9"
             android:paddingTop="@dimen/d4"
             android:paddingRight="@dimen/d9"
             android:paddingBottom="@dimen/d4"
             android:text="性别：女"
-            android:textColor="@color/txt_sex"
+            android:textColor="@color/black"
             android:textSize="@dimen/font_size_22" />
     </LinearLayout>
 
@@ -160,7 +160,7 @@
                 android:layout_width="@dimen/d40"
                 android:layout_height="@dimen/d40"
                 android:layout_marginTop="@dimen/d12"
-                android:background="@mipmap/yisheng" />
+                android:background="@mipmap/doctor_pic" />
 
             <TextView
                 android:id="@+id/bed_medic_name"
@@ -197,7 +197,7 @@
                 android:layout_width="@dimen/d40"
                 android:layout_height="@dimen/d40"
                 android:layout_marginTop="@dimen/d12"
-                android:background="@mipmap/hs_img" />
+                android:background="@mipmap/nurse_pic" />
 
             <TextView
                 android:id="@+id/bed_nurse_name"

callingdoor/src/main/res/layout-land/main_view_layout.xml

@@ -17,14 +17,14 @@
             <LinearLayout
                 android:layout_width="600dp"
                 android:layout_height="match_parent"
-                android:background="@mipmap/fang_bg"
+                android:background="@drawable/shape_room_bg"
                 android:gravity="center_vertical">
 
                 <ImageView
                     android:layout_width="80dp"
                     android:layout_height="80dp"
                     android:layout_marginLeft="10dp"
-                    android:src="@mipmap/fang" />
+                    android:src="@mipmap/beds_icon" />
 
                 <com.wdkl.ncs.android.lib.widget.MarqueeTextView
                     android:id="@+id/tv_room_name"
@@ -88,7 +88,7 @@
                         android:layout_below="@+id/f_tx_people"
                         android:layout_centerHorizontal="true"
                         android:text="--"
-                        android:textColor="@color/txt_number"
+                        android:textColor="#F08600"
                         android:textSize="@dimen/font_size_35"
                         android:textStyle="bold" />
 
@@ -97,7 +97,7 @@
                         android:layout_height="27dp"
                         android:layout_below="@+id/f_tx_people_number"
                         android:layout_alignLeft="@+id/f_tx_people_number"
-                        android:src="@mipmap/chuang_l" />
+                        android:src="@mipmap/beds_icon_num_orange" />
 
                 </RelativeLayout>
 
@@ -130,7 +130,7 @@
                         android:layout_below="@+id/f_tx_bed"
                         android:layout_centerHorizontal="true"
                         android:text="--"
-                        android:textColor="@color/txt_bed"
+                        android:textColor="@color/legrand_main_color"
                         android:textSize="@dimen/font_size_35"
                         android:textStyle="bold" />
 
@@ -139,7 +139,7 @@
                         android:layout_height="27dp"
                         android:layout_below="@+id/f_tx_bed_number"
                         android:layout_alignLeft="@+id/f_tx_bed_number"
-                        android:src="@mipmap/chuang_wu" />
+                        android:src="@mipmap/beds_icon_num_green" />
                 </RelativeLayout>
 
             </LinearLayout>

callingdoor/src/main/res/layout-land/sky_voice_call_layout.xml

@@ -3,7 +3,7 @@
     <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@mipmap/call_bg">
+        android:background="@color/legrand_main_color">
         <!--全屏视频画面-->
         <FrameLayout
             android:id="@+id/fullscreen_video_frame"

callingdoor/src/main/res/layout-land/view_title_layout.xml

@@ -28,11 +28,14 @@
             android:visibility="gone"
             android:background="@mipmap/return_w" />
         <!--医院名称-->
-        <TextView
+        <com.wdkl.ncs.android.lib.widget.MarqueeTextView
             android:id="@+id/view_title_layout_tv_hospital_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="marquee"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:marqueeRepeatLimit="-1"
             android:singleLine="true"
             android:text="--"
             android:textColor="@color/white"
@@ -67,7 +70,8 @@
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="4dp"
             android:layout_marginRight="4dp"
-            android:background="@mipmap/riqi" />
+            android:background="@mipmap/riqi"
+            android:visibility="gone"/>
         <!--日期-->
         <TextClock
             android:layout_width="wrap_content"
@@ -86,7 +90,8 @@
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="@dimen/d23"
             android:layout_marginRight="4dp"
-            android:background="@mipmap/shijian" />
+            android:background="@mipmap/shijian"
+            android:visibility="gone"/>
         <!--时间-->
         <TextClock
             android:layout_width="wrap_content"

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

@@ -12,7 +12,7 @@
         android:layout_marginLeft="8dp"
         android:layout_weight="2"
         android:text="--"
-        android:textColor="#2F9DF1"
+        android:textColor="#F08600"
         android:textSize="24sp"/>
     <TextView
         android:id="@+id/tv_call_name"
@@ -21,7 +21,7 @@
         android:layout_marginLeft="8dp"
         android:layout_weight="2"
         android:text="--"
-        android:textColor="#2F9DF1"
+        android:textColor="#F08600"
         android:textSize="24sp"/>
 
     <Button
@@ -29,7 +29,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:background="@drawable/shape_main_dlg_txt_bg"
+        android:background="@drawable/shape_main_hos_txt_bg"
         android:gravity="center"
         android:text="@string/voice_call"
         android:textColor="@drawable/selector_bottom_btn_text_color"
@@ -40,7 +40,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:background="@drawable/shape_main_dlg_txt_bg"
+        android:background="@drawable/shape_main_hos_txt_bg"
         android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
         android:gravity="center"

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

@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:padding="10dp"
     android:background="@drawable/radis">
 
     <Button
@@ -10,8 +11,10 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
+        android:background="@drawable/shape_callconfig_bt_bg"
         android:text="@string/str_cancel"
-        android:textColor="#2F9DF1"/>
+        android:textColor="@drawable/selector_bottom_btn_text_color"
+        android:textSize="16sp"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_bed_list"

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

@@ -17,7 +17,7 @@
             android:id="@+id/main_rl_1"
             android:layout_width="100dp"
             android:layout_height="match_parent"
-            android:background="@mipmap/bg"
+            android:background="@color/legrand_main_color"
             android:orientation="vertical">
 
             <TextView
@@ -132,7 +132,7 @@
                 android:layout_marginTop="12dp"
                 android:layout_marginRight="10dp"
                 android:layout_marginBottom="@dimen/d20"
-                android:background="@drawable/selector_callhu_bt"
+                android:background="@drawable/selector_call_beds_bt"
                 android:drawableTop="@mipmap/chuang"
                 android:gravity="center"
                 android:padding="10dp"
@@ -153,9 +153,40 @@
             android:visibility="gone">
 
             <LinearLayout
+                android:id="@+id/title_layout_hl_return"
+                android:layout_width="@dimen/d105"
+                android:layout_height="@dimen/d30"
+                android:layout_centerVertical="true"
+                android:background="@drawable/shape_bed_bg"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/title_layout_hl_img"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginRight="6dp"
+                    android:background="@mipmap/rturn_f" />
+                <!--医院名称-->
+                <TextView
+                    android:id="@+id/title_layout_tv_hospital_hl_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="退出护理"
+                    android:textColor="#FF8484"
+                    android:textSize="@dimen/font_size_14" />
+            </LinearLayout>
+
+            <LinearLayout
                 android:id="@+id/ll_huli_view"
                 android:layout_width="wrap_content"
-                android:layout_height="24dp">
+                android:layout_height="@dimen/d30"
+                android:layout_centerVertical="true"
+                android:gravity="center"
+                android:layout_toRightOf="@+id/title_layout_hl_return"
+                android:layout_marginLeft="60dp">
+
                 <ImageView
                     android:id="@+id/title_layout_tv_no_hl_img"
                     android:layout_width="@dimen/d22"
@@ -166,7 +197,7 @@
                     android:id="@+id/title_layout_tv_hl_no"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginLeft="6dp"
                     android:text="护理中"
                     android:textColor="@color/white"
                     android:textSize="@dimen/font_size_18" />
@@ -176,7 +207,9 @@
             <LinearLayout
                 android:id="@+id/title_layout_ll_hl_right"
                 android:layout_width="wrap_content"
-                android:layout_height="24dp"
+                android:layout_height="@dimen/d30"
+                android:layout_centerVertical="true"
+                android:gravity="center"
                 android:layout_alignParentRight="true"
                 android:orientation="horizontal">
 
@@ -186,7 +219,8 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="4dp"
                     android:layout_marginRight="4dp"
-                    android:background="@mipmap/riqi_b" />
+                    android:background="@mipmap/riqi_b"
+                    android:visibility="gone"/>
                 <!--日期-->
                 <TextClock
                     android:layout_width="wrap_content"
@@ -205,14 +239,15 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="@dimen/d23"
                     android:layout_marginRight="4dp"
-                    android:background="@mipmap/shijian_b" />
+                    android:background="@mipmap/shijian_b"
+                    android:visibility="gone"/>
                 <!--时间-->
                 <TextClock
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="@dimen/d5"
-                    android:layout_marginRight="@dimen/d30"
+                    android:layout_marginRight="@dimen/d20"
                     android:format12Hour="HH:mm"
                     android:format24Hour="HH:mm"
                     android:text="16:08"
@@ -277,33 +312,6 @@
 
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/title_layout_hl_return"
-                android:layout_width="@dimen/d105"
-                android:layout_height="@dimen/d30"
-                android:layout_marginTop="4dp"
-                android:layout_below="@+id/ll_huli_view"
-                android:background="@drawable/shape_bed_bg"
-                android:gravity="center"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:id="@+id/title_layout_hl_img"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginRight="6dp"
-                    android:background="@mipmap/rturn_f" />
-                <!--医院名称-->
-                <TextView
-                    android:id="@+id/title_layout_tv_hospital_hl_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="退出护理"
-                    android:textColor="#FF8484"
-                    android:textSize="@dimen/font_size_14" />
-            </LinearLayout>
-
         </RelativeLayout>
 
         <RelativeLayout

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

@@ -78,6 +78,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/ll_yh_login_view"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"

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

@@ -15,7 +15,7 @@
             android:id="@+id/tv_bed_name_title"
             android:layout_width="@dimen/d200"
             android:layout_height="@dimen/d160"
-            android:background="@mipmap/chuanghao_bg"
+            android:background="@mipmap/bed_number_box"
             android:padding="6dp"
             android:gravity="center"
             android:ellipsize="end"
@@ -66,13 +66,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/d8"
-                android:background="@drawable/shape_bed_sex_txt_bg"
+                android:background="@drawable/shape_bed_sex_male_txt_bg"
                 android:paddingLeft="@dimen/d9"
                 android:paddingTop="@dimen/d4"
                 android:paddingRight="@dimen/d9"
                 android:paddingBottom="@dimen/d4"
                 android:text="性别：女"
-                android:textColor="@color/txt_sex"
+                android:textColor="@color/black"
                 android:textSize="@dimen/font_size_22" />
         </LinearLayout>
     </RelativeLayout>
@@ -133,7 +133,7 @@
                 android:layout_width="@dimen/d40"
                 android:layout_height="@dimen/d40"
                 android:layout_marginTop="@dimen/d12"
-                android:background="@mipmap/yisheng" />
+                android:background="@mipmap/doctor_pic" />
 
             <TextView
                 android:id="@+id/bed_medic_name"
@@ -170,7 +170,7 @@
                 android:layout_width="@dimen/d40"
                 android:layout_height="@dimen/d40"
                 android:layout_marginTop="@dimen/d12"
-                android:background="@mipmap/hs_img" />
+                android:background="@mipmap/nurse_pic" />
 
             <TextView
                 android:id="@+id/bed_nurse_name"

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

@@ -62,7 +62,7 @@
             android:id="@+id/confirm_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@mipmap/bg_bottom_btn"
+            android:background="@drawable/shape_main_hos_txt_bg"
             android:padding="8dp"
             android:text="@string/str_confirm"
             android:textSize="20sp"
@@ -73,7 +73,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="80dp"
-            android:background="@mipmap/bg_bottom_btn"
+            android:background="@drawable/shape_main_hos_txt_bg"
             android:padding="8dp"
             android:text="@string/str_cancel"
             android:textSize="20sp"

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

@@ -18,14 +18,14 @@
                 android:layout_marginTop="6dp"
                 android:layout_marginLeft="@dimen/d10"
                 android:layout_marginRight="@dimen/d10"
-                android:background="@mipmap/fang_bg"
+                android:background="@drawable/shape_room_bg"
                 android:gravity="center_vertical">
 
                 <ImageView
                     android:layout_width="80dp"
                     android:layout_height="80dp"
                     android:layout_marginLeft="10dp"
-                    android:src="@mipmap/fang" />
+                    android:src="@mipmap/beds_icon" />
 
                 <com.wdkl.ncs.android.lib.widget.MarqueeTextView
                     android:id="@+id/tv_room_name"
@@ -91,7 +91,7 @@
                     android:layout_below="@+id/f_tx_people"
                     android:layout_centerHorizontal="true"
                     android:text="--"
-                    android:textColor="@color/txt_number"
+                    android:textColor="#F08600"
                     android:textSize="@dimen/font_size_35"
                     android:textStyle="bold" />
 
@@ -100,7 +100,7 @@
                     android:layout_height="27dp"
                     android:layout_below="@+id/f_tx_people_number"
                     android:layout_alignLeft="@+id/f_tx_people_number"
-                    android:src="@mipmap/chuang_l" />
+                    android:src="@mipmap/beds_icon_num_orange" />
 
             </RelativeLayout>
 
@@ -133,7 +133,7 @@
                     android:layout_below="@+id/f_tx_bed"
                     android:layout_centerHorizontal="true"
                     android:text="--"
-                    android:textColor="@color/txt_bed"
+                    android:textColor="@color/legrand_main_color"
                     android:textSize="@dimen/font_size_35"
                     android:textStyle="bold" />
 
@@ -142,7 +142,7 @@
                     android:layout_height="27dp"
                     android:layout_below="@+id/f_tx_bed_number"
                     android:layout_alignLeft="@+id/f_tx_bed_number"
-                    android:src="@mipmap/chuang_wu" />
+                    android:src="@mipmap/beds_icon_num_green" />
             </RelativeLayout>
 
         </LinearLayout>

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

@@ -3,7 +3,7 @@
     <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@mipmap/call_bg">
+        android:background="@color/legrand_main_color">
         <!--全屏视频画面-->
         <FrameLayout
             android:id="@+id/fullscreen_video_frame"

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

@@ -22,7 +22,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
-        android:background="@mipmap/bg_bottom_btn"
+        android:background="@drawable/shape_main_hos_txt_bg"
         android:padding="8dp"
         android:text="@string/str_confirm"
         android:textSize="20sp"
@@ -33,7 +33,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
-        android:background="@mipmap/bg_bottom_btn"
+        android:background="@drawable/shape_main_hos_txt_bg"
         android:padding="8dp"
         android:text="@string/str_cancel"
         android:textSize="20sp"

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

@@ -20,16 +20,52 @@
         android:visibility="gone" />
 
     <LinearLayout
+        android:id="@+id/view_title_layout_return"
+        android:layout_width="@dimen/d105"
+        android:layout_height="@dimen/d30"
+        android:layout_marginTop="4dp"
+        android:layout_centerVertical="true"
+        android:background="@drawable/shape_main_hos_txt_bg"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/view_title_layout_img"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="6dp"
+            android:background="@mipmap/return_w"
+            android:visibility="gone" />
+        <!--医院名称-->
+        <com.wdkl.ncs.android.lib.widget.MarqueeTextView
+            android:id="@+id/view_title_layout_tv_hospital_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:marqueeRepeatLimit="-1"
+            android:singleLine="true"
+            android:text="科室名称"
+            android:textColor="@color/white"
+            android:textSize="@dimen/font_size_16" />
+    </LinearLayout>
+
+    <LinearLayout
         android:id="@+id/ll_date_time_title"
         android:layout_width="wrap_content"
-        android:layout_height="24dp">
+        android:layout_height="@dimen/d30"
+        android:layout_marginTop="4dp"
+        android:layout_centerHorizontal="true">
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="4dp"
             android:layout_marginRight="4dp"
-            android:background="@mipmap/riqi" />
+            android:background="@mipmap/riqi"
+            android:visibility="gone"/>
         <!--日期-->
         <TextClock
             android:layout_width="wrap_content"
@@ -48,7 +84,8 @@
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="@dimen/d23"
             android:layout_marginRight="4dp"
-            android:background="@mipmap/shijian" />
+            android:background="@mipmap/shijian"
+            android:visibility="gone"/>
         <!--时间-->
         <TextClock
             android:layout_width="wrap_content"
@@ -67,7 +104,8 @@
     <LinearLayout
         android:id="@+id/view_title_layout_ll_right"
         android:layout_width="wrap_content"
-        android:layout_height="24dp"
+        android:layout_height="@dimen/d30"
+        android:layout_marginTop="4dp"
         android:layout_alignParentEnd="true"
         android:orientation="horizontal">
 
@@ -129,33 +167,4 @@
 
     </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/view_title_layout_return"
-        android:layout_width="@dimen/d105"
-        android:layout_height="@dimen/d30"
-        android:layout_marginTop="4dp"
-        android:layout_below="@+id/ll_date_time_title"
-        android:layout_centerVertical="true"
-        android:background="@drawable/shape_main_hos_txt_bg"
-        android:gravity="center"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/view_title_layout_img"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginRight="6dp"
-            android:background="@mipmap/return_w"
-            android:visibility="gone" />
-        <!--医院名称-->
-        <TextView
-            android:id="@+id/view_title_layout_tv_hospital_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="科室名称"
-            android:textColor="@color/white"
-            android:textSize="@dimen/font_size_14" />
-    </LinearLayout>
-
 </RelativeLayout>

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

@@ -23,7 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:background="@mipmap/bg_bottom_btn"
+        android:background="@drawable/shape_main_hos_txt_bg"
         android:padding="8dp"
         android:text="@string/str_confirm"
         android:textColor="@drawable/selector_bottom_btn_text_color"/>

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

@@ -112,4 +112,5 @@
     <color name="baby_bg">#FEB8BF</color>
     <color name="baby_top_txt">#F8757E</color>
 
+    <color name="legrand_main_color">#369890</color>
 </resources>

resource/src/main/res/drawable/ic_device.xml

@@ -1,4 +1,4 @@
-<vector android:height="48dp" android:tint="#2A77FA"
+<vector android:height="48dp" android:tint="#369890"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M20,18c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2H4C2.9,4 2,4.9 2,6v10c0,1.1 0.9,2 2,2H0v2h24v-2H20zM4,6h16v10H4V6z"/>

resource/src/main/res/drawable/selector_nuserlogin_btn.xml

@@ -3,13 +3,13 @@
     <item android:state_pressed="false">
         <shape>
             <corners android:radius="@dimen/d18"/>
-            <solid android:color="#3F80F1"/>
+            <solid android:color="#369890"/>
         </shape>
     </item>
     <item android:state_pressed="true">
         <shape>
             <corners android:radius="@dimen/d18"/>
-            <solid android:color="#0C2DE3"/>
+            <solid android:color="#15b7b9"/>
         </shape>
     </item>
 </selector>

resource/src/main/res/drawable/shape_main_hos_txt_bg.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#ff3a78ef"
-        />
+    <solid android:color="#369890" />
     <corners
         android:topLeftRadius="@dimen/d17"
         android:topRightRadius="@dimen/d17"
         android:bottomLeftRadius="@dimen/d17"
-        android:bottomRightRadius="@dimen/d17"
-        />
+        android:bottomRightRadius="@dimen/d17" />
 </shape>