Browse Source

## [1.1.38] version 57 - 2020-08-13
### Fixed
- 打开界面连接tcp时出错重启APP
### Changed
- 更换SOS声音

allen 3 năm trước cách đây
mục cha
commit
5ebaedd12b

+ 2 - 2
build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 55
+    ext.app_version_code = 57
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.1.36"
+    ext.app_version = "1.1.38"
 
     /**
      * 项目依赖库

+ 2 - 2
home/src/main/code/com/wdkl/ncs/android/component/home/activity/NewEventListActivity.kt

@@ -89,7 +89,7 @@ class NewEventListActivity : BaseActivity<NewEventListPresenter,ActivityEventLis
             } else if (tcpModel.type == TcpType.SOS && tcpModel.action == TcpAction.SOSAction.CALL) {
                 SpeechUtil.getInstance().stopSpeak()
                 MediaPlayHelper.getInstance().stopMusic()
-                MediaPlayHelper.getInstance().playResMusic(R.raw.sos2, 1.0f, false)
+                MediaPlayHelper.getInstance().playResMusic(R.raw.sos, 1.0f, false)
             }
         }
 
@@ -280,7 +280,7 @@ class NewEventListActivity : BaseActivity<NewEventListPresenter,ActivityEventLis
                     SpeechUtil.getInstance().stopSpeak()
                     handleVibrator()
                     MediaPlayHelper.getInstance().stopMusic()
-                    MediaPlayHelper.getInstance().playResMusic(R.raw.sos2, 1.0f, false)
+                    MediaPlayHelper.getInstance().playResMusic(R.raw.sos, 1.0f, false)
                 }
             }
         }

+ 1 - 1
home/src/main/code/com/wdkl/ncs/android/component/home/activity/SOSEmergencyCallActivity.kt

@@ -56,7 +56,7 @@ class SOSEmergencyCallActivity : Activity(), View.OnClickListener {
         }
 
         MediaPlayHelper.getInstance().stopMusic()
-        MediaPlayHelper.getInstance().playResMusic(R.raw.sos2, 1.0f, true)
+        MediaPlayHelper.getInstance().playResMusic(R.raw.sos, 1.0f, true)
     }
 
     override fun onStart() {

+ 3 - 2
home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchHome2Activity.kt

@@ -80,6 +80,8 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         if (!isTaskRoot){
             finish()
         }
+        loadingDialog = CommonTool.createLoadingDialog(this, R.layout.custom_loading,R.id.loadding_image)
+        netOffLoadingDialog = CommonTool.createLoadingDialog(this, R.layout.netoff_loading,R.id.netoff_loading_image)
         super.onCreate(savedInstanceState)
     }
 
@@ -104,8 +106,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         SpeechUtil.getInstance().startSpeechThread()
         DaemonEnv.initContext(this);
 
-        loadingDialog = CommonTool.createLoadingDialog(this, R.layout.custom_loading,R.id.loadding_image)
-        netOffLoadingDialog = CommonTool.createLoadingDialog(this, R.layout.netoff_loading,R.id.netoff_loading_image)
+
         initCountDownTimer()
 
         //网络强度监听

+ 8 - 0
readme.md

@@ -26,6 +26,14 @@
 
 ---
 
+## [1.1.38] version 57 - 2020-08-13
+### Fixed
+- 打开界面连接tcp时出错重启APP
+### Changed
+- 更换SOS声音
+
+---
+
 ## [1.1.36] version 55 - 2020-08-11
 ### Fixed
 - 修复熄屏断网

BIN
resource/src/main/res/raw/sos.mp3


BIN
resource/src/main/res/raw/sos.wav


BIN
resource/src/main/res/raw/sos2.wav