## [1.0.17] version 17 - 2020-07-16

### Fixed
- 断网亮屏崩溃解决
- 修复自动安装不弹出问题

app/src/main/AndroidManifest.xml

@@ -14,6 +14,7 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
 
     <!--  亮屏和解锁权限   -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />

build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 15
+    ext.app_version_code = 17
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.0.15"
+    ext.app_version = "1.0.17"
 
     /**
      * 项目依赖库

home/src/main/AndroidManifest.xml

@@ -12,6 +12,7 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
 
     <application
         android:allowBackup="true"
@@ -49,6 +50,18 @@
 <!--                <action android:name="android.media.AUDIO.BECOMING_NOISY" />-->
 <!--            </intent-filter>-->
 <!--        </receiver>-->
+
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            tools:replace="android:authorities"
+            android:grantUriPermissions="true"
+            android:exported="false">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
     </application>
 
 </manifest>

home/src/main/code/com/wdkl/ncs/android/component/home/helper/AppUpdateHelper.java

@@ -8,6 +8,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
+import android.support.v4.BuildConfig;
 import android.support.v4.content.FileProvider;
 import android.util.Log;
 
@@ -93,7 +94,7 @@ public class AppUpdateHelper {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
             //参数1 上下文, 参数2 Provider主机地址 和配置文件中保持一致   参数3  共享的文件
-            Uri uri = FileProvider.getUriForFile(mContext, mContext.getPackageName() + ".fileprovider", apkFile);
+            Uri uri = FileProvider.getUriForFile(mContext, mContext.getPackageName()+".provider", apkFile);
             //添加这一句表示对目标应用临时授权该Uri所代表的文件
 //                    intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
             intent.setDataAndType(uri, "application/vnd.android.package-archive");

home/src/main/code/com/wdkl/ncs/android/component/home/service/TcpHandleService.kt

@@ -11,7 +11,10 @@ import com.wdkl.ncs.android.component.home.util.AppUtils
 import com.wdkl.ncs.android.component.home.util.SpeechUtil
 import com.wdkl.ncs.android.component.home.util.Util
 import com.wdkl.ncs.android.component.nursehome.common.Constants
+import com.wdkl.ncs.android.lib.utils.AppTool
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
+import com.wdkl.ncs.android.middleware.tcp.TcpClient
+import com.wdkl.ncs.android.middleware.tcp.TcpClientHandler
 import com.wdkl.ncs.android.middleware.tcp.channel.DeviceChannel
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction
@@ -172,7 +175,11 @@ class TcpHandleService : Service(){
             }
             //网络断开，1000ms重连
             Constants.EVENT_TCP_BREAK->{
-                Util.wakeUpAndUnlock(this)
+                var wakeLock = Util.wakeUpAndUnlock(this)
+                Thread(Runnable {
+                    Thread.sleep(1000)
+                    wakeLock?.release()
+                }).start()
                 Log.w(TAG, "EVENT TCP BREAK")
             }
         }

home/src/main/code/com/wdkl/ncs/android/component/home/service/WdKeepAliveService.kt

@@ -9,6 +9,7 @@ import com.wdkl.ncs.keepbackground.work.AbsWorkService
 import com.wdkl.ncs.android.component.home.util.NetHelper
 import com.wdkl.ncs.android.component.home.util.Util
 import com.wdkl.ncs.android.component.nursehome.common.Constants
+import com.wdkl.ncs.android.lib.utils.AppTool
 import com.wdkl.ncs.android.middleware.tcp.TcpClient
 import com.wdkl.ncs.android.middleware.tcp.TcpClientHandler
 import java.util.*
@@ -57,7 +58,11 @@ class WdKeepAliveService : AbsWorkService() {
                     TcpClient.getInstance().sendMsg("0")
                     if (NetHelper.getInstance().getNetworkState(this@WdKeepAliveService) == NetHelper.NETWORK_NONE || !TcpClientHandler.getConnected()) {
                         Log.w(TAG, "断网唤醒CPU")
-                        Util.wakeUpAndUnlock(this@WdKeepAliveService)
+                        var wakeLock = Util.wakeUpAndUnlock(this@WdKeepAliveService)
+                        Thread(Runnable {
+                            Thread.sleep(1000)
+                            wakeLock?.release()
+                        })
                     }
                 }
             }

home/src/main/res/xml/file_paths.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--Context.getFilesDir() 位于/data/data/安装目录-->
+    <files-path name="internalPath" path="/CallingBed2" />
+    <!--Context.getCacheDir()-->
+    <cache-path name="cachePath" path="/CallingBed2" />
+    <!--Environment.getExternalStorageDirectory()-->
+    <external-path name="externalPath" path="/CallingBed2" />
+    <!--Context.getExternalFilesDir(null)-->
+    <external-files-path name="externalFPath" path="/CallingBed2" />
+</paths>

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

@@ -26,6 +26,12 @@
 
 ---
 
+## [1.0.17] version 17 - 2020-07-16
+### Fixed
+- 断网亮屏崩溃解决
+- 修复自动安装不弹出问题
+---
+
 ## [1.0.15] version 15 - 2020-07-16
 ### Added
 - 增加保活模块