亿莱顿分机隐藏虚拟导航栏，显示呼叫记录时增加平移过渡动画，修改app名称等

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

@@ -1,4 +1,4 @@
- package com.wdkl.app.ncs.callingbed.activity
+package com.wdkl.app.ncs.callingbed.activity
 
 import android.content.Context
 import android.content.Intent
@@ -41,12 +41,11 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import java.util.concurrent.TimeUnit
 
- /**
+/**
   * 激活页面
-  * */
- @Router(path = "/callingbed/activation")
+* */
+@Router(path = "/callingbed/activation")
 class CallingbedActivationActivity  : BaseActivity<CallingbedActivationPresenter, CallingbedActivationBinding>(), CallingbedActivationContract.View {
-
     private val TAG = "CallingdoorActivationActivity"
     val QR_CODE_PATH = "http://m.wdklian.com/care/apk/care.user?type=NCS_DEVICE"
     private val uninstallApk = false
@@ -57,8 +56,11 @@ class CallingbedActivationActivity  : BaseActivity<CallingbedActivationPresenter
     //是否重启
     private var cancelRestart = false
 
+    private var clickTime: Long = 0
+    private var clickTimes: Int = 1
+
     override fun getLayId(): Int {
-       return R.layout.callingbed_activation
+        return R.layout.callingbed_activation
     }
 
     override fun bindDagger() {
@@ -90,6 +92,8 @@ class CallingbedActivationActivity  : BaseActivity<CallingbedActivationPresenter
         Utils.checkCameraSupport()
 
         checkServer()
+
+        Utils.hideStatusBar(activity, true)
     }
 
     override fun bindEvent() {
@@ -110,6 +114,22 @@ class CallingbedActivationActivity  : BaseActivity<CallingbedActivationPresenter
                 }
             })
         }
+
+        activation_qr_code.setOnClickListener {
+            val time = System.currentTimeMillis()
+            if (time - clickTime < 1500) {
+                clickTimes++
+            } else {
+                clickTimes = 1
+            }
+
+            if (clickTimes >15) {
+                showMessage("enable status bar")
+                Utils.hideStatusBar(activity, false)
+                clickTimes = 1
+            }
+            clickTime = time
+        }
     }
 
     override fun onResume() {

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

@@ -97,7 +97,7 @@ class SystemActivity : BaseActivity<SystemActivityPresenter, CallingbedSettingMa
            finish()
         }
 
-        settings_img2.setOnClickListener {
+        setting_qr_code.setOnClickListener {
             val time = System.currentTimeMillis()
             if (time - clickTime < 1500) {
                 clickTimes++

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

@@ -1,9 +1,10 @@
 package com.wdkl.app.ncs.callingbed.fragment
 
-import android.app.Activity
-import android.os.Bundle
 import android.util.Log
 import android.view.View
+import android.view.animation.Animation
+import android.view.animation.AnimationSet
+import android.view.animation.TranslateAnimation
 import androidx.recyclerview.widget.GridLayoutManager
 import com.alibaba.android.vlayout.DelegateAdapter
 import com.alibaba.android.vlayout.VirtualLayoutManager
@@ -17,7 +18,6 @@ import com.wdkl.app.ncs.callingbed.adapter.EventsMenuapter
 import com.wdkl.app.ncs.callingbed.databinding.MainCallRDialogBinding
 import com.wdkl.app.ncs.callingbed.dialog.LoadingDialogHelper
 import com.wdkl.app.ncs.callingbed.dialog.ReinforcementsDialogHelper
-import com.wdkl.app.ncs.callingbed.helper.SOSHelper
 import com.wdkl.app.ncs.callingbed.helper.SoundPoolManager
 import com.wdkl.app.ncs.callingbed.helper.SpeechUtil
 import com.wdkl.app.ncs.callingbed.launch.CallingbedLaunch
@@ -91,6 +91,21 @@ class CallRecordsFragment : BaseFragment<BedCallRecordsFragmentPresenter, MainCa
         main_call_r_l_rv_2.layoutManager = virtualLayoutManager
         main_call_r_l_rv_2.adapter = delegateAdapter
 
+        val animationSet = AnimationSet(true)
+        val translateAnimation = TranslateAnimation(
+            //X轴初始位置
+            Animation.RELATIVE_TO_SELF, 1.0f,
+            //X轴移动的结束位置
+            Animation.RELATIVE_TO_SELF, 0.0f,
+            //y轴开始位置
+            Animation.RELATIVE_TO_SELF, 0.0f,
+            //y轴移动后的结束位置
+            Animation.RELATIVE_TO_SELF, 0.0f
+        )
+        translateAnimation.duration = 800
+        animationSet.fillAfter = true
+        animationSet.addAnimation(translateAnimation)
+        ll_call_records.startAnimation(animationSet)
     }
 
     override fun onResume() {

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

@@ -76,10 +76,6 @@ class  MainFragment: BaseFragment<BedMainFragmentPresenter, MainViewLayoutBindin
                 image_qr_code?.setImageBitmap(code)
             }
         }.start()
-
-        if (Constant.DEVICE_ID != -1) {
-            ll_qr_code.visibility = View.VISIBLE
-        }
     }
 
     override fun bindEvent() {
@@ -205,9 +201,12 @@ class  MainFragment: BaseFragment<BedMainFragmentPresenter, MainViewLayoutBindin
         }
 
         if (Constant.CUSTOM_ID != -1) {
-
             presenter.loadCustomInfo(Constant.CUSTOM_ID)
         }
