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 | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/moral/yunfushao/MainApp.java b/app/src/main/java/com/moral/yunfushao/MainApp.java
index a46272c..403c979 100644
--- a/app/src/main/java/com/moral/yunfushao/MainApp.java
+++ b/app/src/main/java/com/moral/yunfushao/MainApp.java
@@ -12,6 +12,7 @@
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;
/**
@@ -34,8 +35,9 @@
*/
LocationClient mLocClient;
public MyLocationListenner myListener;
- public static double mLat,mLon;
+ public static double mLat, mLon;
public static String address;
+
@Override
public void onCreate() {
super.onCreate();
@@ -45,11 +47,20 @@
OkGo.init(this);
OkGo.getInstance().setCookieStore(new PersistentCookieStore());
- if(sharedPreferencesUtil == null){
+ if (sharedPreferencesUtil == null) {
sharedPreferencesUtil = new SharedPreferencesUtil(this);
}
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();
@@ -60,7 +71,7 @@
option.setOpenGps(true); // ������gps
option.setCoorType("bd09ll"); // ������������������
option.setIsNeedAddress(true);
- option.setScanSpan(1000*60);
+ option.setScanSpan(1000 * 60);
mLocClient.setLocOption(option);
mLocClient.start();
}
@@ -79,7 +90,7 @@
mLat = location.getLatitude();
mLon = location.getLongitude();
address = location.getAddrStr();
- XLog.d(mLat+"|"+mLon+"|"+address);
+ XLog.d(mLat + "|" + mLon + "|" + address);
}
}
}
--
Gitblit v1.8.0