1。在呼叫页面增加拉条

android_door/build.gradle

@@ -78,6 +78,7 @@ android {
 }
 
 dependencies {
+    implementation files('libs/zhylapi.jar')
     //compile fileTree(dir: 'libs', include: ['*.jar'])
     /**
      * 单元测试

android_door/src/main/common/java/com/wdkl/ncs/host/service/WdklSipService.java

@@ -167,6 +167,7 @@ public class WdklSipService extends Service {
         mCore = Factory.instance()
                 .createCore(basePath + "/.wdkl_sip_rc", basePath + "/wdkl_sip_rc", this);
         mCore.addListener(mCoreListener);
+
         //SIP核心配置完成
         configureCore();
     }

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

@@ -218,7 +218,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                 }
             }
 
-            zhylManager.sys_setNationallanguage("US", "en")
+//            zhylManager.sys_setNationallanguage("US", "en")
         } catch (e: Exception) {
             e.printStackTrace()
         }
@@ -1155,7 +1155,12 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
             showMessage(StringUtil.getResString(R.string.setting_params_error) + ex.message)
             ex.printStackTrace()
         }
-
+        //喇叭功放设置
+//        zhylManager.sys_setDacVolume(BaseApplication.appContext,partSetting.linuxDoorVolumeNative)
+        zhylManager.sys_setDacVolume(BaseApplication.appContext,140)
+        //mic设置
+//        zhylManager.sys_setMic1gain(BaseApplication.appContext,partSetting.linuxDoorGainSize)
+        zhylManager.sys_setMic1gain(BaseApplication.appContext,24)
         /*Constant.inNursing = SettingConfig.getInNursing(activity)
         if (Constant.inNursing) {
             nursingInteId = SettingConfig.getNursingId(activity)
@@ -1698,7 +1703,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
         val calendar = Calendar.getInstance()
         calendar.time = Date(time)
         val year = calendar.get(Calendar.YEAR)
-        val month = calendar.get(Calendar.MONTH)
+        val month = calendar.get(Calendar.MONTH+1)
         val day = calendar.get(Calendar.DAY_OF_MONTH)
         val hour = calendar.get(Calendar.HOUR_OF_DAY)
         val minute = calendar.get(Calendar.MINUTE)
@@ -1934,6 +1939,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
             //当前是白天并且原来不是白天
             if (Constant.day_state != 0 || forceSet) {
                 //设置白天亮度
+//                ScreenManagerUtil().setScreenBrightness(this,100)
 //                ScreenManagerUtil().setScreenBrightness(this, Math.ceil(2.54 * SettingConfig.getDaytimeBrightness(this)).toInt())
                 zhylManager.disp_setLcdBackLight(getContentResolver(),Math.ceil(2.54 * SettingConfig.getDaytimeBrightness(this)).toInt(),1)
 

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/fragment/SkyCallFragment.kt

@@ -1,6 +1,6 @@
 package com.wdkl.app.ncs.callingdoor.fragment
 
-import android.os.Build
+import android.app.zhyl.ZhylManager
 import android.os.Handler
 import android.os.Looper
 import android.os.SystemClock
@@ -14,10 +14,11 @@ import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivity
 import com.wdkl.app.ncs.callingdoor.helper.DoorLightHelper
 import com.wdkl.app.ncs.callingdoor.helper.SerialPortHelper
-import com.wdkl.ncs.android.lib.utils.RingPlayHelper
 import com.wdkl.app.ncs.callingdoor.helper.VoiceManagerUtil
+import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.settings.SettingConfig
 import com.wdkl.ncs.android.lib.utils.AppTool
+import com.wdkl.ncs.android.lib.utils.RingPlayHelper
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.common.MessageEvent
@@ -67,6 +68,9 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
     private var speakerMute = false
     private var micMute: Boolean = false // 是否关闭麦克风
     private var volume = 60
+    private var mic_num = 24
+    private var horn_num = 140
+
 
     override fun getLayId(): Int {
         return R.layout.sky_voice_call_layout
@@ -80,12 +84,21 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
         initCountDownTimer(sky_voice_call_timeout)
 
         volume = SettingConfig.getExtensionCallVolume(activity)
+
+         mic_num = ZhylManager.getInstance(BaseApplication.appContext).sys_getMic1gain(BaseApplication.appContext)
+        horn_num = ZhylManager.getInstance(BaseApplication.appContext).sys_getDacVolume(BaseApplication.appContext)
         if (volume < 0 || volume > 100) {
             volume = 60
         }
         call_volume_bar.progress = volume/10
         tv_volume.text = "" + volume/10
 
+        call_mic_bar.progress = mic_num
+        tv_mic.text = mic_num.toString()
+
+        call_lab_bar.progress = horn_num
+        tv_lab.text = horn_num.toString()
+
         VoiceManagerUtil.setCallVoice(activity, volume)
 
         //tcp参数
@@ -212,7 +225,7 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
 
         sky_voice_call_speaker.setOnClickListener {
             speakerMute = !speakerMute
-            Log.d(TAG,"Speaker enable: $speakerMute")
+            Log.d(TAG, "Speaker enable: $speakerMute")
 
             WebRTCEngine.getInstance().setVolumeMute(speakerMute)
             sky_voice_call_speaker.isSelected = speakerMute
@@ -220,13 +233,13 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
 
         sky_voice_call_mute.setOnClickListener {
             micMute = !micMute
-            Log.d(TAG,"静音切换: $micMute")
+            Log.d(TAG, "静音切换: $micMute")
 
             WebRTCEngine.getInstance().muteAudio(micMute)
             sky_voice_call_mute.isSelected = micMute
         }
 
-        call_volume_bar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener{
+        call_volume_bar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
             override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
                 tv_volume.text = "" + progress
                 if (seekBar!!.progress <= 1) {
@@ -244,7 +257,54 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
                 if (seekBar!!.progress <= 2) {
                     VoiceManagerUtil.setCallVoice(activity, 20)
                 } else {
-                    VoiceManagerUtil.setCallVoice(activity, seekBar.progress*10)
+                    VoiceManagerUtil.setCallVoice(activity, seekBar.progress * 10)
+                }
+            }
+        })
+
+        call_mic_bar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
+            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
+                tv_mic.text = "" + progress
+                if (seekBar!!.progress <= 1) {
+                    tv_mic.text = "1"
+                } else {
+                    tv_mic.text = "" + progress
+                }
+            }
+
+            override fun onStartTrackingTouch(seekBar: SeekBar?) {
+                //
+            }
+
+            override fun onStopTrackingTouch(seekBar: SeekBar?) {
+                if (seekBar!!.progress <= 2) {
+                    ZhylManager.getInstance(BaseApplication.appContext).sys_setMic1gain(BaseApplication.appContext, 2)
+                } else {
+                    ZhylManager.getInstance(BaseApplication.appContext).sys_setMic1gain(BaseApplication.appContext, seekBar.progress)
+                }
+            }
+        })
+        call_lab_bar.progress = horn_num
+        tv_lab.text = horn_num.toString()
+        call_lab_bar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
+            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
+                tv_lab.text = "" + progress
+                if (seekBar!!.progress <= 1) {
+                    tv_lab.text = "1"
+                } else {
+                    tv_lab.text = "" + progress
+                }
+            }
+
+            override fun onStartTrackingTouch(seekBar: SeekBar?) {
+                //
+            }
+
+            override fun onStopTrackingTouch(seekBar: SeekBar?) {
+                if (seekBar!!.progress <= 2) {
+                    ZhylManager.getInstance(BaseApplication.appContext).sys_setDacVolume(BaseApplication.appContext, 2)
+                } else {
+                    ZhylManager.getInstance(BaseApplication.appContext).sys_setDacVolume(BaseApplication.appContext, seekBar.progress)
                 }
             }
         })
@@ -614,7 +674,7 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
     }
 
     override fun didUserLeave(userId: BigInteger?) {
-        Log.w(TAG, "didUserLeave:"+userId)
+        Log.w(TAG, "didUserLeave:" + userId)
         handler.post {
             callEnd(true)
         }

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/helper/CallConfigDialogHelper.java

@@ -50,8 +50,8 @@ public class CallConfigDialogHelper {
             int mic1 =ZhylManager.getInstance(BaseApplication.appContext).sys_getMic1gain(BaseApplication.appContext);
             int yl2 = ZhylManager.getInstance(BaseApplication.appContext).sys_getDacVolume(BaseApplication.appContext);
 //
-            call_config_mic.setText(mic1);
-            call_config_horn.setText(yl2);
+            call_config_mic.setText(String.valueOf(mic1));
+            call_config_horn.setText(String.valueOf(yl2));
         } catch (Exception e) {
             e.printStackTrace();
         }

android_door/src/main/h10_a133_chile/res/layout/sky_voice_call_layout.xml

@@ -188,6 +188,82 @@
                         android:thumb="@drawable/seek_bar_thumb"
                         app:seekBarRotation="CW270" /> <!-- Rotation: CW90 or CW270 -->
                 </com.wdkl.ncs.android.lib.widget.VerticalSeekBarWrapper>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_mic_zy_bar"
+                android:layout_width="60dp"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="120dp"
+                android:layout_marginTop="100dp"
+                android:layout_marginBottom="100dp"
+                android:clipChildren="true"
+                android:orientation="vertical"
+                android:gravity="center"
+                android:visibility="gone">
+                <TextView
+                    android:id="@+id/tv_mic"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:textSize="24sp"
+                    android:textColor="@color/title_text"/>
+
+                <com.wdkl.ncs.android.lib.widget.VerticalSeekBarWrapper
+                    android:layout_width="32dp"
+                    android:layout_height="match_parent">
+                    <com.wdkl.ncs.android.lib.widget.VerticalSeekBar
+                        android:id="@+id/call_mic_bar"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:padding="8dp"
+                        android:max="30"
+                        android:progress="6"
+                        android:splitTrack="false"
+                        android:progressDrawable="@drawable/seek_bar_bg"
+                        android:thumb="@drawable/seek_bar_thumb"
+                        app:seekBarRotation="CW270" /> <!-- Rotation: CW90 or CW270 -->
+                </com.wdkl.ncs.android.lib.widget.VerticalSeekBarWrapper>
+
+            </LinearLayout>
+            <LinearLayout
+                android:id="@+id/ll_lab_volume_bar"
+                android:layout_width="60dp"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="120dp"
+                android:layout_marginTop="100dp"
+                android:layout_marginBottom="100dp"
+                android:clipChildren="true"
+                android:orientation="vertical"
+                android:gravity="center"
+                android:visibility="gone">
+                <TextView
+                    android:id="@+id/tv_lab"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:textSize="24sp"
+                    android:textColor="@color/title_text"/>
+
+                <com.wdkl.ncs.android.lib.widget.VerticalSeekBarWrapper
+                    android:layout_width="32dp"
+                    android:layout_height="match_parent">
+                    <com.wdkl.ncs.android.lib.widget.VerticalSeekBar
+                        android:id="@+id/call_lab_bar"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:padding="8dp"
+                        android:max="160"
+                        android:progress="6"
+                        android:splitTrack="false"
+                        android:progressDrawable="@drawable/seek_bar_bg"
+                        android:thumb="@drawable/seek_bar_thumb"
+                        app:seekBarRotation="CW270" /> <!-- Rotation: CW90 or CW270 -->
+                </com.wdkl.ncs.android.lib.widget.VerticalSeekBarWrapper>
+
             </LinearLayout>
         </RelativeLayout>
     </FrameLayout>