diff --git a/android/OldPeopleHome/.idea/libraries/__local_aars___E__BigProject_android_OldPeopleHome_app_libs_BaiduLBS_Android_jar_unspecified_jar.xml b/android/OldPeopleHome/.idea/libraries/__local_aars___E__BigProject_android_OldPeopleHome_app_libs_BaiduLBS_Android_jar_unspecified_jar.xml new file mode 100644 index 0000000..e6ce4a1 --- /dev/null +++ b/android/OldPeopleHome/.idea/libraries/__local_aars___E__BigProject_android_OldPeopleHome_app_libs_BaiduLBS_Android_jar_unspecified_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/android/OldPeopleHome/.idea/workspace.xml b/android/OldPeopleHome/.idea/workspace.xml index 26e0273..8d9a63e 100644 --- a/android/OldPeopleHome/.idea/workspace.xml +++ b/android/OldPeopleHome/.idea/workspace.xml @@ -26,30 +26,136 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -58,12 +164,15 @@ + + + - + @@ -72,13 +181,26 @@ + + + + + + + + + + - - - + + + + + + @@ -1917,8 +2039,6 @@ @@ -1992,7 +2114,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2019,186 +2213,54 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2230,6 +2292,24 @@ + + + + + + + @@ -2299,7 +2379,8 @@ @@ -2346,7 +2427,8 @@ @@ -2528,12 +2610,19 @@ - + + + + + + + - + - - - - - - - - - + - - + - + + + + + - + + + + + @@ -2613,6 +2701,7 @@ + @@ -2626,20 +2715,6 @@ - - - - - - - - - - - - - - @@ -2670,14 +2745,14 @@ - - - + + + @@ -2736,34 +2811,34 @@ - - - - - + + - - + + + + + @@ -2773,20 +2848,13 @@ - - - - - - - - - + + @@ -2796,14 +2864,6 @@ - - - - - - - - @@ -2870,31 +2930,28 @@ - - - - - - - + + - + + + @@ -2910,7 +2967,6 @@ - @@ -2949,7 +3005,6 @@ - @@ -2957,7 +3012,6 @@ - @@ -2965,7 +3019,6 @@ - @@ -2973,7 +3026,6 @@ - @@ -2989,47 +3041,28 @@ - - - - - - - - - - - + - - - - - - - + - - - @@ -3038,14 +3071,60 @@ + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/android/OldPeopleHome/app/build.gradle b/android/OldPeopleHome/app/build.gradle index b038e9d..719c5f2 100644 --- a/android/OldPeopleHome/app/build.gradle +++ b/android/OldPeopleHome/app/build.gradle @@ -20,10 +20,15 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + sourceSets { + main { + jniLibs.srcDir 'libs' + } + } } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'com.android.support.constraint:constraint-layout:1.1.3' testImplementation 'junit:junit:4.12' @@ -32,29 +37,24 @@ dependencies { implementation 'com.android.support:design:27.1.1' //cardview implementation 'com.android.support:cardview-v7:27.1.1' - //glide butter implementation 'com.jakewharton:butterknife:8.8.0' annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.0' implementation 'com.github.bumptech.glide:glide:4.9.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0' implementation 'com.android.support:recyclerview-v7:27.1.1' - //横向进度条 implementation 'me.zhouzhuo.zzhorizontalprogressbar:zz-horizontal-progressbar:1.1.0' implementation 'me.itangqi.waveloadingview:library:0.3.5' - //MP Chart implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3' - //indicator implementation 'com.ryanjeffreybrooks:indefinitepagerindicator:1.0.10' - //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') + implementation files('libs/BaiduLBS_Android.jar') } diff --git a/android/OldPeopleHome/app/libs/BaiduLBS_Android.jar b/android/OldPeopleHome/app/libs/BaiduLBS_Android.jar new file mode 100644 index 0000000..480b1f9 Binary files /dev/null and b/android/OldPeopleHome/app/libs/BaiduLBS_Android.jar differ diff --git a/android/OldPeopleHome/app/libs/arm64-v8a/libBaiduMapSDK_base_v5_4_4.so b/android/OldPeopleHome/app/libs/arm64-v8a/libBaiduMapSDK_base_v5_4_4.so new file mode 100644 index 0000000..4d55860 Binary files /dev/null and b/android/OldPeopleHome/app/libs/arm64-v8a/libBaiduMapSDK_base_v5_4_4.so differ diff --git a/android/OldPeopleHome/app/libs/arm64-v8a/libBaiduMapSDK_map_v5_4_4.so b/android/OldPeopleHome/app/libs/arm64-v8a/libBaiduMapSDK_map_v5_4_4.so new file mode 100644 index 0000000..a5e3582 Binary files /dev/null and b/android/OldPeopleHome/app/libs/arm64-v8a/libBaiduMapSDK_map_v5_4_4.so differ diff --git a/android/OldPeopleHome/app/libs/arm64-v8a/liblocSDK7d.so b/android/OldPeopleHome/app/libs/arm64-v8a/liblocSDK7d.so new file mode 100644 index 0000000..5c28d91 Binary files /dev/null and b/android/OldPeopleHome/app/libs/arm64-v8a/liblocSDK7d.so differ diff --git a/android/OldPeopleHome/app/libs/armeabi-v7a/libBaiduMapSDK_base_v5_4_4.so b/android/OldPeopleHome/app/libs/armeabi-v7a/libBaiduMapSDK_base_v5_4_4.so new file mode 100644 index 0000000..04469ad Binary files /dev/null and b/android/OldPeopleHome/app/libs/armeabi-v7a/libBaiduMapSDK_base_v5_4_4.so differ diff --git a/android/OldPeopleHome/app/libs/armeabi-v7a/libBaiduMapSDK_map_v5_4_4.so b/android/OldPeopleHome/app/libs/armeabi-v7a/libBaiduMapSDK_map_v5_4_4.so new file mode 100644 index 0000000..4cd36c7 Binary files /dev/null and b/android/OldPeopleHome/app/libs/armeabi-v7a/libBaiduMapSDK_map_v5_4_4.so differ diff --git a/android/OldPeopleHome/app/libs/armeabi-v7a/liblocSDK7d.so b/android/OldPeopleHome/app/libs/armeabi-v7a/liblocSDK7d.so new file mode 100644 index 0000000..4901501 Binary files /dev/null and b/android/OldPeopleHome/app/libs/armeabi-v7a/liblocSDK7d.so differ diff --git a/android/OldPeopleHome/app/libs/armeabi/libBaiduMapSDK_base_v5_4_4.so b/android/OldPeopleHome/app/libs/armeabi/libBaiduMapSDK_base_v5_4_4.so new file mode 100644 index 0000000..8ca6a28 Binary files /dev/null and b/android/OldPeopleHome/app/libs/armeabi/libBaiduMapSDK_base_v5_4_4.so differ diff --git a/android/OldPeopleHome/app/libs/armeabi/libBaiduMapSDK_map_v5_4_4.so b/android/OldPeopleHome/app/libs/armeabi/libBaiduMapSDK_map_v5_4_4.so new file mode 100644 index 0000000..195d906 Binary files /dev/null and b/android/OldPeopleHome/app/libs/armeabi/libBaiduMapSDK_map_v5_4_4.so differ diff --git a/android/OldPeopleHome/app/libs/armeabi/liblocSDK7d.so b/android/OldPeopleHome/app/libs/armeabi/liblocSDK7d.so new file mode 100644 index 0000000..37f9942 Binary files /dev/null and b/android/OldPeopleHome/app/libs/armeabi/liblocSDK7d.so differ diff --git a/android/OldPeopleHome/app/libs/x86/libBaiduMapSDK_base_v5_4_4.so b/android/OldPeopleHome/app/libs/x86/libBaiduMapSDK_base_v5_4_4.so new file mode 100644 index 0000000..f1477aa Binary files /dev/null and b/android/OldPeopleHome/app/libs/x86/libBaiduMapSDK_base_v5_4_4.so differ diff --git a/android/OldPeopleHome/app/libs/x86/libBaiduMapSDK_map_v5_4_4.so b/android/OldPeopleHome/app/libs/x86/libBaiduMapSDK_map_v5_4_4.so new file mode 100644 index 0000000..310c43d Binary files /dev/null and b/android/OldPeopleHome/app/libs/x86/libBaiduMapSDK_map_v5_4_4.so differ diff --git a/android/OldPeopleHome/app/libs/x86/liblocSDK7d.so b/android/OldPeopleHome/app/libs/x86/liblocSDK7d.so new file mode 100644 index 0000000..11800e6 Binary files /dev/null and b/android/OldPeopleHome/app/libs/x86/liblocSDK7d.so differ diff --git a/android/OldPeopleHome/app/libs/x86_64/libBaiduMapSDK_base_v5_4_4.so b/android/OldPeopleHome/app/libs/x86_64/libBaiduMapSDK_base_v5_4_4.so new file mode 100644 index 0000000..f4beca1 Binary files /dev/null and b/android/OldPeopleHome/app/libs/x86_64/libBaiduMapSDK_base_v5_4_4.so differ diff --git a/android/OldPeopleHome/app/libs/x86_64/libBaiduMapSDK_map_v5_4_4.so b/android/OldPeopleHome/app/libs/x86_64/libBaiduMapSDK_map_v5_4_4.so new file mode 100644 index 0000000..7df2e8f Binary files /dev/null and b/android/OldPeopleHome/app/libs/x86_64/libBaiduMapSDK_map_v5_4_4.so differ diff --git a/android/OldPeopleHome/app/libs/x86_64/liblocSDK7d.so b/android/OldPeopleHome/app/libs/x86_64/liblocSDK7d.so new file mode 100644 index 0000000..2ecbf28 Binary files /dev/null and b/android/OldPeopleHome/app/libs/x86_64/liblocSDK7d.so differ diff --git a/android/OldPeopleHome/app/proguard-rules.pro b/android/OldPeopleHome/app/proguard-rules.pro index f1b4245..0526532 100644 --- a/android/OldPeopleHome/app/proguard-rules.pro +++ b/android/OldPeopleHome/app/proguard-rules.pro @@ -19,3 +19,6 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile +-keep class com.baidu.** {*;} +-keep class mapsdkvi.com.** {*;} +-dontwarn com.baidu.** \ No newline at end of file diff --git a/android/OldPeopleHome/app/src/main/AndroidManifest.xml b/android/OldPeopleHome/app/src/main/AndroidManifest.xml index 9585b7f..4bbf570 100644 --- a/android/OldPeopleHome/app/src/main/AndroidManifest.xml +++ b/android/OldPeopleHome/app/src/main/AndroidManifest.xml @@ -34,6 +34,10 @@ + + + + + + + + + + diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/OldPeopleHome.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/OldPeopleHome.java index 4711346..17b3a41 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/OldPeopleHome.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/OldPeopleHome.java @@ -2,16 +2,48 @@ package com.scorpiomiku.oldpeoplehome; import android.app.Application; +import com.baidu.location.BDAbstractLocationListener; +import com.baidu.location.BDLocation; +import com.baidu.location.LocationClient; +import com.baidu.location.LocationClientOption; +import com.scorpiomiku.oldpeoplehome.utils.LogUtils; + /** * Created by ScorpioMiku on 2019/8/17. */ public class OldPeopleHome extends Application { public static OldPeopleHome mInstance; + private LocationClient mLocationClient = null; @Override public void onCreate() { super.onCreate(); mInstance = this; + mLocationClient = new LocationClient(getApplicationContext()); + mLocationClient.registerLocationListener(new BDAbstractLocationListener() { + @Override + public void onReceiveLocation(BDLocation bdLocation) { + double latitude = bdLocation.getLatitude(); //获取纬度信息 + double longitude = bdLocation.getLongitude(); //获取经度信息 + float radius = bdLocation.getRadius(); //获取定位精度，默认值为0.0f + //获取经纬度坐标类型，以LocationClientOption中设置过的坐标类型为准 + String coorType = bdLocation.getCoorType(); + //获取定位类型、定位错误返回码，具体信息可参照类参考中BDLocation类中的说明 + int errorCode = bdLocation.getLocType(); +// LogUtils.logd(latitude + ";" + longitude + ";" + radius + ";" + coorType + ";" + errorCode); + } + }); + LocationClientOption option = new LocationClientOption(); + option.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy); + option.setCoorType("bd0911"); + option.setScanSpan(10000); + option.setOpenGps(true); + option.setLocationNotify(true); + option.setIgnoreKillProcess(false); + option.SetIgnoreCacheException(false); + option.setWifiCacheTimeOut(5 * 60 * 1000); + mLocationClient.setLocOption(option); + mLocationClient.start(); } } 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 bf6cdb1..44088d5 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 @@ -638,8 +638,6 @@ public class OldPeopleMainActivity extends BaseActivity { private void getNewHandData() { try { mService.getCurSportData(); -// mService.getDataByDay(2, 0); //获取心率 -// mService.setAutoHeartMode(true,) for (int i = 5; i >= 0; i--) { }