<全科室系列门口机修改几个问题>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

app/build.gradle

@@ -8,10 +8,11 @@ android {
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
-        versionName "10.41"
+        versionName "10.50"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
+        buildConfigField "String", "BUILD_TIME", getDate()
     }
     buildTypes {
         release {
@@ -36,6 +37,13 @@ configurations.all {
     }
 }
 
+//获取编译日期
+String getDate() {
+    Date date = new Date();
+    String dates = "\""+date.format("yyyy年MM月dd日", TimeZone.getTimeZone("UTC"))+"\"";
+    return dates;
+}
+
 allprojects {
     repositories {
         jcenter()

app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:sharedUserId="android.uid.system"
     package="com.wdkl.callingdoor">
 
 

app/src/main/java/com/wdkl/callingdoor/ui/CallingDoorActivity.java

@@ -315,6 +315,9 @@ public class CallingDoorActivity extends BaseActivity implements View.OnClickLis
                 //点击屏幕取消病床呼叫通知
                 if (ScreenExtinguishUtil.getInstance(this).isClickLightNum >= 6 && rvBedNotice.getVisibility() == View.VISIBLE) {
                     rvBedNotice.setVisibility(View.GONE);
+                    if (loopVoice != null) {
+                        loopVoice.setPalyDismiss(true);
+                    }
                     if (!groupEntities.isEmpty())
                         groupEntities.clear();
                     mGroupAdapter.notifyDataSetChanged();
@@ -329,6 +332,9 @@ public class CallingDoorActivity extends BaseActivity implements View.OnClickLis
         //点击屏幕取消病床呼叫通知
         if (ScreenExtinguishUtil.getInstance(this).isClickLightNum >= 6 && rvBedNotice.getVisibility() == View.VISIBLE) {
             rvBedNotice.setVisibility(View.GONE);
+            if (loopVoice != null) {
+                loopVoice.setPalyDismiss(true);
+            }
             if (!groupEntities.isEmpty())
                 groupEntities.clear();
             mGroupAdapter.notifyDataSetChanged();
@@ -1001,7 +1007,8 @@ public class CallingDoorActivity extends BaseActivity implements View.OnClickLis
                     {
                         if (!udpEntity.getRoomNumber().equals("暂无") && !udpEntity.getBedNumber().equals("暂无") && Integer.valueOf(udpEntity.getType()) == 2) {
                             try {
-                                mGroupAdapter.deleteData(/*udpEntity.getRoomNumber() + "房" +*/ udpEntity.getBedNumber() + "床" + "呼叫");
+                                mGroupAdapter.deleteData(udpEntity.getRoomNumber() + "房" + udpEntity.getBedNumber() + "床" + "呼叫");
+                                //mGroupAdapter.deleteData(/*udpEntity.getRoomNumber() + "房" +*/ udpEntity.getBedNumber() + "床" + "呼叫");
                             } catch (InvocationTargetException e) {
                                 e.printStackTrace();
                             } finally {
@@ -1016,6 +1023,9 @@ public class CallingDoorActivity extends BaseActivity implements View.OnClickLis
                                 }
                                 if (groupEntities.size() == 0) {
                                     LogUtil.i("-------", "groupEntities.size() == 0");
+                                    if (loopVoice != null) {
+                                        loopVoice.setPalyDismiss(true);
+                                    }
                                     rvBedNotice.stop();
                                     rvBedNotice.setVisibility(View.GONE);
                                 }
@@ -1152,6 +1162,9 @@ public class CallingDoorActivity extends BaseActivity implements View.OnClickLis
                                 }
                                 if (groupEntities.size() == 0) {
                                     LogUtil.i("-------", "groupEntities.size() == 0");
+                                    if (loopVoice != null) {
+                                        loopVoice.setPalyDismiss(true);
+                                    }
                                     rvBedNotice.stop();
                                     rvBedNotice.setVisibility(View.GONE);
                                 }

app/src/main/java/com/wdkl/callingdoor/util/StringUtils.java

@@ -7,6 +7,8 @@ import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
 
+import com.wdkl.callingdoor.BuildConfig;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -68,7 +70,8 @@ public class StringUtils {
     }
 
     public static String getAllVersionName() {
-        String str = "\r\nAPP版本号:V10.41     rk3368全科室系列\r\n发布日期:2019年11月14日";
+        //String str = "\r\nAPP版本号:V10.41     rk3368全科室系列\r\n发布日期:2019年11月14日";
+        String str = "\r\nAPP版本号:V" + BuildConfig.VERSION_NAME + "     全科室系列\r\n发布日期:" + BuildConfig.BUILD_TIME;
         if (android.os.Build.VERSION.SDK_INT >= 26) { //android8.0 = 26
             str = str + "    android8.1 , rk3368";// rk3368 android8.1
         } else if (android.os.Build.VERSION.SDK_INT >= 24) { //android7.0 = 24