From 3bd6e9023e011336da840e11a9d48bb31c7a0261 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Wed, 07 Nov 2018 09:31:59 +0800
Subject: [PATCH] [*]将电磁版本的唤醒心跳改成两秒，唤醒之后回到30一次心跳 [*]整体版本页面显示的绝对安全换成了安全 [*]自定义语音修改和优化，添加了无声的选择
---
app/src/main/java/com/moral/yunfushao/MainApp.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/moral/yunfushao/MainApp.java b/app/src/main/java/com/moral/yunfushao/MainApp.java
index a1c153d..403c979 100644
--- a/app/src/main/java/com/moral/yunfushao/MainApp.java
+++ b/app/src/main/java/com/moral/yunfushao/MainApp.java
@@ -3,11 +3,16 @@
import android.app.Application;
import android.bluetooth.BluetoothGattService;
+import com.baidu.location.BDLocation;
+import com.baidu.location.BDLocationListener;
+import com.baidu.location.LocationClient;
+import com.baidu.location.LocationClientOption;
import com.baidu.mapapi.SDKInitializer;
import com.clj.fastble.BleManager;
import com.lzy.okgo.OkGo;
import com.lzy.okgo.cookie.store.PersistentCookieStore;
import com.moral.andbrickslib.utils.log.XLog;
+import com.moral.yunfushao.common.AppConfig;
import com.moral.yunfushao.utils.SharedPreferencesUtil;
/**
@@ -24,6 +29,15 @@
*/
public BleManager bleManager;
public BluetoothGattService usrService;
+
+ /**
+ * ������������
+ */
+ LocationClient mLocClient;
+ public MyLocationListenner myListener;
+ public static double mLat, mLon;
+ public static String address;
+
@Override
public void onCreate() {
super.onCreate();
@@ -33,12 +47,50 @@
OkGo.init(this);
OkGo.getInstance().setCookieStore(new PersistentCookieStore());
- if(sharedPreferencesUtil == null){
+ if (sharedPreferencesUtil == null) {
sharedPreferencesUtil = new SharedPreferencesUtil(this);
}
-// userId = sharedPreferencesUtil.getUserid();
- userId = "1";
+ userId = sharedPreferencesUtil.getUserid();
+ if (MainApp.theApp.sharedPreferencesUtil.getVoiceType() == 0) {
+ AppConfig.voideUrl1 = "http://yfsapi.7drlb.com/video/boy/music.mp3";
+ AppConfig.voideUrl2 = "http://yfsapi.7drlb.com/video/boy/music1.mp3";
+ AppConfig.voideUrl3 = "http://yfsapi.7drlb.com/video/boy/music2.mp3";
+ } else if (MainApp.theApp.sharedPreferencesUtil.getVoiceType() == 1) {
+ AppConfig.voideUrl1 = "http://yfsapi.7drlb.com/video/girl/music.mp3";
+ AppConfig.voideUrl2 = "http://yfsapi.7drlb.com/video/girl/music1.mp3";
+ AppConfig.voideUrl3 = "http://yfsapi.7drlb.com/video/girl/music2.mp3";
+ }
bleManager = new BleManager(this);
+
+ myListener = new MyLocationListenner();
+ // ���������������
+ mLocClient = new LocationClient(this);
+ mLocClient.registerLocationListener(myListener);
+ LocationClientOption option = new LocationClientOption();
+ option.setOpenGps(true); // ������gps
+ option.setCoorType("bd09ll"); // ������������������
+ option.setIsNeedAddress(true);
+ option.setScanSpan(1000 * 60);
+ mLocClient.setLocOption(option);
+ mLocClient.start();
+ }
+
+ /**
+ * ������SDK������������
+ */
+ public class MyLocationListenner implements BDLocationListener {
+
+ @Override
+ public void onReceiveLocation(BDLocation location) {
+ // map view ���������������������������������������
+ if (location == null) {
+ return;
+ }
+ mLat = location.getLatitude();
+ mLon = location.getLongitude();
+ address = location.getAddrStr();
+ XLog.d(mLat + "|" + mLon + "|" + address);
+ }
}
}
--
Gitblit v1.8.0