+
+        if (Constant.DEVICE_ID != -1) {
+            ll_qr_code.visibility = View.VISIBLE
+        }
     }
 
     private fun updateMoreConfigs(data: List<NurseConfigDto>) {

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/helper/Utils.java

@@ -8,6 +8,7 @@ import android.os.IBinder;
 import android.util.Log;
 import android.view.inputmethod.InputMethodManager;
 
+import com.wdkl.app.ncs.callingbed.BuildConfig;
 import com.wdkl.ncs.android.lib.base.BaseApplication;
 import com.wdkl.ncs.android.middleware.common.Constant;
 
@@ -55,8 +56,16 @@ public class Utils {
         }
     }
 
-    //是否隐藏系统栏
     public static void hideStatusBar(Context context, boolean hide) {
+        if(BuildConfig.flag.equals(Constant.DEV_W_DCH)) {
+            hideStatusBarDch(context, hide);
+        } else if (BuildConfig.flag.equals(Constant.DEV_W_YLD)) {
+            hideStatusBarYld(context, hide);
+        }
+    }
+
+    //是否隐藏系统栏
+    public static void hideStatusBarDch(Context context, boolean hide) {
         Log.d("StatusBar", "toggleStatusBar: hide ===== " + hide);
         Intent intent = new Intent();
         intent.setAction("control.nav.hide");//虚拟按键
@@ -68,6 +77,17 @@ public class Utils {
         context.sendBroadcast(intent);
     }
 
+    //是否隐藏系统栏
+    public static void hideStatusBarYld(Context context, boolean hide) {
+        Intent intent = new Intent();
+        if (hide) {
+            intent.setAction("com.elclcd.hidebar");
+        } else {
+            intent.setAction("com.elclcd.unhidebar");
+        }
+        context.sendBroadcast(intent);
+    }
+
     //隐藏软键盘
     public static void hideInputKeyboard(IBinder token) {
         try {

android_bed/src/main/res/layout/callingbed_setting_main.xml

@@ -605,10 +605,7 @@
             android:layout_marginLeft="@dimen/d20"
             android:layout_marginTop="@dimen/d15"
             android:gravity="center"
-            android:orientation="vertical"
-            >
-
-
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/settings_img2"
@@ -620,16 +617,13 @@
                 android:textSize="@dimen/font_size_18"
                 android:clickable="true"
                 android:textColor="@color/black"
-                android:textStyle="bold"
-                />
+                android:textStyle="bold" />
 
             <ImageView
                 android:id="@+id/setting_qr_code"
                 android:layout_width="200dp"
                 android:layout_height="200dp"
-                android:layout_marginTop="@dimen/d14"
-
-                />
+                android:layout_marginTop="@dimen/d14" />
         </LinearLayout>
 
     </LinearLayout>

android_bed/src/main/res/layout/main_call_r_dialog.xml

@@ -5,7 +5,7 @@
     android:id="@+id/call_r_k"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#B8000000">
+    android:background="#80000000">
     <!--<LinearLayout
         android:id="@+id/call_r_k"
         android:layout_width="match_parent"
@@ -15,6 +15,7 @@
         android:background="#80000000" />-->
 
     <LinearLayout
+        android:id="@+id/ll_call_records"
         android:layout_width="wrap_content"
         android:layout_height="520dp"
         android:orientation="horizontal"

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

@@ -16,10 +16,12 @@
 
             <LinearLayout
                 android:id="@+id/ll_bed"
-                android:layout_width="@dimen/d250"
+                android:layout_width="@dimen/d260"
                 android:layout_height="@dimen/d250"
                 android:layout_marginLeft="@dimen/d10"
                 android:layout_marginTop="@dimen/d24"
+                android:paddingLeft="14dp"
+                android:paddingRight="14dp"
                 android:background="@mipmap/chuanghao_bg2"
                 android:gravity="center"
                 android:orientation="vertical">
@@ -35,7 +37,7 @@
                     android:singleLine="true"
                     android:text="126"
                     android:textColor="@color/txt_number2"
-                    android:textSize="104sp"
+                    android:textSize="100sp"
                     android:textStyle="bold" />
 
                 <!--<TextView

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

@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name">NCS-床头分机</string>
+    <string name="wdkl_app_name">分机</string>
+</resources>

android_bed/src/main/res/values/strings.xml

@@ -1,4 +1,4 @@
 <resources>
     <string name="app_name">NCS-床头分机</string>
-    <string name="wdkl_app_name">Extension_dch_7inch</string>
+    <string name="wdkl_app_name">Extension_device</string>
 </resources>

app/src/main/AndroidManifest.xml

@@ -26,8 +26,8 @@
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/launcher"
-        android:label="@string/javashop_app_name"
+        android:icon="@drawable/ic_launch_48"
+        android:label="@string/wdkl_app_name"
         android:supportsRtl="true"
         tools:replace="android:label"
         tools:remove="android:requestLegacyExternalStorage"

app/src/main/res/drawable/ic_launch_48.xml

@@ -0,0 +1,5 @@
+<vector android:height="48dp" android:tint="#B1DAF3"
+    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="M4,6h18L22,4L4,4c-1.1,0 -2,0.9 -2,2v11L0,17v3h14v-3L4,17L4,6zM23,8h-6c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1L24,9c0,-0.55 -0.45,-1 -1,-1zM22,17h-4v-7h4v7z"/>
+</vector>

app/src/main/sharedUserId/AndroidManifest.xml

@@ -27,8 +27,8 @@
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/launcher"
-        android:label="@string/app_name"
+        android:icon="@drawable/ic_launch_48"
+        android:label="@string/wdkl_app_name"
         android:supportsRtl="true"
         tools:replace="android:label"
         tools:remove="android:requestLegacyExternalStorage"