.gradle/3.3/taskArtifacts/fileHashes.binBinary files differ
.gradle/3.3/taskArtifacts/fileSnapshots.binBinary files differ
.gradle/3.3/taskArtifacts/taskArtifacts.binBinary files differ
.gradle/3.3/taskArtifacts/taskArtifacts.lockBinary files differ
.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lockBinary files differ
.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lockBinary files differ
.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lockBinary files differ
.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lockBinary files differ
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.binBinary files differ
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lockBinary files differ
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.binBinary files differ
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lockBinary files differ
andbrickslib/andbrickslib.iml
@@ -102,15 +102,15 @@ <orderEntry type="library" exported="" name="gson-2.8.0" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" /> <orderEntry type="library" exported="" name="fastjson-1.1.56.android" level="project" /> <orderEntry type="library" exported="" name="okgo-2.1.4" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" /> <orderEntry type="library" exported="" name="okgo-2.1.4" level="project" /> <orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" /> <orderEntry type="library" exported="" name="core-0.9.4.4" level="project" /> <orderEntry type="library" exported="" name="support-v13-25.3.1" level="project" /> <orderEntry type="library" exported="" name="library-1.4.0" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" /> <orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" /> <orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="espresso-core-2.2.2" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="exposed-instrumentation-api-publish-0.5" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="rules-0.5" level="project" /> @@ -118,11 +118,11 @@ <orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" /> <orderEntry type="library" exported="" name="materialish-progress-1.0" level="project" /> <orderEntry type="library" exported="" name="okserver-1.1.3" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" /> <orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" /> <orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" /> <orderEntry type="library" exported="" name="okhttp-3.4.1" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" /> <orderEntry type="library" exported="" name="okhttp-3.4.1" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" /> <orderEntry type="library" exported="" name="recyclerview-v7-25.3.1" level="project" /> <orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" /> andbrickslib/src/main/java/com/moral/andbrickslib/utils/StringUtils.java
@@ -389,4 +389,23 @@ } return new String(hexChars); } public static String str2HexStr(String str) { char[] chars = "0123456789ABCDEF".toCharArray(); StringBuilder sb = new StringBuilder(""); byte[] bs = str.getBytes(); int bit; for (int i = 0; i < bs.length; i++) { bit = (bs[i] & 0x0f0) >> 4; sb.append(chars[bit]); bit = bs[i] & 0x0f; sb.append(chars[bit]); sb.append(' '); } return sb.toString().trim(); } } app/src/main/java/com/moral/yunfushao/MainActivity.java
@@ -341,7 +341,7 @@ progressDialog.dismiss(); EventMessage msg = new EventMessage(); msg.setType(AppConfig.GET_BLE_SERVICE); EventBus.getDefault().post(msg); EventBus.getDefault().postSticky(msg); } };
@@ -217,7 +217,7 @@ progressDialog.dismiss(); EventMessage msg = new EventMessage(); msg.setType(AppConfig.GET_BLE_SERVICE); EventBus.getDefault().post(msg); EventBus.getDefault().postSticky(msg); finish(); } }; app/src/main/java/com/moral/yunfushao/ble/BLECommon.java
@@ -9,5 +9,5 @@ //服务UUID public final static String USR_SERVICE = "0003cdd0-0000-1000-8000-00805f9b0131"; public final static String BLE_SEARCH = "6A09010002006B"; public final static String BLE_HEART = "6A09010005006B";//心跳3分钟发一次 } app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
@@ -6,6 +6,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.Handler; import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.Log; @@ -44,6 +45,7 @@ import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; import java.util.Calendar; import java.util.HashMap; import java.util.Timer; import java.util.TimerTask; @@ -62,15 +64,18 @@ private ArrayList<String> realResult = new ArrayList<>(); //上传数据 private ArrayList<RecData> submitResult = new ArrayList<>(); private ArrayList<RecData> submitHisResult = new ArrayList<>(); //临时存储上传数据 private ArrayList<RecData> submitTempResult = new ArrayList<>(); private Timer heartTimer, resTimer; Handler handler = new Handler(); /** * 接收 * * @param msg */ @Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN, sticky = true) public void eventComing(EventMessage msg) { if (msg.getType() == AppConfig.GET_BLE_SERVICE) { pv.setStatusStr("检测中"); @@ -114,68 +119,11 @@ getActivity().runOnUiThread(new Runnable() { @Override public void run() { // Log.d("haijiang","收到消息===="+String.valueOf(HexUtil.encodeHex(characteristic.getValue()))); Log.d("haijiang", "收到消息====" + StringUtils.byteArrayToHexStr(characteristic.getValue())); String result = StringUtils.byteArrayToHexStr(characteristic.getValue()); if (result.startsWith("5A")) { realResult.clear(); realResult.add(result); } else { realResult.add(result); } String nowResult = ""; for (String s : realResult) { nowResult += s; } Log.d("haijiang", "收到消息===nowResult=" + nowResult); /** * 20个字节，5A开头 5B结尾 */ if (!TextUtils.isEmpty(nowResult) && nowResult.length() == 40 && nowResult.startsWith("5A") && nowResult.endsWith("5B")) { int shunshiValue = Integer.parseInt(nowResult.substring(24, 26), 16) * 256 + Integer.parseInt(nowResult.substring(26, 28), 16); int leijiValue = Integer.parseInt(nowResult.substring(28, 30), 16) * 1024 + Integer.parseInt(nowResult.substring(30, 32), 16) * 512 + Integer.parseInt(nowResult.substring(32, 34), 16) * 256 + Integer.parseInt(nowResult.substring(34, 36), 16); float level = shunshiValue / 10; XLog.d("辐射：" + shunshiValue + "|累计：" + leijiValue); tv_ljjl.setText(NumberUtils.getBigDecimalValue(leijiValue*0.10,3) + ""); double shishiValue = NumberUtils.getBigDecimalValue((shunshiValue-45)/10.0*0.10,3); tv_shishi.setText(shishiValue + ""); /** * 保存数据至内存 */ RecData data = new RecData(); data.setValue(shishiValue); data.setTime(TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss")); submitResult.add(data); if (level >= 0 && level < 15) { pv.setPercent(level / 50); tv_tishi.setText("当前辐射安全"); tv_desc.setText("您所处位置辐射安全\n您处于安全区域，可以长时间逗留！"); showStatus(true); } else if (level >= 15 && level < 26) { pv.setPercent(level / 50); tv_tishi.setText("当前辐射轻微"); tv_desc.setText("您所处位置辐射轻微\n不利于您的健康，请远离到安全区域！"); showStatus(true); } else if (level >= 26 && level < 65) { showStatus(false); tv_tishi.setText("当前辐射偏高"); tv_desc.setText("您所处位置辐射偏高\n不利于您的健康，请远离到安全区域！"); if (level <= 45) { pv.setPercent(level / 50); } else { pv.setPercent(0.9f); } } else if (level >= 65) { showStatus(false); tv_tishi.setText("当前辐射超标"); tv_desc.setText("您所处位置辐射超标\n不利于您的健康，请远离到安全区域！"); pv.setPercent(1.0f); } realResult.clear(); } //实时数据 parseCurrentData(result); parseHisData(result); } }); } @@ -191,6 +139,19 @@ } }); /** * 一连上先发数据包 */ heart(); /** * 发送时间校准 */ handler.postDelayed(new Runnable() { @Override public void run() { checkTime(); } }, 2000); } }else if (msg.getType() == AppConfig.GET_BLE_DISCONNECT) { pv.setStatusStr("未连接"); @@ -223,6 +184,14 @@ public void onDestroy() { super.onDestroy(); EventBus.getDefault().unregister(this); if (heartTimer != null) { heartTimer.cancel(); heartTimer = null; } if (timer != null) { timer.cancel(); timer = null; } } @Override @@ -248,10 +217,12 @@ protected void initListener() { pv.setOnClickListener(this); iv_his.setOnClickListener(this); iv_search.setOnClickListener(this); // iv_search.setOnClickListener(this); } int submitTime; int isupLoad; @Override protected void initData() { submitTime = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getRefresh_frequency(); @@ -275,10 +246,13 @@ startActivity(intent); break; case R.id.iv_search: if(mBluetoothService==null){ return; } mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(),mBluetoothService.getWirteCharacteristic().getUuid().toString(),BLECommon.BLE_SEARCH,null); // if(mBluetoothService==null){ // return; // } // if(mBluetoothService.getWirteCharacteristic()==null){ // return; // } // mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(),mBluetoothService.getWirteCharacteristic().getUuid().toString(),BLECommon.BLE_SEARCH,null); break; } @@ -288,6 +262,7 @@ protected void onErrorPagerClick() { } Timer timer; private void doTask() { @@ -301,6 +276,45 @@ } } }, 0, submitTime*1000); } /** * 发送心跳包，每3分钟 */ private void heart() { heartTimer = new Timer(); heartTimer.schedule(new TimerTask() { @Override public void run() { //发送心跳 if (mBluetoothService == null) { return; } if (mBluetoothService.getWirteCharacteristic() == null) { return; } mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), BLECommon.BLE_HEART, null); } }, 0, 1000 * 60 * 3); } private long timeComplete = 0; private void checkResComplete(final String result) { resTimer = new Timer(); resTimer.schedule(new TimerTask() { @Override public void run() { if (!TextUtils.isEmpty(result) && result.startsWith("3A")) { timeComplete = 0; } else { timeComplete++; } if (timeComplete >= 120) { submitResData(); } } }, 0, 1000); } private void submitData() { @@ -335,12 +349,49 @@ } }); } private void submitResData() { //上传当前数据并清空 HashMap<String, String> params = new HashMap<>(); if (submitHisResult.size() == 0) { return; } UpLoadParam up = new UpLoadParam(); up.setUserid(MainApp.userId); up.setAddress(MainApp.address); up.setLat(MainApp.mLat); up.setLon(MainApp.mLon); up.setData(submitHisResult); params.put("data", FastJsonTools.toJson(up)); HttpUtils.doPost(API.UPLOAD, params, CacheMode.DEFAULT, false, new HttpCallBack() { @Override public void onSuccess(String res, String msg) { XLog.d("孕妇哨上传数据：" + msg); submitHisResult.clear(); if (resTimer != null) { resTimer.cancel(); resTimer = null; } } @Override public void showLoadingDialog() { } @Override public void onFail(int errno, String s) { } }); } /** * 头部实时数据状态显示 * * @param safe */ private void showStatus(boolean safe){ @@ -356,4 +407,126 @@ ll_status.setBackgroundResource(R.mipmap.bg_conner_red); } } /** * 解析实时数据 * * @param result */ private void parseCurrentData(String result) { if (result.startsWith("5A")) { realResult.clear(); realResult.add(result); } else { realResult.add(result); } String nowResult = ""; for (String s : realResult) { nowResult += s; } Log.d("haijiang", "收到消息===nowResult=" + nowResult); /** * 20个字节，5A开头 5B结尾 */ if (!TextUtils.isEmpty(nowResult) && nowResult.length() == 40 && nowResult.startsWith("5A") && nowResult.endsWith("5B")) { int shunshiValue = Integer.parseInt(nowResult.substring(24, 26), 16) * 256 + Integer.parseInt(nowResult.substring(26, 28), 16); int leijiValue = Integer.parseInt(nowResult.substring(28, 30), 16) * 1024 + Integer.parseInt(nowResult.substring(30, 32), 16) * 512 + Integer.parseInt(nowResult.substring(32, 34), 16) * 256 + Integer.parseInt(nowResult.substring(34, 36), 16); float level = (float) (shunshiValue / 10 * 0.01); XLog.d("辐射：" + shunshiValue + "|累计：" + leijiValue); tv_ljjl.setText(NumberUtils.getBigDecimalValue(leijiValue * 0.01, 3) + ""); double shishiValue = NumberUtils.getBigDecimalValue((shunshiValue) / 100.0, 3); tv_shishi.setText(shishiValue + ""); /** * 保存数据至内存 */ RecData data = new RecData(); data.setValue(shishiValue); data.setTime(TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss")); submitResult.add(data); if (level >= 0 && level < 15) { pv.setPercent(level / 50); tv_tishi.setText("当前辐射安全"); tv_desc.setText("您所处位置辐射安全\n处于安全区域，可以长时间逗留！"); showStatus(true); } else if (level >= 15 && level < 26) { pv.setPercent(level / 50); tv_tishi.setText("当前辐射轻微"); tv_desc.setText("您所处位置辐射轻微\n不利于您的健康，请远离到安全区域！"); showStatus(true); } else if (level >= 26 && level < 65) { showStatus(false); tv_tishi.setText("当前辐射偏高"); tv_desc.setText("您所处位置辐射偏高\n不利于您的健康，请远离到安全区域！"); if (level <= 45) { pv.setPercent(level / 50); } else { pv.setPercent(0.9f); } } else if (level >= 65) { showStatus(false); tv_tishi.setText("当前辐射超标"); tv_desc.setText("您所处位置辐射超标\n不利于您的健康，请远离到安全区域！"); pv.setPercent(1.0f); } realResult.clear(); } } /** * 孕妇哨连接后上传的数据 */ private void parseHisData(String result) { if (!TextUtils.isEmpty(result) && result.length() == 16 && result.startsWith("3A") && result.endsWith("3B")) { if (submitHisResult.size() == 0) { //开启定时器检查 checkResComplete(result); } String year = "20" + Integer.parseInt(result.substring(2, 4), 16); String month = Integer.parseInt(result.substring(4, 6), 16) + ""; String day = Integer.parseInt(result.substring(6, 8), 16) + ""; String hour = Integer.parseInt(result.substring(8, 10), 16) + ""; int resValue = Integer.parseInt(result.substring(10, 12), 16) * 256 + Integer.parseInt(result.substring(12, 14), 16); RecData data = new RecData(); StringBuilder time = new StringBuilder(); //yyyy-MM-dd HH:mm:ss time.append(year).append("-").append(month).append("-").append(day).append(" ").append(hour).append(":00:00"); Log.d("haijiang", "=====time=====" + time.toString()); data.setTime(time.toString()); data.setValue(NumberUtils.getBigDecimalValue((resValue) / 100.0, 3)); submitHisResult.add(data); } } /** * 时间校准 */ private void checkTime() { if (mBluetoothService == null) { return; } if (mBluetoothService.getWirteCharacteristic() == null) { return; } StringBuilder blesb = new StringBuilder(); blesb.append("4A"); Calendar now = Calendar.getInstance(); blesb.append(toHex(Integer.toHexString((now.get(Calendar.YEAR) - 2000)))); blesb.append(toHex(Integer.toHexString((now.get(Calendar.MONTH) + 1)))); blesb.append(toHex(Integer.toHexString((now.get(Calendar.DAY_OF_MONTH))))); blesb.append(toHex(Integer.toHexString((now.get(Calendar.HOUR_OF_DAY))))); blesb.append(toHex(Integer.toHexString((now.get(Calendar.MINUTE))))); blesb.append("4B"); mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), blesb.toString(), null); } private String toHex(String s) { if (s.length() == 1) { return "0" + s; } else { return s; } } } app/src/main/res/layout/fragment_monitor_layout.xml
@@ -17,6 +17,7 @@ android:src="@mipmap/icon_find" android:layout_centerVertical="true" android:layout_marginLeft="@dimen/x16" android:visibility="gone" /> <TextView android:id="@+id/tv_title" build/android-profile/profile-2017-08-11-10-42-13-993.rawprotoBinary files differ
build/android-profile/profile-2017-08-14-11-09-47-083.rawprotoBinary files differ
build/android-profile/profile-2017-08-14-11-10-21-059.rawprotoBinary files differ
build/android-profile/profile-2017-08-15-13-33-36-589.rawprotoBinary files differ
build/android-profile/profile-2017-08-15-13-33-56-473.rawprotoBinary files differ
build/android-profile/profile-2017-08-15-13-34-08-778.rawprotoBinary files differ
build/android-profile/profile-2017-09-04-13-42-50-053.rawprotoBinary files differ
build/android-profile/profile-2017-09-04-13-43-00-966.rawprotoBinary files differ
build/android-profile/profile-2017-09-06-10-14-02-139.rawprotoBinary files differ
build/android-profile/profile-2017-09-06-10-14-10-156.rawprotoBinary files differ
build/android-profile/profile-2017-09-06-10-48-49-596.rawprotoBinary files differ
build/android-profile/profile-2017-09-06-10-48-56-651.rawprotoBinary files differ
build/android-profile/profile-2017-11-15-11-52-40-127.rawprotoBinary files differ
build/android-profile/profile-2017-11-15-11-52-54-560.rawprotoBinary files differ
build/android-profile/profile-2017-11-15-11-53-11-557.rawprotoBinary files differ
build/android-profile/profile-2017-11-21-16-03-55-085.rawprotoBinary files differ
build/android-profile/profile-2017-11-21-16-04-06-744.rawprotoBinary files differ
build/android-profile/profile-2017-11-21-16-04-37-189.rawprotoBinary files differ
build/android-profile/profile-2017-12-14-09-12-40-564.rawprotoBinary files differ
build/android-profile/profile-2017-12-14-09-12-48-293.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-09-01-35-596.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-09-01-46-561.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-11-21-17-424.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-11-22-22-922.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-14-55-53-530.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-14-58-57-737.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-14-59-56-663.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-15-02-50-390.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-15-03-44-550.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-15-08-44-603.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-15-09-40-265.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-15-11-47-942.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-15-12-49-736.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-15-13-11-997.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-15-33-33-891.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-15-40-49-112.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-15-42-03-604.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-15-42-44-788.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-16-02-40-720.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-16-34-41-888.rawprotoBinary files differ
build/android-profile/profile-2017-12-21-16-36-29-234.rawprotoBinary files differ
build/android-profile/profile-2017-12-22-14-24-48-339.rawprotoBinary files differ
build/android-profile/profile-2017-12-22-14-25-02-521.rawprotoBinary files differ
build/android-profile/profile-2017-12-25-09-23-02-032.rawprotoBinary files differ
build/android-profile/profile-2017-12-25-09-23-15-885.rawprotoBinary files differ
build/android-profile/profile-2018-01-16-10-04-17-007.rawprotoBinary files differ
build/android-profile/profile-2018-01-16-10-04-23-596.rawprotoBinary files differ
build/android-profile/profile-2018-01-16-10-04-33-552.rawprotoBinary files differ
build/android-profile/profile-2018-01-23-11-27-57-949.rawprotoBinary files differ
build/android-profile/profile-2018-01-23-11-28-05-597.rawprotoBinary files differ
build/android-profile/profile-2018-01-26-09-49-25-891.rawprotoBinary files differ
build/android-profile/profile-2018-01-26-09-49-36-336.rawprotoBinary files differ
build/intermediates/dex-cache/cache.xml
@@ -16,7 +16,7 @@ jumboMode="false" optimize="true" revision="25.0.2" sha1="f884e2f1e46f3fed215471bcc418d96071d55b54"> sha1="e2cb3dfc1b3dbfd7c07fb18a8cc6d4ba2260d499"> <dex dex="G:\project\pregnancy_guard_android\app\build\intermediates\pre-dexed\debug\classes_ed3297d65a5546cdbcd15452f369c24cdf4648b9.jar" /> </item> <item
