罗格朗分机增加养老版本粉色系UI

android_bed/build.gradle

@@ -37,6 +37,7 @@ android {
         buildConfigField 'String', 'VERSION_NAME', "\"${project.rootProject.ext.app_version}\""
         buildConfigField 'String', 'VERSION_CODE', "\"${project.rootProject.ext.app_version_code}\""
         buildConfigField 'String', 'isandroid_bed', "\"${project.rootProject.ext.android_bed}\""
+        buildConfigField 'String', 'yanglao', "\"${project.rootProject.ext.yanglao}\""
         buildConfigField 'String', 'is_mom', "\"${project.rootProject.ext.is_mom}\""
         buildConfigField 'String', 'open_sleep', "\"${project.rootProject.ext.open_sleep}\""
         buildConfigField 'String', 'open_433', "\"${project.rootProject.ext.open_433}\""

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

@@ -285,15 +285,23 @@ class CallingbedActivationActivity  : BaseActivity<CallingbedActivationPresenter
     }
 
     private fun showUI(){
-        if (BuildConfig.is_mom.toBoolean()){
+        if (BuildConfig.yanglao.toBoolean()){
+            activation_img.setBackgroundResource(R.mipmap.activation_p_mom_bg)
+            activation_network_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)
+        } else if (BuildConfig.is_mom.toBoolean()){
             SettingConfig.setScene(activity, 1)
             activation_img.setBackgroundResource(R.mipmap.activation_p_mom_bg)
+            activation_network_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)
-        }else{
+        } else {
             SettingConfig.setScene(activity, 0)
         }
+
         val isActivation = SPUtils.get(this, Constant.APP_ACTIVATION, "");
         if (isActivation.equals("Activated")){
             activation_title.setText(R.string.connect_server_failed)

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

@@ -250,6 +250,11 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
         Constant.NursingTitle =""
         nursingInteId = SettingConfig.getNursingId(activity)
 
+        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 (SettingConfig.getSipEnabled(activity)) {
             linphoneManager = LinphoneManager.getInstance(BaseApplication.appContext)
             linphoneManager?.start()

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

@@ -221,12 +221,17 @@ class SystemActivity : BaseActivity<SystemActivityPresenter, CallingbedSettingMa
     }
 
     private fun showui(){
-
-        if (BuildConfig.is_mom.toBoolean()){
+        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
+            view_title_layout_tv_no.setText(R.string.str_device_info)
+        } else if (BuildConfig.is_mom.toBoolean()){
             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.GONE
-        }else{
+        } else {
             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

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/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.callingbed.BuildConfig
 import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.ncs.android.middleware.model.vo.DeviceMenulist
 
@@ -55,7 +56,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 {

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

@@ -7,6 +7,7 @@ import android.view.View
 import androidx.recyclerview.widget.GridLayoutManager
 import com.enation.javashop.net.engine.model.NetState
 import com.google.gson.Gson
+import com.wdkl.app.ncs.callingbed.BuildConfig
 import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.app.ncs.callingbed.adapter.NurseConfigAdpter
 import com.wdkl.app.ncs.callingbed.databinding.MainViewLayoutBinding
@@ -56,6 +57,10 @@ class  MainFragment: BaseFragment<BedMainFragmentPresenter, MainViewLayoutBindin
     }
 
     override fun init() {
+        if (BuildConfig.yanglao.toBoolean()) {
+            main_view_bg.setBackgroundResource(R.color.yanglao_bg)
+        }
+
         val layoutManager = GridLayoutManager(getActivity(), 3)
         val orientation = activity.resources.configuration.orientation
         if (orientation == Configuration.ORIENTATION_PORTRAIT) {

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

@@ -2,6 +2,7 @@ package com.wdkl.app.ncs.callingbed.fragment
 
 import android.content.Intent
 import com.enation.javashop.net.engine.model.NetState
+import com.wdkl.app.ncs.callingbed.BuildConfig
 import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.app.ncs.callingbed.activity.CallingbedActivity
 import com.wdkl.app.ncs.callingbed.activity.SetHintActivity
@@ -173,6 +174,10 @@ class NurseFragment : BaseFragment<NurseFragmentPresenter, CallingbedNurseMainBi
     }
 
     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)

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

@@ -6,6 +6,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.callingbed.BuildConfig
 import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.app.ncs.callingbed.adapter.YhMianAdapter
 import com.wdkl.app.ncs.callingbed.databinding.CallingbedNurseBinding
@@ -51,6 +52,11 @@ class  YhFragment : BaseFragment<YhFragmentPresenter, CallingbedNurseBinding>(),
 
     //数据绑定
     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 layoutManager = GridLayoutManager(activity, 4, LinearLayoutManager.VERTICAL, false)

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

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

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

@@ -115,4 +115,5 @@
     <color name="javashop_color_searcher_tv_gray">#ff999999</color>
 
     <color name="legrand_main_color">#369890</color>
+    <color name="yanglao_bg">#FEB8BF</color>
 </resources>