修改bug

uniplugin_module/src/main/java/com/sxr/sdk/ble/keepfit/TestModule.java

@@ -47,9 +47,12 @@ public class TestModule extends WXModule {
     }
 
     @JSMethod (uiThread = true)
-    public void gotoNativePage(){
+    public void gotoNativePage(JSONObject options, JSCallback callback){
+
+        Log.e("brcuserid", "UNIAPP传参----"+options);
         if(mWXSDKInstance != null && mWXSDKInstance.getContext() instanceof Activity) {
             Intent intent = new Intent(mWXSDKInstance.getContext(), GyeeActivity.class);
+            intent.putExtra("userId", options.getString("brcuserid"));
 //            ((Activity)mWXSDKInstance.getContext()).startActivityForResult(intent, REQUEST_CODE);
             mWXSDKInstance.getContext().startActivity(intent);
             

uniplugin_module/src/main/java/com/sxr/sdk/ble/keepfit/client/GyeeActivity.java

@@ -1,27 +1,15 @@
 package com.sxr.sdk.ble.keepfit.client;
 
-import android.Manifest;
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
-import android.os.Process;
-import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.telephony.TelephonyManager;
 import android.text.Html;
 import android.util.Log;
 import android.view.Gravity;
@@ -36,7 +24,6 @@ import android.widget.ListView;
 import android.widget.PopupWindow;
 import android.widget.ScrollView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.sxr.sdk.ble.keepfit.bean.BleDeviceItem;
 import com.sxr.sdk.ble.keepfit.client.adapter.ListDeviceViewAdapter;
@@ -45,8 +32,9 @@ import com.sxr.sdk.ble.keepfit.service.ReportService;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 import java.util.Locale;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -72,6 +60,10 @@ public class GyeeActivity extends Activity {
      */
     public static final int MSG_CODE_DISCONNECTED_REACELET = 11;
 
+    public String userId;
+
+    private Timer timer = new Timer();
+
     private ProgressDialog progressDialog;
 
     @BindView(R2.id.phone_number)
@@ -114,6 +106,9 @@ public class GyeeActivity extends Activity {
 //            initPermission();
 //        }
         reportIntent = new Intent(this, ReportService.class);
+        Intent intent = getIntent();
+        userId = intent.getStringExtra("userId");
+
         startService(reportIntent);
         initProgressDialog();
         initView();
@@ -150,35 +145,38 @@ public class GyeeActivity extends Activity {
             if (restBinder != null) {
                 if(restBinder.isBound() == true){
                     if (restBinder.callRemoteIsConnected() == false) {
-                        phoneNumber.setVisibility(View.GONE);
-                        btBind.setEnabled(false);
-                        btUnbind.setEnabled(true);
+//                        phoneNumber.setVisibility(View.GONE);
+//                        btBind.setEnabled(false);
+//                        btUnbind.setEnabled(true);
+
                         btScan.setEnabled(true);
                         btDisconnect.setEnabled(false);
                         llConnect.setVisibility(View.GONE);
                     } else {
-                        phoneNumber.setVisibility(View.GONE);
-                        btBind.setEnabled(false);
-                        btUnbind.setEnabled(true);
+//                        phoneNumber.setVisibility(View.GONE);
+//                        btBind.setEnabled(false);
+//                        btUnbind.setEnabled(true);
                         btScan.setEnabled(false);
                         btDisconnect.setEnabled(true);
                         llConnect.setVisibility(View.VISIBLE);
                     }
-                }else if (restBinder.callRemoteIsConnected() == false) {
-                    phoneNumber.setVisibility(View.VISIBLE);
-                    btBind.setEnabled(true);
-                    btUnbind.setEnabled(false);
-                    btScan.setEnabled(false);
-                    btDisconnect.setEnabled(false);
-                    llConnect.setVisibility(View.GONE);
+//                }
+//                else if (restBinder.callRemoteIsConnected() == false) {
+//                    phoneNumber.setVisibility(View.VISIBLE);
+//                    btBind.setEnabled(true);
+//                    btUnbind.setEnabled(false);
+//                    btScan.setEnabled(false);
+//                    btDisconnect.setEnabled(false);
+//                    llConnect.setVisibility(View.GONE);
                 }
+                eventBindDeviceService();
             }
             restBinder.setActivity(GyeeActivity.this);
             restBinder.setMessageHandler(messageHandler);
             restBinder.setScanDeviceHandler(scanDeviceHandler);
             restBinder.setUpdateConnectStateHandler(updateConnectStateHandler);
             restBinder.setDevicesData(devicesData);
-            restBinder.setMobile(phoneNumberStr);
+//            restBinder.setMobile(phoneNumberStr);
         }
 
         @Override
@@ -189,30 +187,30 @@ public class GyeeActivity extends Activity {
 
 
     private void initView() {
-        try {
-            TelephonyManager tm = (TelephonyManager) this.getSystemService(Context.TELEPHONY_SERVICE);
-            //        String deviceid = tm.getDeviceId();//获取智能设备唯一编号
-            if (ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_SMS) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_PHONE_NUMBERS) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) {
-                // TODO: Consider calling
-                //    ActivityCompat#requestPermissions
-                // here to request the missing permissions, and then overriding
-                //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
-                //                                          int[] grantResults)
-                // to handle the case where the user grants the permission. See the documentation
-                // for ActivityCompat#requestPermissions for more details.
-                return;
-            }
-            phoneNumberStr = tm.getLine1Number();//获取本机号码
-            System.out.println(phoneNumberStr);
-        } catch (Exception ex) {
-            System.out.println(ex.getMessage());
-        }
-
-        if (phoneNumberStr != null && phoneNumberStr.length() == 11) {
-            restBinder.setMobile(phoneNumberStr);
-        } else {
-            phoneNumber.setVisibility(View.VISIBLE);
-        }
+//        try {
+//            TelephonyManager tm = (TelephonyManager) this.getSystemService(Context.TELEPHONY_SERVICE);
+//            //        String deviceid = tm.getDeviceId();//获取智能设备唯一编号
+//            if (ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_SMS) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_PHONE_NUMBERS) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) {
+//                // TODO: Consider calling
+//                //    ActivityCompat#requestPermissions
+//                // here to request the missing permissions, and then overriding
+//                //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
+//                //                                          int[] grantResults)
+//                // to handle the case where the user grants the permission. See the documentation
+//                // for ActivityCompat#requestPermissions for more details.
+//                return;
+//            }
+//            phoneNumberStr = tm.getLine1Number();//获取本机号码
+//            System.out.println(phoneNumberStr);
+//        } catch (Exception ex) {
+//            System.out.println(ex.getMessage());
+//        }
+//
+//        if (phoneNumberStr != null && phoneNumberStr.length() == 11) {
+//            restBinder.setMobile(phoneNumberStr);
+//        } else {
+//            phoneNumber.setVisibility(View.VISIBLE);
+//        }
     }
 
     private boolean bColor = false;
@@ -250,35 +248,36 @@ public class GyeeActivity extends Activity {
     /**
      * 绑定设备（手环）服务
      */
-    @OnClick(R2.id.bind)
+//    @OnClick(R2.id.bind)
     void eventBindDeviceService() {
         //获取手机号码
-        if (phoneNumber.getVisibility() == View.VISIBLE) {
-            phoneNumberStr = phoneNumber.getText().toString().trim();
-            if (phoneNumberStr.length() != 11) {
-                Toast.makeText(this, "手机号格式错误", Toast.LENGTH_LONG).show();
-                return;
-            } else {
-                restBinder.setMobile(phoneNumberStr);
-                phoneNumber.setVisibility(View.GONE);
-            }
-        }
-
+//        if (phoneNumber.getVisibility() == View.VISIBLE) {
+//            phoneNumberStr = phoneNumber.getText().toString().trim();
+//            if (phoneNumberStr.length() != 11) {
+//                Toast.makeText(this, "手机号格式错误", Toast.LENGTH_LONG).show();
+//                return;
+//            } else {
+
+//                phoneNumber.setVisibility(View.GONE);
+////            }
+////        }
+        restBinder.setMobile(userId);
         //绑定手环服务
         restBinder.bindBraceletService();
     }
 
-    @OnClick(R2.id.unbind)
+//    @OnClick(R2.id.unbind)
     void eventUnBindDeviceService() {
         if (restBinder.isBound()) {
-            btBind.setEnabled(true);
-            btUnbind.setEnabled(false);
-            btScan.setEnabled(false);
+//            btBind.setEnabled(true);
+//            btUnbind.setEnabled(false);
+//            btScan.setEnabled(false);
             btDisconnect.setEnabled(false);
             llConnect.setVisibility(View.GONE);
-            phoneNumber.setVisibility(View.VISIBLE);
+//            phoneNumber.setVisibility(View.VISIBLE);
             //解绑手环服务
             restBinder.unBindBraceletService();
+            eventBindDeviceService();
         }
     }
 
@@ -295,6 +294,7 @@ public class GyeeActivity extends Activity {
      */
     @OnClick(R2.id.scan)
     void eventScanDevices() {
+        restBinder.setMobile(userId);
         scanDevices();
     }
 
@@ -305,6 +305,10 @@ public class GyeeActivity extends Activity {
     void eventRemoteDisconnect() {
         //断连事件
         restBinder.callRemoteDisconnect();
+        //解綁
+        eventUnBindDeviceService();
+        if (nearbyListAdapter != null)
+            nearbyListAdapter.clear();
     }
 
     /**
@@ -424,8 +428,8 @@ public class GyeeActivity extends Activity {
                     restBinder.callRemoteConnect(holder.name, holder.mac);
                     progressDialog.show();
                     dismissPopWindow();
+                    timer();
                 } catch (Exception e) {
-                    progressDialog.dismiss();
                     e.printStackTrace();
                     Log.e("BLE service", "ble connect ble device: excption");
                 }
@@ -457,19 +461,21 @@ public class GyeeActivity extends Activity {
             int state = data.getInt("state");
 
             if (state == 2) {
-                btBind.setEnabled(false);
-                btUnbind.setEnabled(true);
-                btScan.setEnabled(true);
+//                btBind.setEnabled(false);
+//                btUnbind.setEnabled(true);
+                btScan.setEnabled(false);
                 btDisconnect.setEnabled(true);
                 llConnect.setVisibility(View.VISIBLE);
                 progressDialog.dismiss();
             } else {
-                btBind.setEnabled(false);
-                btUnbind.setEnabled(true);
-                btScan.setEnabled(true);
+//                btBind.setEnabled(false);
+//                btUnbind.setEnabled(true);
+                btScan.setEnabled(false);
                 btDisconnect.setEnabled(false);
                 llConnect.setVisibility(View.GONE);
+//                progressDialog.dismiss();
             }
+
             return true;
         }
     });
@@ -502,20 +508,20 @@ public class GyeeActivity extends Activity {
             int what = msg.what;
 
             if (what == MSG_CODE_REMOTE_CONNECTED_BRACELET_IS_SUCCESS) {
-                btBind.setEnabled(false);
-                btUnbind.setEnabled(true);
+//                btBind.setEnabled(false);
+//                btUnbind.setEnabled(true);
                 btScan.setEnabled(true);
                 btDisconnect.setEnabled(true);
                 llConnect.setVisibility(View.GONE);
             } else if (what == MSG_CODE_REMOTE_CONNECTED_BRACELET_IS_FAILED) {
-                btBind.setEnabled(false);
-                btUnbind.setEnabled(true);
+//                btBind.setEnabled(false);
+//                btUnbind.setEnabled(true);
                 btScan.setEnabled(true);
                 btDisconnect.setEnabled(false);
                 llConnect.setVisibility(View.VISIBLE);
             } else if (what == MSG_CODE_DISCONNECTED_REACELET) {
-                btBind.setEnabled(true);
-                btUnbind.setEnabled(false);
+//                btBind.setEnabled(true);
+//                btUnbind.setEnabled(false);
                 btScan.setEnabled(false);
                 btDisconnect.setEnabled(false);
                 llConnect.setVisibility(View.GONE);
@@ -538,6 +544,20 @@ public class GyeeActivity extends Activity {
         progressDialog.setCancelable(false);//false不能取消显示，true可以取消显示
     }
 
+    /**
+     * 定时器===关闭正在加载弹窗
+     */
+    private void timer(){
+        TimerTask task = new TimerTask() {
+            @Override
+            public void run() {
+                progressDialog.dismiss();
+                timer.cancel();
+            }
+        };
+        timer.schedule(task,60*1000,60*1000);
+    }
+
 //    //申请两个权限，录音和文件读写
 //    //1、首先声明一个数组permissions，将需要的权限都放在里面
 //    String[] permissions = new String[]{

uniplugin_module/src/main/java/com/sxr/sdk/ble/keepfit/client/adapter/ListDeviceViewAdapter.java

@@ -86,6 +86,17 @@ public class ListDeviceViewAdapter extends BaseAdapter implements AdapterView.On
         this.type = type;
     }
 
+    public void clear(){
+        if (itemList != null)
+            itemList.clear();
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public void notifyDataSetChanged() {
+        super.notifyDataSetChanged();
+    }
+
     public class ViewHolder {
         TextView tvName;
         TextView address;

uniplugin_module/src/main/java/com/sxr/sdk/ble/keepfit/service/ReportService.java

@@ -24,7 +24,6 @@ import android.os.RemoteException;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.google.gson.Gson;
 import com.sxr.sdk.ble.keepfit.aidl.IRemoteService;
 import com.sxr.sdk.ble.keepfit.aidl.IServiceCallback;
 import com.sxr.sdk.ble.keepfit.bean.ReportData;
@@ -33,9 +32,7 @@ import com.sxr.sdk.ble.keepfit.client.ComparatorBleDeviceItem;
 import com.sxr.sdk.ble.keepfit.client.GyeeActivity;
 import com.sxr.sdk.ble.keepfit.client.RestService;
 import com.sxr.sdk.ble.keepfit.client.SysUtils;
-import com.sxr.sdk.ble.keepfit.request.SimpleRequest;
 
-import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -46,9 +43,6 @@ import java.util.Locale;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.observers.DefaultObserver;
-import okhttp3.ResponseBody;
-
 
 //接口地址:
 //
@@ -548,9 +542,12 @@ public class ReportService extends Service {
             }
 
             if (bExist == false) {
-                item = new BleDeviceItem(deviceName, deviceMacAddress, "", "", rssi, "");
-                devicesData.add(item);
-                Collections.sort(devicesData, new ComparatorBleDeviceItem());
+                if (deviceName.startsWith("Y"))
+                {
+                    item = new BleDeviceItem(deviceName, deviceMacAddress, "", "", rssi, "");
+                    devicesData.add(item);
+                    Collections.sort(devicesData, new ComparatorBleDeviceItem());
+                }
             }
 
             if (null != scanDeviceHandler) {
@@ -791,7 +788,8 @@ public class ReportService extends Service {
             if (locationManager != null && locationProvider != null && locationProvider != "") {
                 @SuppressLint("MissingPermission")
                 Location location = locationManager.getLastKnownLocation(locationProvider);
-                if (location != null) {
+
+                    if (location != null) {
                     reportData.setLat(location.getLatitude() + "");
                     reportData.setLng(location.getLongitude() + "");
                 }

uniplugin_module/src/main/res/layout/activity_gyee.xml

@@ -66,7 +66,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:layout_marginTop="15dp">
+            android:layout_marginTop="15dp"
+            android:visibility="gone">
 
             <Button
                 android:id="@+id/bind"
@@ -95,7 +96,7 @@
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:enabled="false"
+                android:enabled="true"
                 android:text="@string/scan" />
 
             <Button
@@ -131,13 +132,13 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:text="@string/set_vir" />
-
                     <Button
-                        android:id="@+id/getcursportdata"
+                        android:id="@+id/read_batery"
                         android:layout_width="0dip"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="@string/sync_time" />
+                        android:text="@string/read_batery" />
+
                 </LinearLayout>
 
                 <LinearLayout
@@ -147,39 +148,38 @@
                     android:layout_marginTop="15dp">
 
                     <Button
-                        android:id="@+id/read_fw"
+                        android:id="@+id/bt_open_blood"
                         android:layout_width="0dip"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="@string/read_deviceinfo" />
+                        android:text="开始测量" />
 
                     <Button
-                        android:id="@+id/read_batery"
+                        android:id="@+id/bt_close_blood"
                         android:layout_width="0dip"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="@string/read_batery" />
+                        android:text="关闭测量" />
                 </LinearLayout>
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
-                    android:layout_marginTop="15dp">
+                    android:layout_marginTop="15dp"
+                    android:visibility="gone">
 
                     <Button
-                        android:id="@+id/bt_open_blood"
+                        android:id="@+id/getcursportdata"
                         android:layout_width="0dip"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="开始测量" />
-
+                        android:text="@string/sync_time" />
                     <Button
-                        android:id="@+id/bt_close_blood"
+                        android:id="@+id/read_fw"
                         android:layout_width="0dip"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="关闭测量" />
+                        android:text="@string/read_deviceinfo" />
                 </LinearLayout>
             </LinearLayout>
         </ScrollView>

uniplugin_module/src/main/res/values/colors.xml

@@ -3,6 +3,6 @@
     
     <color name="white">#ffffff</color>
     <color name="black">#000000</color>
-    <color name="pop_window_bg">#ee000000</color>
+    <color name="pop_window_bg">#cc000000</color>
         
 </resources>