门口机增加养老粉色系UI

build.gradle

@@ -53,6 +53,9 @@ buildscript {
     ext.android_mobile = false
     ext.android_visiting = false
 
+    //养老版
+    ext.yanglao = false
+
     //是否月子版
     ext.is_mom = false
     /**

callingdoor/build.gradle

@@ -36,6 +36,7 @@ android {
         buildConfigField "String", "BUILD_TIME", getDate()
         buildConfigField 'String', 'VERSION_NAME', "\"${project.rootProject.ext.app_version}\""
         buildConfigField 'String', 'VERSION_CODE', "\"${project.rootProject.ext.app_version_code}\""
+        buildConfigField 'String', 'yanglao', "\"${project.rootProject.ext.yanglao}\""
         buildConfigField 'String', 'is_mom', "\"${project.rootProject.ext.is_mom}\""
         buildConfigField 'String', 'open_433', "\"${project.rootProject.ext.open_433}\""
         buildConfigField 'String', 'device_type', "\"${project.rootProject.ext.device_type}\""

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

@@ -198,6 +198,14 @@ class CallingdoorActivationActivity  : BaseActivity<CallingdoorActivationPresent
     }
 
     private fun showui(){
+        if (BuildConfig.yanglao.toBoolean()){
+            activation_img.setBackgroundResource(R.mipmap.activation_p_mom_bg)
+            activation_language_button.setBackgroundResource(R.drawable.shape_main_bt_mom_bg)
+            activation_settings_button.setBackgroundResource(R.drawable.shape_main_bt_mom_bg)
+            activation_system_button.setBackgroundResource(R.drawable.shape_main_bt_mom_bg)
+            activation_services_button.setBackgroundResource(R.drawable.shape_main_bt_mom_bg)
+        }
+
         //设置二维码
         setQrcode()
         val isActivation = SPUtils.get(this, Constant.APP_ACTIVATION, "");

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

@@ -160,11 +160,16 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
     }
 
     override fun init() {
-         if (BuildConfig.is_mom.toBoolean()){
-             mom_frame_new.visibility = View.VISIBLE
-         } else {
-             mom_frame_new.visibility = View.GONE
-         }
+        if (BuildConfig.is_mom.toBoolean()){
+            mom_frame_new.visibility = View.VISIBLE
+        } else {
+            mom_frame_new.visibility = View.GONE
+        }
+
+        if (BuildConfig.yanglao.toBoolean()) {
+            view_title_layout_return.setBackgroundResource(R.drawable.shape_main_hos_txt_bg2)
+            main_rl_1.setBackgroundResource(R.color.yanglao_bg)
+        }
 
         if (Constant.isOpenYH) {
             menu_medical_care.visibility=View.VISIBLE

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

@@ -131,6 +131,10 @@ class SystemActivity : BaseActivity<SystemActivityPresenter, CallingdoorSettingM
     }
 
     private fun showui(){
+        if (BuildConfig.yanglao.toBoolean()) {
+            view_title_layout_return.setBackgroundResource(R.drawable.shape_main_hos_txt_bg2)
+        }
+
         view_title_layout_tv_hospital_name.setText(R.string.str_back)
         view_title_layout_img.visibility = View.VISIBLE
         view_title_layout_tv_no.visibility =View.VISIBLE

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

@@ -10,6 +10,7 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.wdkl.app.ncs.callingdoor.BuildConfig
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.ncs.android.middleware.api.UrlManager
 import com.wdkl.ncs.android.middleware.model.ActionItem
@@ -57,7 +58,11 @@ class DeviceMenuAdapter : RecyclerView.Adapter<DeviceMenuAdapter.ViewHolder>{
                     .diskCacheStrategy(DiskCacheStrategy.ALL)
                     .into(holder.imageView)
         } else {
-            holder.imageView.setImageResource(R.drawable.ic_device)
+            if (BuildConfig.yanglao.toBoolean()) {
+                holder.imageView.setImageResource(R.drawable.ic_device2)
+            } else {
+                holder.imageView.setImageResource(R.drawable.ic_device)
+            }
         }
 
         holder.actionView.setOnClickListener {

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

@@ -14,6 +14,7 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.libra.Color
+import com.wdkl.app.ncs.callingdoor.BuildConfig
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.util.HorizantalAutoBrLayout
 import com.wdkl.ncs.android.middleware.common.Constant
@@ -85,17 +86,20 @@ class NewFrameRoomAdapter : RecyclerView.Adapter<NewFrameRoomAdapter.BedViewHold
 
     private fun showBedInfo(holder: BedViewHolder, bedVO: FrameBedVO) {
         try {
+            if (BuildConfig.yanglao.toBoolean()) {
+                holder.tv_bed_name_title.setBackgroundResource(R.drawable.shape_bed_number_bg)
+            }
             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, "-")
+                holder.tv_bed_name_title.text = CommonUtils.subStringAfter(bedVO.frameBed.fullName, "-")
                 holder.bedName.text = StringUtil.getResString(R.string.empty_bed)
                 holder.tv_bed_sex.text = StringUtil.getResString(R.string.str_gender_none) + StringUtil.getResString(R.string.empty)
                 holder.tv_bed_age.text = StringUtil.getResString(R.string.str_age) + StringUtil.getResString(R.string.empty)
                 holder.bed_medic_name.text = StringUtil.getResString(R.string.empty)
                 holder.bed_nurse_name.text = StringUtil.getResString(R.string.empty)
             } else {
-                holder.tv_bed_name_title.text = CommonUtils.subStringAfter2(bedVO.frameBed.fullName, "-")
+                holder.tv_bed_name_title.text = CommonUtils.subStringAfter(bedVO.frameBed.fullName, "-")
                 holder.bedName.text = bedVO.customerName
                 holder.tv_bed_age.text = StringUtil.getResString(R.string.str_age) + bedVO.customerAge + bedVO.customerAgeUnit
 

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

@@ -10,6 +10,7 @@ import android.widget.TextView
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.GridLayoutManager
 import com.enation.javashop.net.engine.model.NetState
+import com.wdkl.app.ncs.callingdoor.BuildConfig
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.adapter.NewFrameRoomAdapter
 import com.wdkl.app.ncs.callingdoor.bean.CallingItem
@@ -56,6 +57,11 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
     override fun init() {
         //语言适配
         languageUI()
+
+        if (BuildConfig.yanglao.toBoolean()) {
+            ll_room_number.setBackgroundResource(R.drawable.shape_room_bg2)
+        }
+
         val orientation = resources.configuration.orientation
         if (orientation == Configuration.ORIENTATION_PORTRAIT) {
             // 竖屏模式

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

@@ -2,6 +2,7 @@ package com.wdkl.app.ncs.callingdoor.fragment
 
 import android.content.Intent
 import com.enation.javashop.net.engine.model.NetState
+import com.wdkl.app.ncs.callingdoor.BuildConfig
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivity
 import com.wdkl.app.ncs.callingdoor.activity.SetHintActivity
@@ -152,6 +153,10 @@ class NurseFragment : BaseFragment<NurseFragmentPresenter, CallingdoorNurseMainB
     }
 
     private fun showui(){
+        if (BuildConfig.yanglao.toBoolean()) {
+            nurse_main_bt.setBackgroundResource(R.drawable.selector_nuserlogin_btn2)
+        }
+
         nurse_main_tx_name.setText(yh_name)
         nurse_main_1_ll.setBackgroundResource(R.drawable.shape_bed_bg)
         nurse_main_1_img.setBackgroundResource(R.mipmap.ding)

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

@@ -7,6 +7,7 @@ import android.view.View
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.enation.javashop.net.engine.model.NetState
+import com.wdkl.app.ncs.callingdoor.BuildConfig
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.adapter.YhMianAdapter
 import com.wdkl.app.ncs.callingdoor.databinding.CallingdoorNurseBinding
@@ -44,6 +45,11 @@ class  YhFragment : BaseFragment<YhFragmentPresenter, CallingdoorNurseBinding>()
     }
     //数据绑定
     override fun init() {
+        if (BuildConfig.yanglao.toBoolean()) {
+            nurse_bt.setBackgroundResource(R.drawable.selector_nuserlogin_btn2)
+            nurse_bt_1.setBackgroundResource(R.drawable.selector_nuserlogin_btn2)
+        }
+
         rv_nurse_main_ll.visibility = View.GONE
         adapter = YhMianAdapter(activity, ArrayList())
         val orientation = activity.resources.configuration.orientation

callingdoor/src/main/res/drawable/shape_bed_number_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="#FEB8BF" />
+    <corners
+        android:radius="@dimen/d40" />
+
+</shape>

callingdoor/src/main/res/drawable/shape_room_bg2.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="#FEB8BF" />
+    <corners
+        android:radius="@dimen/d20" />
+
+</shape>

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

@@ -15,6 +15,7 @@
             android:paddingRight="10dp">
 
             <LinearLayout
+                android:id="@+id/ll_room_number"
                 android:layout_width="600dp"
                 android:layout_height="match_parent"
                 android:background="@drawable/shape_room_bg"
@@ -144,7 +145,6 @@
 
             </LinearLayout>
 
-
         </LinearLayout>
 
         <com.wdkl.ncs.android.lib.widget.AutoPollRecyclerView

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

@@ -13,6 +13,7 @@
             android:orientation="horizontal">
 
             <LinearLayout
+                android:id="@+id/ll_room_number"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginTop="6dp"

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

@@ -111,4 +111,6 @@
 
     <color name="baby_bg">#FEB8BF</color>
     <color name="baby_top_txt">#F8757E</color>
+
+    <color name="yanglao_bg">#FEB8BF</color>
 </resources>

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

@@ -0,0 +1,5 @@
+<vector android:height="48dp" android:tint="#FEB8BF"
+    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"/>
+</vector>

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/d18"/>
+            <solid android:color="#FEB8BF"/>
+        </shape>
+    </item>
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="@dimen/d18"/>
+            <solid android:color="#F8757E"/>
+        </shape>
+    </item>
+</selector>

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

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

resource/src/main/res/values-zh/strings.xml

@@ -407,7 +407,7 @@
     <string name="str_voice_msg_undo">未播放</string>
 
     <string name="bed_in_nursing">护理中，确认退出？</string>
-    <string name="bed_set_nursing">对该床位设置为护理状态</string>
+    <string name="bed_set_nursing">设置为护理状态</string>
     <string name="param_set_error">参数设置错误!</string>
     <string name="reinforce_sent">消息已发出，请耐心等待回应</string>
 
@@ -642,11 +642,11 @@
     <string name="door_mom_title_6">宝宝性别</string>
     <string name="baby_bg_txt">坐个好<font color='#F8EDC7'>月子</font>幸福一辈子</string>
 
-    <string name="door_hos_title_1">病房人数</string>
+    <string name="door_hos_title_1">房间人数</string>
     <string name="door_hos_title_2">空余床位</string>
     <string name="door_hos_title_3">床位号</string>
     <string name="set_hint_2">锁屏显示</string>
-    <string name="set_huli_2">该房病床进入护理</string>
+    <string name="set_huli_2">进入护理</string>
 
     <string name="permission_grant_tips">请重新授权</string>