diff --git a/android/OldPeopleHome/app/build.gradle b/android/OldPeopleHome/app/build.gradle index 9ab2185..b038e9d 100644 --- a/android/OldPeopleHome/app/build.gradle +++ b/android/OldPeopleHome/app/build.gradle @@ -53,4 +53,8 @@ dependencies { //drawer implementation 'com.mxn.soul:flowingdrawer-core:2.1.0' implementation 'com.nineoldandroids:library:2.4.0' + + //SDK + implementation(name: 'android-smartband-sdk-sxrblejy2library-release', ext: 'aar') + implementation(name: 'android-smartband-sdk-sxrblejy2aidl-release', ext: 'aar') } diff --git a/android/OldPeopleHome/app/libs/android-smartband-sdk-sxrblejy2aidl-release.aar b/android/OldPeopleHome/app/libs/android-smartband-sdk-sxrblejy2aidl-release.aar new file mode 100644 index 0000000..a1fab6c Binary files /dev/null and b/android/OldPeopleHome/app/libs/android-smartband-sdk-sxrblejy2aidl-release.aar differ diff --git a/android/OldPeopleHome/app/libs/android-smartband-sdk-sxrblejy2library-release.aar b/android/OldPeopleHome/app/libs/android-smartband-sdk-sxrblejy2library-release.aar new file mode 100644 index 0000000..19fad8b Binary files /dev/null and b/android/OldPeopleHome/app/libs/android-smartband-sdk-sxrblejy2library-release.aar differ diff --git a/android/OldPeopleHome/app/src/main/AndroidManifest.xml b/android/OldPeopleHome/app/src/main/AndroidManifest.xml index 3c4e381..9585b7f 100644 --- a/android/OldPeopleHome/app/src/main/AndroidManifest.xml +++ b/android/OldPeopleHome/app/src/main/AndroidManifest.xml @@ -2,12 +2,43 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/OldPeopleHome/app/src/main/assets/JySDK.xml b/android/OldPeopleHome/app/src/main/assets/JySDK.xml new file mode 100644 index 0000000..b6577c4 --- /dev/null +++ b/android/OldPeopleHome/app/src/main/assets/JySDK.xml @@ -0,0 +1,6 @@ + + + 000001001101 + HUNEPX60P3KIDYH + b8FXJMzfELLOTM6BgGsFXmieePgqx1Ya50gPEUur + \ No newline at end of file diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/base/BaseActivity.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/base/BaseActivity.java index 7bb62dd..0a45587 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/base/BaseActivity.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/base/BaseActivity.java @@ -10,6 +10,8 @@ import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; +import com.scorpiomiku.oldpeoplehome.modules.loginregister.LoginActivity; + import butterknife.ButterKnife; /** @@ -52,7 +54,8 @@ public abstract class BaseActivity extends AppCompatActivity { Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.CAMERA, - Manifest.permission.SEND_SMS + Manifest.permission.SEND_SMS, + Manifest.permission.ACCESS_COARSE_LOCATION }, 1); } diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/BleDeviceItem.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/BleDeviceItem.java new file mode 100644 index 0000000..3732c20 --- /dev/null +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/BleDeviceItem.java @@ -0,0 +1,82 @@ +package com.scorpiomiku.oldpeoplehome.bean; + +public class BleDeviceItem { + private String bleDeviceName; + private String bleDeviceAddress; + private String nickname; + private String bindedDate; + private int rssi; + private String type; + + public BleDeviceItem() { + } + + public BleDeviceItem(String deviceName, String deviceAddress, String nickname, String bindedDate, int rssi, String type) { + setBleDeviceName(deviceName); + setBleDeviceAddress(deviceAddress); + setNickname(nickname); + setBindedDate(bindedDate); + setRssi(rssi); + setType(type); + } + + public String getBleDeviceName() { + return bleDeviceName; + } + + public void setBleDeviceName(String bleDeviceName) { + this.bleDeviceName = bleDeviceName; + } + + public String getBleDeviceAddress() { + return bleDeviceAddress; + } + + public void setBleDeviceAddress(String bleDeviceAddress) { + this.bleDeviceAddress = bleDeviceAddress; + } + + public int getRssi() { + return rssi; + } + + public void setRssi(int rssi) { + this.rssi = rssi; + } + + public String getNickname() { + return nickname; + } + + public void setNickname(String nickname) { + this.nickname = nickname; + } + + public String getBindedDate() { + return bindedDate; + } + + public void setBindedDate(String bindedDate) { + this.bindedDate = bindedDate; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + @Override + public String toString() { + return "BleDeviceItem{" + + "bleDeviceName='" + bleDeviceName + '\'' + + ", bleDeviceAddress='" + bleDeviceAddress + '\'' + + ", nickname='" + nickname + '\'' + + ", bindedDate='" + bindedDate + '\'' + + ", rssi=" + rssi + + ", type='" + type + '\'' + + '}'; + } +} diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/SportData.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/SportData.java new file mode 100644 index 0000000..759add7 --- /dev/null +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/SportData.java @@ -0,0 +1,118 @@ +package com.scorpiomiku.oldpeoplehome.bean; + +/** + * Created by ScorpioMiku on 2019/8/23. + */ + +public class SportData { + + private String oldPeopleId; + private int type; + private String time; + private int step; + private int distance; + private int cal; + private int cursleeptime; + private int totalrunningtime; + private int steptime; + + public SportData(int type, String time, int step, int distance, int cal, int cursleeptime, + int totalrunningtime, int steptime, String oldPeopleId) { + this.type = type; + this.time = time; + this.step = step; + this.distance = distance; + this.cal = cal; + this.cursleeptime = cursleeptime; + this.totalrunningtime = totalrunningtime; + this.steptime = steptime; + this.oldPeopleId = oldPeopleId; + } + + @Override + public String toString() { + return "SportData{" + + "oldPeopleId='" + oldPeopleId + '\'' + + ", type=" + type + + ", time='" + time + '\'' + + ", step=" + step + + ", distance=" + distance + + ", cal=" + cal + + ", cursleeptime=" + cursleeptime + + ", totalrunningtime=" + totalrunningtime + + ", steptime=" + steptime + + '}'; + } + + public String getOldPeopleId() { + return oldPeopleId; + } + + public void setOldPeopleId(String oldPeopleId) { + this.oldPeopleId = oldPeopleId; + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + + public int getStep() { + return step; + } + + public void setStep(int step) { + this.step = step; + } + + public int getDistance() { + return distance; + } + + public void setDistance(int distance) { + this.distance = distance; + } + + public int getCal() { + return cal; + } + + public void setCal(int cal) { + this.cal = cal; + } + + public int getCursleeptime() { + return cursleeptime; + } + + public void setCursleeptime(int cursleeptime) { + this.cursleeptime = cursleeptime; + } + + public int getTotalrunningtime() { + return totalrunningtime; + } + + public void setTotalrunningtime(int totalrunningtime) { + this.totalrunningtime = totalrunningtime; + } + + public int getSteptime() { + return steptime; + } + + public void setSteptime(int steptime) { + this.steptime = steptime; + } +} diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/activity/ChildMainActivity.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/activity/ChildMainActivity.java index 69b5146..5c5ec27 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/activity/ChildMainActivity.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/activity/ChildMainActivity.java @@ -110,7 +110,6 @@ public class ChildMainActivity extends BaseActivity { }; navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener); initFragmentManager(); - checkPermission(); initToolbar(); } diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/LoginActivity.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/LoginActivity.java index d7ad476..9906f08 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/LoginActivity.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/LoginActivity.java @@ -1,8 +1,12 @@ package com.scorpiomiku.oldpeoplehome.modules.loginregister; +import android.Manifest; import android.content.Intent; +import android.content.pm.PackageManager; import android.os.Bundle; import android.os.Handler; +import android.support.v4.app.ActivityCompat; +import android.support.v4.content.ContextCompat; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -39,7 +43,7 @@ public class LoginActivity extends BaseActivity { @Override public void iniview() { - + checkPermission(); } @Override @@ -63,7 +67,7 @@ public class LoginActivity extends BaseActivity { public void onViewClicked(View view) { switch (view.getId()) { case R.id.login_btn_login: - Intent intent = new Intent(LoginActivity.this, ChildMainActivity.class); + Intent intent = new Intent(LoginActivity.this, OldPeopleMainActivity.class); startActivity(intent); finish(); break; @@ -71,4 +75,6 @@ public class LoginActivity extends BaseActivity { break; } } + + } diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java index ed27d8c..14c1058 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java @@ -1,30 +1,47 @@ package com.scorpiomiku.oldpeoplehome.modules.oldpeople.activity; -import android.Manifest; -import android.content.pm.PackageManager; +import android.content.ComponentName; +import android.content.Intent; +import android.content.ServiceConnection; import android.os.Bundle; import android.os.Handler; +import android.os.IBinder; +import android.os.RemoteException; import android.support.annotation.NonNull; import android.support.design.widget.BottomNavigationView; -import android.support.v4.app.ActivityCompat; +import android.support.design.widget.FloatingActionButton; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; -import android.support.v4.content.ContextCompat; import android.view.MenuItem; import android.widget.RelativeLayout; import com.scorpiomiku.oldpeoplehome.R; import com.scorpiomiku.oldpeoplehome.base.BaseActivity; import com.scorpiomiku.oldpeoplehome.base.BaseFragment; +import com.scorpiomiku.oldpeoplehome.bean.BleDeviceItem; +import com.scorpiomiku.oldpeoplehome.bean.SportData; import com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt.EnvironmentFragment; import com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt.HeartRateFragment; import com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt.MyInformationFragment; import com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt.SleepFragment; import com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt.StepFragment; +import com.scorpiomiku.oldpeoplehome.service.SampleBleService; +import com.scorpiomiku.oldpeoplehome.utils.ComparatorBleDeviceItem; +import com.scorpiomiku.oldpeoplehome.utils.LogUtils; import com.scorpiomiku.oldpeoplehome.utils.StatusBarUtils; +import com.sxr.sdk.ble.keepfit.aidl.IRemoteService; +import com.sxr.sdk.ble.keepfit.aidl.IServiceCallback; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.Iterator; +import java.util.Locale; import butterknife.BindView; import butterknife.ButterKnife; +import butterknife.OnClick; /** * Created by ScorpioMiku on 2019/8/18. @@ -35,7 +52,8 @@ public class OldPeopleMainActivity extends BaseActivity { RelativeLayout container; @BindView(R.id.navigation) BottomNavigationView navigation; - + @BindView(R.id.floating_button) + FloatingActionButton floatingButton; private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener; private FragmentManager fragmentManager; private BaseFragment[] fragments = { @@ -87,7 +105,7 @@ public class OldPeopleMainActivity extends BaseActivity { }; navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener); initFragmentManager(); - checkPermission(); + initBlueSDK(); } @Override @@ -145,4 +163,418 @@ public class OldPeopleMainActivity extends BaseActivity { } + //-------------blue + private IRemoteService mService; + private ArrayList nearbyItemList = new ArrayList<>(); + private ServiceConnection mServiceConnection; + private String mac; + private boolean bStart = false; + private String pathLog = "/jyClient/log/"; + private boolean bSave = true; + private IServiceCallback mServiceCallback = new IServiceCallback.Stub() { + @Override + public void onAuthSdkResult(int i) throws RemoteException { + + } + + @Override + public void onScanCallback(String deviceName, String deviceMacAddress, int rssi) throws RemoteException { +// LogUtils.logd("扫描ing"); + Iterator iter = nearbyItemList.iterator(); + BleDeviceItem item = null; + boolean bExist = false; + while (iter.hasNext()) { + item = iter.next(); + if (item.getBleDeviceAddress().equalsIgnoreCase(deviceMacAddress)) { + bExist = true; + item.setRssi(rssi); + break; + } + } + if (!bExist) { + item = new BleDeviceItem(deviceName, deviceMacAddress, "", "", rssi, ""); + nearbyItemList.add(item); + Collections.sort(nearbyItemList, new ComparatorBleDeviceItem()); + LogUtils.logList(nearbyItemList); + if (item.getBleDeviceName().equals("Y1-4389")) { + callRemoteDisconnect(); + mac = item.getBleDeviceAddress(); + callRemoteConnect(item.getBleDeviceName(), item.getBleDeviceAddress()); + } + } + } + + @Override + public void onConnectStateChanged(int state) throws RemoteException { + if (state == 2) { + LogUtils.logd("连接手环成功"); + getNewHandData(); + } else { + LogUtils.loge("断开连接:" + state); + } + } + + @Override + public void onAuthDeviceResult(int i) throws RemoteException { + + } + + @Override + public void onGetDeviceTime(int i, String s) throws RemoteException { + + } + + @Override + public void onSetDeviceTime(int i) throws RemoteException { + + } + + @Override + public void onSetUserInfo(int i) throws RemoteException { + + } + + @Override + public void onGetCurSportData(int type, long timestamp, int step, int distance, + int cal, int cursleeptime, int totalrunningtime, int steptime) throws RemoteException { + Date date = new Date(timestamp * 1000); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()); + String time = sdf.format(date); + SportData sportData = + new SportData(type, time, step, distance, cal, cursleeptime, totalrunningtime, steptime, "123"); + LogUtils.logd("获得新运动数据:" + sportData.toString()); + } + + @Override + public void onSendVibrationSignal(int i) throws RemoteException { + + } + + @Override + public void onSetPhontMode(int i) throws RemoteException { + + } + + @Override + public void onSetIdleTime(int i) throws RemoteException { + + } + + @Override + public void onSetSleepTime(int i) throws RemoteException { + + } + + @Override + public void onGetDeviceBatery(int i, int i1) throws RemoteException { + + } + + @Override + public void onGetDeviceInfo(int i, String s, String s1, String s2, int i1) throws RemoteException { + + } + + @Override + public void onSetAlarm(int i) throws RemoteException { + + } + + @Override + public void onSetDeviceMode(int i) throws RemoteException { + + } + + @Override + public void onSetNotify(int i) throws RemoteException { + + } + + @Override + public void onGetSenserData(int i, long l, int i1, int i2) throws RemoteException { + + } + + @Override + public void setAutoHeartMode(int i) throws RemoteException { + + } + + @Override + public void onSetDeviceInfo(int i) throws RemoteException { + + } + + @Override + public void onSetHourFormat(int i) throws RemoteException { + + } + + @Override + public void onGetDataByDay(int i, long l, int i1, int i2) throws RemoteException { + + } + + @Override + public void onGetDataByDayEnd(int i, long l) throws RemoteException { + + } + + @Override + public void onGetDeviceAction(int i) throws RemoteException { + + } + + @Override + public void onGetBandFunction(int i, boolean[] booleans) throws RemoteException { + + } + + @Override + public void onSetLanguage(int i) throws RemoteException { + + } + + @Override + public void onSendWeather(int i) throws RemoteException { + + } + + @Override + public void onSetAntiLost(int i) throws RemoteException { + + } + + @Override + public void onSetBloodPressureMode(int i) throws RemoteException { + + } + + @Override + public void onReceiveSensorData(int i, int i1, int i2, int i3, int i4) throws RemoteException { + + } + + @Override + public void onGetMultipleSportData(int i, String s, int i1, int i2) throws RemoteException { + + } + + @Override + public void onSetGoalStep(int i) throws RemoteException { + + } + + @Override + public void onSetDeviceHeartRateArea(int i) throws RemoteException { + + } + + @Override + public void onSensorStateChange(int i, int i1) throws RemoteException { + + } + + @Override + public void onReadCurrentSportData(int i, String s, int i1, int i2) throws RemoteException { + + } + + @Override + public void onGetOtaInfo(boolean b, String s, String s1) throws RemoteException { + + } + + @Override + public void onGetOtaUpdate(int i, int i1) throws RemoteException { + + } + + @Override + public void onSetDeviceCode(int i) throws RemoteException { + + } + + @Override + public void onGetDeviceCode(byte[] bytes) throws RemoteException { + + } + + @Override + public void onCharacteristicChanged(String s, byte[] bytes) throws RemoteException { + + } + + @Override + public void onCharacteristicWrite(String s, byte[] bytes, int i) throws RemoteException { + + } + }; + + /** + * SDK的绑定、扫描、蓝牙的选择 + */ + private void initBlueSDK() { + Intent gattServiceIntent = new Intent(this, + SampleBleService.class); + gattServiceIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + startService(gattServiceIntent); + mServiceConnection = new ServiceConnection() { + @Override + public void onServiceConnected(ComponentName componentName, IBinder service) { + LogUtils.shortToast("Service connected"); + + mService = IRemoteService.Stub.asInterface(service); + try { + mService.registerCallback(mServiceCallback); + mService.openSDKLog(bSave, pathLog, "blue.log"); + boolean isConnected = callRemoteIsConnected(); + + callRemoteScanDevice(); + if (!isConnected) { + + } else { + + int authrize = callRemoteIsAuthrize(); + LogUtils.logd("authrize:" + authrize); + } + + } catch (RemoteException e) { + e.printStackTrace(); + } + } + + @Override + public void onServiceDisconnected(ComponentName componentName) { + LogUtils.loge("Service disconnected"); + } + }; + /** + * 自动绑定服务 + */ + Intent intent = new Intent(IRemoteService.class.getName()); + intent.setClassName("com.scorpiomiku.oldpeoplehome", + "com.scorpiomiku.oldpeoplehome.service.SampleBleService"); + bindService(intent, mServiceConnection, BIND_AUTO_CREATE); + } + + /** + * 是否连接SDK成功 + * + * @return + */ + private boolean callRemoteIsConnected() { + boolean isConnected = false; + if (mService != null) { + try { + isConnected = mService.isConnectBt(); + } catch (RemoteException e) { + e.printStackTrace(); + LogUtils.shortToast("Remote call error!"); + } + } else { + LogUtils.shortToast("Service is not available yet!"); + } + + return isConnected; + } + + /** + * 确定权限 + * + * @return + */ + private int callRemoteIsAuthrize() { + int isAuthrize = 0; + if (mService != null) { + try { + isAuthrize = mService.isAuthrize(); + } catch (RemoteException e) { + e.printStackTrace(); + LogUtils.shortToast("Remote call error!"); + } + } else { + LogUtils.shortToast("Service is not available yet!"); + } + + return isAuthrize; + } + + /** + * 扫描蓝牙设备，自动进入回调 onScanCallback + */ + private void callRemoteScanDevice() { +// LogUtils.logd("开始扫描"); + if (nearbyItemList != null) + nearbyItemList.clear(); + + if (mService != null) { + try { + bStart = !bStart; + mService.scanDevice(bStart); + } catch (RemoteException e) { + e.printStackTrace(); + LogUtils.shortToast("Remote call error!"); + } + } else { + LogUtils.loge("scan:Service is not available yet!"); + } + } + + /** + * 删除当前连接的设备 + */ + private void callRemoteDisconnect() { + + if (mService != null) { + try { + mService.disconnectBt(true); + } catch (RemoteException e) { + e.printStackTrace(); + LogUtils.logd("callRemoteDisconnect: Remote call error!"); + } + } else { + LogUtils.logd("callRemoteDisconnect: Service is not available yet!"); + } + } + + /** + * 连接设备 + * + * @param name + * @param mac + */ + private void callRemoteConnect(String name, String mac) { + if (mac == null || mac.length() == 0) { + LogUtils.logd("callRemoteConnect: ble device mac address is not correctly!"); + return; + } + + if (mService != null) { + try { + mService.connectBt(name, mac); + } catch (RemoteException e) { + e.printStackTrace(); + LogUtils.loge("callRemoteConnect: Remote call error!"); + } + } else { + LogUtils.loge("callRemoteConnect: Service is not available yet!"); + } + } + + /** + * 主动获取数据函数 + */ + private void getNewHandData() { + try { + mService.getCurSportData(); + } catch (RemoteException e) { + e.printStackTrace(); + } + } + + @OnClick(R.id.floating_button) + public void onViewClicked() { + getNewHandData(); + } } diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/service/SampleBleService.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/service/SampleBleService.java new file mode 100644 index 0000000..3b5454e --- /dev/null +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/service/SampleBleService.java @@ -0,0 +1,11 @@ +package com.scorpiomiku.oldpeoplehome.service; + + +import com.sxr.sdk.ble.keepfit.service.BluetoothLeService; + +public class SampleBleService extends BluetoothLeService { + @Override + public void onCreate() { + super.onCreate(); + } +} diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/ComparatorBleDeviceItem.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/ComparatorBleDeviceItem.java new file mode 100644 index 0000000..8971d71 --- /dev/null +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/ComparatorBleDeviceItem.java @@ -0,0 +1,26 @@ +package com.scorpiomiku.oldpeoplehome.utils; + +import com.scorpiomiku.oldpeoplehome.bean.BleDeviceItem; + +import java.util.Comparator; + +public class ComparatorBleDeviceItem implements Comparator { + + @Override + public int compare(BleDeviceItem arg0, BleDeviceItem arg1) { + int rssi0 = arg0.getRssi(); + int rssi1 = arg1.getRssi(); + int result = 0; + if(rssi0 < rssi1) + { + result=1; + } + if(rssi0 > rssi1) + { + result=-1; + } + + return result; + } + +} diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/LogUtils.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/LogUtils.java index 77b3929..edfc298 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/LogUtils.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/LogUtils.java @@ -5,6 +5,8 @@ import android.widget.Toast; import com.scorpiomiku.oldpeoplehome.OldPeopleHome; +import java.util.List; + /** * Created by ScorpioMiku on 2019/8/18. */ @@ -19,4 +21,18 @@ public class LogUtils { public static void shortToast(String message) { Toast.makeText(OldPeopleHome.mInstance, message, Toast.LENGTH_SHORT).show(); } + + public static void loge(String message) { + Log.e(TAG, message); + } + + public static void logList(List list) { + String log = "[\n"; + for (Object item : + list) { + log += item.toString() + ";\n"; + } + log += "]"; + Log.d(TAG, log); + } } diff --git a/android/OldPeopleHome/app/src/main/res/layout/activity_old_people_main.xml b/android/OldPeopleHome/app/src/main/res/layout/activity_old_people_main.xml index ef3f7e7..08e3d97 100644 --- a/android/OldPeopleHome/app/src/main/res/layout/activity_old_people_main.xml +++ b/android/OldPeopleHome/app/src/main/res/layout/activity_old_people_main.xml @@ -8,25 +8,25 @@ tools:context="com.scorpiomiku.oldpeoplehome.modules.oldpeople.activity.OldPeopleMainActivity"> - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + @@ -36,6 +36,12 @@ android:layout_height="0dp" android:layout_weight="1"> + diff --git a/android/OldPeopleHome/build.gradle b/android/OldPeopleHome/build.gradle index a4cf0ed..27ce60d 100644 --- a/android/OldPeopleHome/build.gradle +++ b/android/OldPeopleHome/build.gradle @@ -25,6 +25,7 @@ allprojects { jcenter() mavenCentral() maven { url "https://jitpack.io" } + flatDir { dirs 'libs' } } } diff --git a/android/handcircle/JYOU PRO SDK/android-sdk-jy/~$190110-JYSDK使用说明.docx b/android/handcircle/JYOU PRO SDK/android-sdk-jy/~$190110-JYSDK使用说明.docx deleted file mode 100644 index 2115497..0000000 Binary files a/android/handcircle/JYOU PRO SDK/android-sdk-jy/~$190110-JYSDK使用说明.docx and /dev/null differ