把护士手表修改为默认软件以及禁用返回键

.idea/codeStyles/Project.xml

@@ -1,113 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <codeStyleSettings language="XML">
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
-  </component>
-</project>

.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

.idea/gradle.xml

@@ -12,7 +12,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 26
         versionCode 1
-        versionName "2.0"
+        versionName "2.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         android.defaultConfig.javaCompileOptions.annotationProcessorOptions.includeCompileClasspath = true
 

app/src/main/AndroidManifest.xml

@@ -77,6 +77,9 @@
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
+                <!-- 设置成主题界面 -->
+                <category android:name="android.intent.category.HOME" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity

app/src/main/java/com/wdkl/nursewatch/MyApplication.java

@@ -63,6 +63,8 @@ public class MyApplication extends Application {
         }
     };
 
+
+
     public void setAlarm() {
         Intent intent = new Intent(getAppContext(), APPService.class);
         PendingIntent pIntent = PendingIntent.getService(getAppContext(), 1, intent, 0);
@@ -91,4 +93,5 @@ public class MyApplication extends Application {
         super.onTrimMemory(level);
     }
 
+
 }

app/src/main/java/com/wdkl/nursewatch/presentation/ui/activities/HomeActivity.java

@@ -18,10 +18,12 @@ import android.telephony.PhoneStateListener;
 import android.telephony.SignalStrength;
 import android.telephony.TelephonyManager;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.wdkl.nursewatch.R;
 import com.wdkl.nursewatch.broadcast.BatteryBroadcastReceiver;
@@ -447,4 +449,24 @@ public class HomeActivity extends BaseActivity implements View.OnClickListener {
         }
     }
 
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_UP) {
+
+            //不执行父类点击事件
+            return true;
+        }
+        //继续执行父类其他点击事件
+        return super.onKeyUp(keyCode, event);
+    }
+
+
+
+    @Override
+    protected void onUserLeaveHint() {
+        super.onUserLeaveHint();
+//        Toast.makeText(this, "不能返回", Toast.LENGTH_LONG).show();
+    }
+
 }

app/src/main/java/com/wdkl/nursewatch/presentation/ui/activities/LoginActivity.java

@@ -3,6 +3,7 @@ package com.wdkl.nursewatch.presentation.ui.activities;
 import android.content.Intent;
 import android.provider.Settings;
 import android.support.v4.view.ViewPager;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
@@ -193,7 +194,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                     String tempContent[] = content.split("&&");
                     for (int i = 0; i < tempContent.length; i++) {
                         if (StringUtils.vagueInquiry(tempContent[i], "SERVERID=")) {
-                            loginMachineId = tempContent[i].split("=")[1];
+                            loginMachineId = tempContent[i].split(
+                                    "=")[1];
                         } else if (StringUtils.vagueInquiry(tempContent[i], "NURSEID=")) {//20190626
                             nurseID = tempContent[i].split("=")[1];
                         } else if (StringUtils.vagueInquiry(tempContent[i], "NURSENAME=")) {//20190626
@@ -253,6 +255,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                 String status = (String) messageEvent.getMessage();
                 switch (status) {
                     case "success":
+                        Log.e("login..","绑定成功。。。。。");
                         if (StringUtils.notEmpty(loginMachineId)) {
                             ToastUtil.showToast(LoginActivity.this, "绑定成功！");
                             SharedPreferencesUtil.putStringSp(SharedPreferencesUtil.LOGIN_MACHINEID, loginMachineId);

app/src/main/java/com/wdkl/nursewatch/service/BeaconService.java

@@ -119,7 +119,8 @@ public class BeaconService extends Service implements BeaconConsumer, RangeNotif
     @Override
     public void didRangeBeaconsInRegion(Collection<Beacon> collection, Region region) {
         BEACON_HANDLER.execute(() -> {
-            //Log.d("wzl", "didRangeBeaconsInRegion size: " + collection.size());
+            Log.d("wzl", "didRangeBeaconsInRegion size: " + collection.size());
+
             if (collection.size() > 0) {
                 final JSONObject obj = new JSONObject();
                 try {
@@ -129,6 +130,7 @@ public class BeaconService extends Service implements BeaconConsumer, RangeNotif
 
                     final JSONArray array = new JSONArray();
                     for (Beacon beacon : collection) {
+                        Log.e("xxx","名字"+beacon.getBluetoothName()+"信标"+beacon.getDistance());
                         final JSONObject tmp = new JSONObject();
                         tmp.put("name", beacon.getBluetoothName());
                         tmp.put("address", beacon.getBluetoothAddress());

build.gradle

@@ -3,12 +3,13 @@
 buildscript {
     
     repositories {
+        mavenCentral()
         google()
         jcenter(){ url 'https://maven.aliyun.com/repository/jcenter' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
-        classpath 'org.greenrobot:greendao-gradle-plugin:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,6 +18,7 @@ buildscript {
 
 allprojects {
     repositories {
+        mavenCentral()
         google()
         jcenter(){ url 'https://maven.aliyun.com/repository/jcenter' }
         maven { url 'https://jitpack.io' }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Dec 14 14:55:55 CST 2018
+#Wed Jun 10 09:19:21 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip