## [1.0.10] version 10 - 2020-07-08

### Changed
- 去掉10%以下电量持续告警

build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 10
+    ext.app_version_code = 11
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.0.10"
+    ext.app_version = "1.0.11"
 
     /**
      * 项目依赖库

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WebRTCVoipAudioRingingActivity.kt

@@ -105,16 +105,7 @@ class WebRTCVoipAudioRingingActivity : Activity(), View.OnClickListener {
                 finish()
             }
             R.id.hang_up_imagev ->{
-                DeviceChannel.calling = false
-                isAnswerOrHangUp = true
-                MediaPlayHelper.getInstance().stopMusic()
-                countDownTimer?.cancel()
-                //t给服务器发送拒接 tcp
-                val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
-                val voiceUtilTcpModel = VoiceUtil.voiceReject(Integer.parseInt(Constants.deviceId), tcpModel.fromId, interactionVO.id)
-                TcpClient.getInstance().sendMsg(voiceUtilTcpModel.toJson())
-                mVibrator.cancel()
-                 finish()
+                acceptCall()
             }
             R.id.call_the_voice_imagev ->{
                 isAnswerOrHangUp = true
@@ -135,6 +126,19 @@ class WebRTCVoipAudioRingingActivity : Activity(), View.OnClickListener {
         }
     }
 
+    fun acceptCall(){
+        DeviceChannel.calling = false
+        isAnswerOrHangUp = true
+        MediaPlayHelper.getInstance().stopMusic()
+        countDownTimer?.cancel()
+        //t给服务器发送拒接 tcp
+        val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
+        val voiceUtilTcpModel = VoiceUtil.voiceReject(Integer.parseInt(Constants.deviceId), tcpModel.fromId, interactionVO.id)
+        TcpClient.getInstance().sendMsg(voiceUtilTcpModel.toJson())
+        mVibrator.cancel()
+        finish()
+    }
+
     private fun initCountDownTimer() {
 
         countdownTime = SettingConfig.getCountdownTime(this)
@@ -170,14 +174,19 @@ class WebRTCVoipAudioRingingActivity : Activity(), View.OnClickListener {
     }
 
     override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
+        Log.i(TAG, "keyCode " + keyCode)
         return if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) {
-
-            //不执行父类点击事件
             true
-        } else super.onKeyUp(keyCode, event)
-        //继续执行父类其他点击事件
+        } else {
+            super.onKeyUp(keyCode, event)
+            //继续执行父类其他点击事件
+        }
     }
 
+    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
+        Log.i(TAG, "keyCode " + keyCode)
+        return super.onKeyDown(keyCode, event)
+    }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {

home/src/main/code/com/wdkl/ncs/android/component/home/broadcast/BatteryBroadcastReceiver.java

@@ -33,12 +33,6 @@ public class BatteryBroadcastReceiver extends BroadcastReceiver {
                 if (Constants.Companion.getEVENT_BATTERY_ALARM()) {
                     SpeechUtil.getInstance().newSpeech("电池电量低，请注意!电池电量低，请注意!电池电量低，请注意!", false);
                     Constants.Companion.setEVENT_BATTERY_ALARM(false);
-                } else if (power<10){
-                    Constants.Companion.setEVENT_BATTERY_ALARM(true);
-                    if (Constants.Companion.getEVENT_BATTERY_ALARM()) {
-                        SpeechUtil.getInstance().newSpeech("电池电量极低，请注意!电池电量极低，请注意!电池电量极低，请注意!", false);
-                        Constants.Companion.setEVENT_BATTERY_ALARM(false);
-                    }
                 }
             } else {
                 Constants.Companion.setEVENT_BATTERY_ALARM(true);

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/UrlManager.kt

@@ -55,9 +55,9 @@ private class DevUrlManager : UrlManager{
 
     override val base: String
 //        get() = "http://dev.base.wdklian.com"
-        get() = "http://8.129.220.143"
+//        get() = "http://8.129.220.143"
 //        get() = "http://192.168.1.188"
-//      get() = "http://120.76.246.253"
+      get() = "http://120.76.246.253"
 
     override val device_url: String
 //        get() = "${base}:6005/"

readme.md

@@ -27,6 +27,11 @@
 ---
 ## [1.0.10] version 10 - 2020-07-08
 ### Changed
+- 去掉10%以下电量持续告警
+---
+
+## [1.0.10] version 10 - 2020-07-08
+### Changed
 - 事件震动优化，震动2次，响应完成停止震动
 ### Added
 - 通话时如果检测有蓝牙设备，则从蓝牙设备通讯