1.修改上传数据名称 2.添加手机版不会开启蓝牙的问题 3.添加手机版开启蓝牙信标功能

.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_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" 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.1"
+        versionName "2.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         android.defaultConfig.javaCompileOptions.annotationProcessorOptions.includeCompileClasspath = true
 

app/src/main/java/com/wdkl/nursewatch/common/Constants.java

@@ -34,7 +34,7 @@ public class Constants {
 
     /**
      * 各种呼叫的机型
-     * type :1门口机 2主机 3 子机 4请求增援 5卫生间 6子机转接优先等级依次升高
+     * type :1门口机 2主机 3 子机 4请求增援 5卫生间 6子机转接优先等级依次升高  12传统子机呼叫
      */
     public static final String DOOR_CALL = "1";
     public static final String MAIN_CALL = "2";
@@ -46,7 +46,7 @@ public class Constants {
 
     //Handler_Flag
     public static final int TIME_WHAT = 1000;//时间
-    //是否登出
+    //是否退出
     public static boolean IS_LOGOUT = true;
 
     //是否震动

app/src/main/java/com/wdkl/nursewatch/entity/WebsocketEntityReal.java

@@ -1,6 +1,6 @@
 package com.wdkl.nursewatch.entity;
 
-public class WebsocketEntityReal {
+public class  WebsocketEntityReal {
     /**
      * DeviceType : 0
      * MachineID : TA178110032400E84C68B45E_ 89860617070010091006

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

@@ -103,6 +103,10 @@ public class HomeActivity extends BaseActivity implements View.OnClickListener {
     private boolean isEnabledLocation = false;
     private boolean beanconServiceStarted = false;
 
+    String[] allPermissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.CHANGE_NETWORK_STATE,
+            Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE,
+            Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION};
+
     @Override
     public int getLayoutId() {
         return R.layout.activity_home;
@@ -110,18 +114,13 @@ public class HomeActivity extends BaseActivity implements View.OnClickListener {
 
     @Override
     protected void initView() {
-        ll_home_all.setOnClickListener(this);
         applyPermission();
-
+        ll_home_all.setOnClickListener(this);
         if (PhoneUtils.isWatch(this)) {
             battery_view.setVisibility(View.VISIBLE);
             tv_home_network_power.setVisibility(View.VISIBLE);
             checkBT();
             checkLocation();
-            //Log.d("wzl", "bt: " + isEnabledBT + ", location: " + isEnabledLocation);
-            /*if (isEnabledBT && isEnabledLocation) {
-                initBeancon();
-            }*/
         } else {
             battery_view.setVisibility(View.INVISIBLE);
             tv_home_network_power.setVisibility(View.INVISIBLE);
@@ -138,10 +137,9 @@ public class HomeActivity extends BaseActivity implements View.OnClickListener {
 
     }
 
-    String[] allPermissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.CHANGE_NETWORK_STATE,
-                                           Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                                           Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION};
-
+    /**
+     * 动态申请权限
+     */
     public void applyPermission() {
         if (Build.VERSION.SDK_INT >= 23) {
             boolean needapply = false;
@@ -319,8 +317,6 @@ public class HomeActivity extends BaseActivity implements View.OnClickListener {
         } else {
             Constants.IS_LOGOUT = true;
         }
-
-
         setNetWorkListener();
     }
 

app/src/main/java/com/wdkl/nursewatch/presentation/ui/activitiesphone/LoginActivityPhone.java

@@ -1,6 +1,7 @@
 package com.wdkl.nursewatch.presentation.ui.activitiesphone;
 
 import android.Manifest;
+import android.bluetooth.BluetoothAdapter;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
@@ -17,6 +18,7 @@ import com.wdkl.nursewatch.R;
 import com.wdkl.nursewatch.common.Constants;
 import com.wdkl.nursewatch.entity.MessageEvent;
 import com.wdkl.nursewatch.presentation.ui.base.BaseActivity;
+import com.wdkl.nursewatch.service.BeaconService;
 import com.wdkl.nursewatch.utils.LogUtil;
 import com.wdkl.nursewatch.utils.NetworkUtil;
 import com.wdkl.nursewatch.utils.SharedPreferencesUtil;
@@ -58,6 +60,8 @@ public class LoginActivityPhone extends BaseActivity implements View.OnClickList
     Button into_set;
 
     String loginMachineId = "", nurseID = "", nurseName = "";
+    private static final int REQUEST_ENABLE_BT = 1;
+
 
     @Override
     public int getLayoutId() {
@@ -79,9 +83,29 @@ public class LoginActivityPhone extends BaseActivity implements View.OnClickList
     @Override
     protected void initData() {
         applyPermission();
+        checkBT();
     }
 
-    String[] allPermissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.CHANGE_NETWORK_STATE, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
+    /**
+     * 开启蓝牙
+     */
+    private void checkBT() {
+        BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        if (bluetoothAdapter != null) {
+            if (bluetoothAdapter.isEnabled()) {
+
+            } else {
+                Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
+                startActivityForResult(enableBtIntent, REQUEST_ENABLE_BT);
+            }
+        }
+    }
+    String[] allPermissions = new String[]{Manifest.permission.CAMERA,
+            Manifest.permission.CHANGE_NETWORK_STATE,
+            Manifest.permission.READ_EXTERNAL_STORAGE,
+            Manifest.permission.WRITE_EXTERNAL_STORAGE,
+            Manifest.permission.ACCESS_COARSE_LOCATION,
+            };
 
     public void applyPermission() {
         if (Build.VERSION.SDK_INT >= 23) {
@@ -156,6 +180,13 @@ public class LoginActivityPhone extends BaseActivity implements View.OnClickList
                         if (NetworkUtil.checkNetworkAvailable()) {
                             WebsocketUtil.getInstance().connect(loginMachineId, nurseID);
                             output.setText("扫描成功，正在连接中...");
+
+                            //启动蓝牙信标扫描服务
+                            final Intent intent = new Intent(this, BeaconService.class);
+                            intent.putExtra(BeaconService.SERVER_ID_KEY, loginMachineId);
+                            intent.putExtra(BeaconService.NURSE_ID_KEY, nurseID);
+                            intent.putExtra(BeaconService.NURSE_NAME_KEY, nurseName);
+                            startService(intent);
                         }
                     } else {
                         ToastUtil.showToast(LoginActivityPhone.this, "非法二维码!");

app/src/main/java/com/wdkl/nursewatch/presentation/ui/activitiesphone/MainActivityPhone.java

@@ -1,5 +1,6 @@
 package com.wdkl.nursewatch.presentation.ui.activitiesphone;
 
+import android.content.Intent;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
@@ -14,6 +15,7 @@ import com.wdkl.nursewatch.common.Constants;
 import com.wdkl.nursewatch.entity.MessageEntity;
 import com.wdkl.nursewatch.entity.MessageEvent;
 import com.wdkl.nursewatch.presentation.ui.base.BaseActivity;
+import com.wdkl.nursewatch.service.BeaconService;
 import com.wdkl.nursewatch.utils.LogUtil;
 import com.wdkl.nursewatch.utils.NetworkUtil;
 import com.wdkl.nursewatch.utils.PalyPhonetics;
@@ -91,6 +93,17 @@ public class MainActivityPhone extends BaseActivity implements View.OnClickListe
         if (StringUtils.notEmpty(loginMachineId) && WebsocketUtil.WEBSOCKET_STATE != WebsocketUtil.WEBSOCKET_SUCCESS) {
             WebsocketUtil.connectWS();
         }
+
+
+        String nurseID = SharedPreferencesUtil.getStringSp(SharedPreferencesUtil.LOGIN_NURSE_ID);
+        String nurseName = SharedPreferencesUtil.getStringSp(SharedPreferencesUtil.LOGIN_NURSE_NAME);
+        //启动蓝牙信标扫描服务
+        final Intent intent = new Intent(this, BeaconService.class);
+        intent.putExtra(BeaconService.SERVER_ID_KEY, loginMachineId);
+        intent.putExtra(BeaconService.NURSE_ID_KEY, nurseID);
+        intent.putExtra(BeaconService.NURSE_NAME_KEY, nurseName);
+        startService(intent);
+
     }
 
     @Override

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

@@ -16,6 +16,7 @@ import java.util.TimerTask;
 
 public class APPService extends Service {
 
+    private String TAG = APPService.class.getSimpleName();
     ServiceBinder myBinder = new ServiceBinder();
 
     @Override
@@ -51,11 +52,11 @@ public class APPService extends Service {
                 try {
                     String loginMachineId = SharedPreferencesUtil.getStringSp(SharedPreferencesUtil.LOGIN_MACHINEID);
                     String message = "{\"type\":\"pong\",\"MachineID\":" + "\"" + loginMachineId + "\"" + ",\"DeviceType\":\"2\"}";
-                    LogUtil.d("APPService", "message==" + message);
+                    LogUtil.d(TAG, "message==" + message);
                     WebsocketUtil.getInstance().getWebSocket().send(message);
-                    LogUtil.d("APPService", "1_send_ok");
+                    LogUtil.d(TAG, "1_send_ok");
                 } catch (Exception e) {
-                    LogUtil.d("APPService", "WebSocket Send Message Was Exception");
+                    LogUtil.d(TAG, "WebSocket Send Message Was Exception");
                 }
             }
         };

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

@@ -34,14 +34,13 @@ import okhttp3.RequestBody;
 
 public class BeaconService extends Service implements BeaconConsumer, RangeNotifier {
 
+    private static final String TAG = "BeaconService";
     public static final String SERVER_ID_KEY = BeaconService.class.getName() + ".SERVER_ID_KEY";
 
     public static final String NURSE_ID_KEY = BeaconService.class.getName() + ".NURSE_ID_KEY";
 
     public static final String NURSE_NAME_KEY = BeaconService.class.getName() + ".NURSE_NAME_KEY";
 
-    private static final String TAG = "BeaconService";
-
     private static final String UPDATE_BEACON_INFO_URL = "http://id.wdklian.com:10018/api/Beacon/UpdateBeaconPosition";
 
     private static final String BEACON_FORMAT = "m:2-3=0215,i:4-19,i:20-21,i:22-23,p:24-24";
@@ -134,18 +133,18 @@ public class BeaconService extends Service implements BeaconConsumer, RangeNotif
                         final JSONObject tmp = new JSONObject();
                         tmp.put("name", beacon.getBluetoothName());
                         tmp.put("address", beacon.getBluetoothAddress());
-                        tmp.put("UUID", beacon.getId1().toString());
+                        tmp.put("uuid", beacon.getId1().toString());
                         tmp.put("major", beacon.getId2().toInt());
                         tmp.put("minor", beacon.getId3().toInt());
                         tmp.put("txPower", beacon.getTxPower());
-                        tmp.put("RSSI", beacon.getRssi());
+                        tmp.put("rssi", beacon.getRssi());
                         tmp.put("distance", beacon.getDistance());
 
                         array.put(tmp);
                     }
 
                     obj.put("beaconInfos", array);
-
+                    Log.e(TAG,"obj "+obj.toString());
                     final Request request = new Request.Builder()
                             .url(UPDATE_BEACON_INFO_URL)
                             .put(RequestBody.create(obj.toString(), MediaType.parse("application/json")))
@@ -153,6 +152,8 @@ public class BeaconService extends Service implements BeaconConsumer, RangeNotif
 
                     okHttpClient.newCall(request).execute();
                 } catch (Exception ignore) {
+
+                    Log.e(TAG,ignore.getMessage());
                 }
             }
         });

app/src/main/java/com/wdkl/nursewatch/utils/SaveCallListUtil.java

@@ -9,7 +9,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class SaveCallListUtil {
-
+    /**
+     * 获取所有的呼叫记录
+     * @return
+     */
     public static List<MessageEntity> getCallList() {
         String callListStr = SharedPreferencesUtil.getStringSp(SharedPreferencesUtil.CALLING_LIST);
         if (!StringUtils.notEmpty(callListStr)) return null;
@@ -17,6 +20,11 @@ public class SaveCallListUtil {
         }.getType());
     }
 
+    /**
+     * 添加一个呼叫记录
+     * @param messageEntity
+     * @return
+     */
     public static boolean saveCallEntity(MessageEntity messageEntity) {
         if (null == messageEntity) return false;
         try {
@@ -36,6 +44,11 @@ public class SaveCallListUtil {
         return true;
     }
 
+    /**
+     * 删除呼叫机记录中的一条
+     * @param messageEntity
+     * @return
+     */
     public static boolean deleteCallEntity(MessageEntity messageEntity) {
         if (null == messageEntity) return false;
         try {
@@ -57,6 +70,9 @@ public class SaveCallListUtil {
         return true;
     }
 
+    /**
+     * 删除所有的呼叫记录
+     */
     public static void deleteAllEntity() {
         try {
             List<MessageEntity> list = new ArrayList<>();
@@ -69,8 +85,8 @@ public class SaveCallListUtil {
 
 
     /**
-     * 当前呼叫
-     */
+     * 获取当前呼叫总数
+     * */
     public static List<MessageEntity> getCallListNow() {
         String callListStr = SharedPreferencesUtil.getStringSp(SharedPreferencesUtil.CALLING_LIST_NOW);
         if (!StringUtils.notEmpty(callListStr)) return null;
@@ -78,6 +94,11 @@ public class SaveCallListUtil {
         }.getType());
     }
 
+    /**
+     * 添加一个当前呼叫
+     * @param messageEntity
+     * @return
+     */
     public static boolean saveCallEntityNow(MessageEntity messageEntity) {
         if (null == messageEntity) return false;
         try {
@@ -97,6 +118,11 @@ public class SaveCallListUtil {
         return true;
     }
 
+    /**
+     * 删除当前呼叫中的一个
+     * @param messageEntity
+     * @return
+     */
     public static boolean deleteCallEntityNow(MessageEntity messageEntity) {
         if (null == messageEntity) return false;
         try {
@@ -120,6 +146,9 @@ public class SaveCallListUtil {
         return true;
     }
 
+    /**
+     * 删除当前所有的呼叫
+     */
     public static void deleteAllEntityNow() {
         try {
             List<MessageEntity> list = new ArrayList<>();

app/src/main/java/com/wdkl/nursewatch/utils/TimeUtil.java

@@ -49,12 +49,19 @@ public class TimeUtil {
         date1 = new Date();
     }
 
-
+    /**
+     * 获取年月日 周几
+     * @return
+     */
     public String getDataTime() {
         date1 = new Date();
         return sdfInput.format(date1).toString();
     }
 
+    /**
+     * 获取时分秒
+     * @return
+     */
     public String getTime() {
         date2 = new Date();
         return timeInput.format(date2).toString();
@@ -145,6 +152,10 @@ public class TimeUtil {
         }
     }
 
+    /**
+     * 时间做密码
+     * @return
+     */
     public static String getPassWord() {
         String PassWord = "";
         Calendar cal = Calendar.getInstance();
@@ -154,7 +165,10 @@ public class TimeUtil {
         return PassWord;
     }
 
-
+    /**
+     * 获取系统权限
+     * @return
+     */
     public static boolean isRoot() {
         try {
             Process process = Runtime.getRuntime().exec("su");

app/src/main/java/com/wdkl/nursewatch/utils/WebsocketUtil.java

@@ -1,6 +1,7 @@
 package com.wdkl.nursewatch.utils;
 
 import android.support.annotation.Nullable;
+import android.util.Log;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -24,16 +25,18 @@ import okio.ByteString;
 
 public class WebsocketUtil {
 
+
+    private String TAG = WebsocketUtil.class.getSimpleName();
+
     public static String serverUrl = "ws://id.wdklian.com:10011/call";
     //public static String serverUrl = "ws://192.168.3.88:10011/call";//吴总做测试 20190417
 
-
-    public static int WEBSOCKET_SUCCESS = 0;
-    public static int WEBSOCKET_ONOPEN = 1;
-    public static int WEBSOCKET_ONCLOSING = 2;
-    public static int WEBSOCKET_ONCLOSED = 3;
-    public static int WEBSOCKET_ONFAILURE = 4;
-    public static int WEBSOCKET_STATE = -1;
+    public static int WEBSOCKET_SUCCESS = 0;      //连接成功
+    public static int WEBSOCKET_ONOPEN = 1;      //通道开放
+    public static int WEBSOCKET_ONCLOSING = 2;   //正在关闭
+    public static int WEBSOCKET_ONCLOSED = 3;   //通道关闭
+    public static int WEBSOCKET_ONFAILURE = 4; //连接失败
+    public static int WEBSOCKET_STATE = -1;    //连接状态
 
     public OkHttpClient client;
     public WebSocket webSocket;
@@ -70,7 +73,7 @@ public class WebsocketUtil {
     }
 
     public void connect(String machineID, String nurseID) {
-        LogUtil.d("connect", "machineID==" + machineID + "==nurseID==" + nurseID);
+        LogUtil.d(TAG, "connect machineID==" + machineID + "==nurseID==" + nurseID);
         if (!StringUtils.notEmpty(machineID)) return;
         WebsocketEntity websocketEntity = new WebsocketEntity();
         websocketEntity.setMachineID(machineID);
@@ -117,7 +120,7 @@ public class WebsocketUtil {
 
         @Override
         public void onOpen(WebSocket webSocket, Response response) {
-            LogUtil.d("WebSocketListener", "onOpen==0");
+            LogUtil.d(TAG, "onOpen==0");
             WEBSOCKET_STATE = WEBSOCKET_ONOPEN;
             EventBus.getDefault().post(new MessageEvent("onOpen", Constants.EVENT_LOGIN_STATUS_MESSAGE));
             sendMessageForWS();
@@ -125,18 +128,20 @@ public class WebsocketUtil {
 
         @Override
         public void onMessage(WebSocket webSocket, String text) {//收到文本信息
-            LogUtil.d("WebSocketListener", "onMessage==1" + "text==" + text);
+            LogUtil.d(TAG, "onMessage==1" + "text==" + text);
             WEBSOCKET_STATE = WEBSOCKET_SUCCESS;
             // 0:索引 1:主机id 2:门口机id 3:子机id 4:sip地址 5:房间号 6:床号 7:护理等级 8:消息类型 9:名称
             if ("Hello!".equals(text)) {
                 EventBus.getDefault().post(new MessageEvent("success", Constants.EVENT_LOGIN_STATUS_MESSAGE));
             } else if (text.equals("{\"type\":\"ping\"}")) {
-                LogUtil.d("WebSocketListener", "服务端收到心跳信号，返回来了");
+                LogUtil.d(TAG, "onMessage 服务端收到心跳信号，返回来了");
             } else {
+                Log.e(TAG,"onMessage..."+text);
+
                 if (Constants.IS_LOGOUT) return;
                 WebsocketEntityReal websocketEntityReal = gson.fromJson(text, WebsocketEntityReal.class);
                 text = websocketEntityReal.getUDPData();
-                if (!text.equals("") && "$".equals(text.substring(0, 1))) {//判断是否为美元符号开头，如果是则是android 端的命令
+                if (!text.equals("") && "$".equals(text.substring(0, 1))) { //判断是否为美元符号开头，如果是则是android 端的命令
                     text = delHeadAndEnd(text, "$", "#");
                     String[] data = text.split("\\|");
 
@@ -149,13 +154,13 @@ public class WebsocketUtil {
         @Override
         public void onMessage(WebSocket webSocket, ByteString bytes) {//收到二进制信息
             WEBSOCKET_STATE = WEBSOCKET_SUCCESS;
-            LogUtil.d("WebSocketListener", "onMessage==2");
+            LogUtil.d(TAG, "onMessage==2");
             if (Constants.IS_LOGOUT) return;
         }
 
         @Override
         public void onClosing(WebSocket webSocket, int code, String reason) {
-            LogUtil.d("WebSocketListener", "onClosing==3");
+            LogUtil.d(TAG, "onClosing==3");
             WEBSOCKET_STATE = WEBSOCKET_ONCLOSING;
             webSocket.close(NORMAL_CLOSURE_STATUS, reason);
             connectWS();
@@ -164,7 +169,7 @@ public class WebsocketUtil {
 
         @Override
         public void onClosed(WebSocket webSocket, int code, String reason) {
-            LogUtil.d("WebSocketListener", "onClosed==303");
+            LogUtil.d(TAG, "onClosed==303");
             WEBSOCKET_STATE = WEBSOCKET_ONCLOSED;
             connectWS();
             EventBus.getDefault().post(new MessageEvent("onClosed", Constants.EVENT_LOGIN_STATUS_MESSAGE));
@@ -172,7 +177,7 @@ public class WebsocketUtil {
 
         @Override
         public void onFailure(WebSocket webSocket, Throwable t, @Nullable Response response) {
-            LogUtil.d("WebSocketListener", "onFailure==4");
+            LogUtil.d(TAG, "onFailure==4");
             WEBSOCKET_STATE = WEBSOCKET_ONFAILURE;
             connectWS();
             EventBus.getDefault().post(new MessageEvent("onFailure", Constants.EVENT_LOGIN_STATUS_MESSAGE));
@@ -186,9 +191,9 @@ public class WebsocketUtil {
         try {
             //String sendMessage = "{\"UDPData\":\"\",\"MachineID\":" + "\"" + websocketEntity.getMachineID() + "\"" + ",\"DeviceType\":\"2\"}";
             String sendMessage = new Gson().toJson(websocketEntity);
-            LogUtil.d("sendMessageForWS", "sendMessage==" + sendMessage);
+            LogUtil.d(TAG, "sendMessage==" + sendMessage);
             WebsocketUtil.getInstance().getWebSocket().send(sendMessage);
-            LogUtil.d("sendMessageForWS", "2_send_ok");
+            LogUtil.d(TAG, "2_send_ok");
         } catch (Exception e) {
         }
     }
@@ -203,9 +208,9 @@ public class WebsocketUtil {
     }
 
     public synchronized void onMessageCall(String text, String[] data) {
-        LogUtil.d("onMessageCall", data.toString());
+        LogUtil.d(TAG, data.toString());
         if (!Constants.UDP_WS_DATA.equals(text)) {
-            LogUtil.d("onMessageCall", "onMessageCall222");
+            LogUtil.d(TAG, "onMessageCall222");
             Constants.UDP_WS_DATA = text;
             MessageEntity messageEntity = new MessageEntity();
             if (data[8].equals(Constants.SON_CALL)) {//床头机呼叫
@@ -292,7 +297,7 @@ public class WebsocketUtil {
                 source = source.substring(0, source.length() - 1);
             }
         } catch (Exception e) {
-            LogUtil.d("delHeadAndEnd", "Exception");
+            LogUtil.d("delHeadAndEnd", "delHeadAndEnd Exception");
         }
 
         return source;