<设置项>

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -633,7 +633,7 @@ fun call(tyte:Int){
     }
 
     fun initCountDownTimer() {
-        countDownTimer = object: CountDownTimer(30*1000L, 1000) {
+        countDownTimer = object: CountDownTimer(SettingConfiguration.getInstance().sipOvertime*1000L, 1000) {
             override fun onTick(millisUntilFinished: Long) {
                 //
             }

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/SystemSettingsFragment.kt

@@ -103,7 +103,7 @@ class SystemSettingsFragment:BaseFragment<SystemSettingsPresenter,FragmentSystem
         //主机免提播放音量
         host_hands_free_play_volume_tv.text = SettingConfig.getHostHandsFreePlayVolume(this.activity).toString()
         host_hands_free_play_volume_seekb.setProgress(SettingConfig.getHostHandsFreePlayVolume(this.activity))
-        //主机手柄免提播放音量
+        //主机手柄播放音量
         host_gamepad_play_volume_tv.text = SettingConfig.getHostGamepadPlayVolume(this.activity).toString()
         host_gamepad_play_volume_seekb.setProgress(SettingConfig.getHostGamepadPlayVolume(this.activity))
         //todo 根据白天晚上设置播放音量

nursehome/src/main/res/layout/fragment_system_settings.xml

@@ -384,94 +384,6 @@
                         android:layout_marginBottom="12px"
                         android:background="#AAAAAA" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:orientation="vertical">
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:text="主机免提通话音量:"
-                                android:textColor="#000000"
-                                android:textSize="14px" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:layout_marginLeft="15px"
-                                android:text="0"
-                                android:textColor="#000000"
-                                android:textSize="14px" />
-                        </LinearLayout>
-
-                        <SeekBar
-                            android:id="@+id/host_hands_free_call_volume_seekb"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="-6px"
-                            android:layout_marginRight="15px"
-                            android:layout_weight="1"
-                            android:maxHeight="2px"
-                            android:progressDrawable="@drawable/po_seekbar"
-                            android:thumb="@drawable/seekbar_thumb">
-
-                        </SeekBar>
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:orientation="vertical">
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:text="主机手柄通话音量："
-                                android:textColor="#000000"
-                                android:textSize="14px" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:layout_marginLeft="15px"
-                                android:text="0"
-                                android:textColor="#000000"
-                                android:textSize="14px" />
-                        </LinearLayout>
-
-                        <SeekBar
-                            android:id="@+id/host_gamepad_call_volume_seekb"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="-6px"
-                            android:layout_marginRight="15px"
-                            android:layout_weight="1"
-                            android:maxHeight="2px"
-                            android:progressDrawable="@drawable/po_seekbar"
-                            android:thumb="@drawable/seekbar_thumb">
-
-                        </SeekBar>
-
-                    </LinearLayout>
-
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="1px"
@@ -593,7 +505,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center_vertical"
-                                android:text="主机免提播放音量："
+                                android:text="主机免提通话音量："
                                 android:textColor="#000000"
                                 android:textSize="14px" />
 
@@ -638,7 +550,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center_vertical"
-                                android:text="主机手柄播放音量："
+                                android:text="主机手柄通话音量："
                                 android:textColor="#000000"
                                 android:textSize="14px" />
 
@@ -851,7 +763,7 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="center_vertical"
-                                    android:text="分机白天LED亮度："
+                                    android:text="分机白天护理灯亮度："
                                     android:textColor="#000000"
                                     android:textSize="14px" />
 
@@ -896,7 +808,7 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="center_vertical"
-                                    android:text="分机晚上LED亮度："
+                                    android:text="分机晚上护理灯亮度："
                                     android:textColor="#000000"
                                     android:textSize="14px" />