张海江
2018-01-26 04b72977be56e9cca1eb66883d7217237fb8ab9a
提交代码
52 files added
20 files modified
369 ■■■■ changed files
.gradle/3.3/taskArtifacts/fileHashes.bin patch | view | raw | blame | history
.gradle/3.3/taskArtifacts/fileSnapshots.bin patch | view | raw | blame | history
.gradle/3.3/taskArtifacts/taskArtifacts.bin patch | view | raw | blame | history
.gradle/3.3/taskArtifacts/taskArtifacts.lock patch | view | raw | blame | history
.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock patch | view | raw | blame | history
.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock patch | view | raw | blame | history
.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock patch | view | raw | blame | history
.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock patch | view | raw | blame | history
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin patch | view | raw | blame | history
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock patch | view | raw | blame | history
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin patch | view | raw | blame | history
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock patch | view | raw | blame | history
andbrickslib/andbrickslib.iml 8 ●●●● patch | view | raw | blame | history
andbrickslib/src/main/java/com/moral/andbrickslib/utils/StringUtils.java 19 ●●●●● patch | view | raw | blame | history
app/src/main/java/com/moral/yunfushao/MainActivity.java 2 ●●● patch | view | raw | blame | history
app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java 2 ●●● patch | view | raw | blame | history
app/src/main/java/com/moral/yunfushao/ble/BLECommon.java 2 ●●● patch | view | raw | blame | history
app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java 333 ●●●● patch | view | raw | blame | history
app/src/main/res/layout/fragment_monitor_layout.xml 1 ●●●● patch | view | raw | blame | history
build/android-profile/profile-2017-08-11-10-42-13-993.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-14-11-09-47-083.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-14-11-10-21-059.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-15-13-33-36-589.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-15-13-33-56-473.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-15-13-34-08-778.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-09-04-13-42-50-053.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-09-04-13-43-00-966.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-09-06-10-14-02-139.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-09-06-10-14-10-156.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-09-06-10-48-49-596.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-09-06-10-48-56-651.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-11-15-11-52-40-127.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-11-15-11-52-54-560.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-11-15-11-53-11-557.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-11-21-16-03-55-085.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-11-21-16-04-06-744.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-11-21-16-04-37-189.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-14-09-12-40-564.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-14-09-12-48-293.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-09-01-35-596.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-09-01-46-561.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-11-21-17-424.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-11-22-22-922.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-14-55-53-530.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-14-58-57-737.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-14-59-56-663.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-15-02-50-390.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-15-03-44-550.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-15-08-44-603.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-15-09-40-265.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-15-11-47-942.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-15-12-49-736.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-15-13-11-997.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-15-33-33-891.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-15-40-49-112.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-15-42-03-604.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-15-42-44-788.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-16-02-40-720.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-16-34-41-888.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-21-16-36-29-234.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-22-14-24-48-339.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-22-14-25-02-521.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-25-09-23-02-032.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-12-25-09-23-15-885.rawproto patch | view | raw | blame | history
build/android-profile/profile-2018-01-16-10-04-17-007.rawproto patch | view | raw | blame | history
build/android-profile/profile-2018-01-16-10-04-23-596.rawproto patch | view | raw | blame | history
build/android-profile/profile-2018-01-16-10-04-33-552.rawproto patch | view | raw | blame | history
build/android-profile/profile-2018-01-23-11-27-57-949.rawproto patch | view | raw | blame | history
build/android-profile/profile-2018-01-23-11-28-05-597.rawproto patch | view | raw | blame | history
build/android-profile/profile-2018-01-26-09-49-25-891.rawproto patch | view | raw | blame | history
build/android-profile/profile-2018-01-26-09-49-36-336.rawproto patch | view | raw | blame | history
build/intermediates/dex-cache/cache.xml 2 ●●● patch | view | raw | blame | history
.gradle/3.3/taskArtifacts/fileHashes.bin
Binary files differ
.gradle/3.3/taskArtifacts/fileSnapshots.bin
Binary files differ
.gradle/3.3/taskArtifacts/taskArtifacts.bin
Binary files differ
.gradle/3.3/taskArtifacts/taskArtifacts.lock
Binary files differ
.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
Binary files differ
.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
Binary files differ
.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
Binary files differ
.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
Binary files differ
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
Binary files differ
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
Binary files differ
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
Binary files differ
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
Binary 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);
        }
    };
app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java
@@ -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;
@@ -55,22 +57,25 @@
public class FragmentMonitor extends BaseFragment {
    private LinearLayout ll_status;
    private TextView tv_ljjl, tv_tishi, tv_desc,tv_shishi,tv_status;
    private TextView tv_ljjl, tv_tishi, tv_desc, tv_shishi, tv_status;
    private PanelView pv;
    private ImageView iv_his,iv_status,iv_search;
    private ImageView iv_his, iv_status, iv_search;
    private BluetoothService mBluetoothService;
    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,19 +139,32 @@
                            }
                        });
                /**
                 * 一连上先发数据包
                 */
                heart();
                /**
                 * 发送时间校准
                 */
                handler.postDelayed(new Runnable() {
                    @Override
                    public void run() {
                        checkTime();
                    }
                }, 2000);
            }
        }else if (msg.getType() == AppConfig.GET_BLE_DISCONNECT) {
        } else if (msg.getType() == AppConfig.GET_BLE_DISCONNECT) {
            pv.setStatusStr("未连接");
            pv.setPercent(0);
            tv_ljjl.setText("0");
            tv_shishi.setText("0");
        }else if(msg.getType() == AppConfig.CHANGE_SETTING){
            if(timer!=null){
        } else if (msg.getType() == AppConfig.CHANGE_SETTING) {
            if (timer != null) {
                timer.cancel();
                timer = null;
            }
            submitTime = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getRefresh_frequency();
            isupLoad  = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getIs_open_upload();
            isupLoad = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getIs_open_upload();
            doTask();
        }
    }
@@ -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,14 +217,16 @@
    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();
        isupLoad  = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getIs_open_upload();
        isupLoad = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getIs_open_upload();
        doTask();
    }
@@ -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() {
@@ -300,15 +275,54 @@
                    submitData();
                }
            }
        }, 0, submitTime*1000);
        }, 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() {
        //上传当前数据并清空
        submitTempResult.addAll(submitResult);
        submitResult.clear();
        HashMap<String,String> params = new HashMap<>();
        if(submitTempResult.size()==0){
        HashMap<String, String> params = new HashMap<>();
        if (submitTempResult.size() == 0) {
            return;
        }
        UpLoadParam up = new UpLoadParam();
@@ -321,8 +335,44 @@
        HttpUtils.doPost(API.UPLOAD, params, CacheMode.DEFAULT, false, new HttpCallBack() {
            @Override
            public void onSuccess(String res, String msg) {
                XLog.d("@@@@@@@@@@@@@@@@@@@@@@@@@@"+msg);
                XLog.d("@@@@@@@@@@@@@@@@@@@@@@@@@@" + msg);
                submitTempResult.clear();
            }
            @Override
            public void showLoadingDialog() {
            }
            @Override
            public void onFail(int errno, String s) {
            }
        });
    }
    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
@@ -341,19 +391,142 @@
    /**
     * 头部实时数据状态显示
     *
     * @param safe
     */
    private void showStatus(boolean safe){
        if(safe){
    private void showStatus(boolean safe) {
        if (safe) {
            iv_status.setImageResource(R.mipmap.icon_safe);
            tv_status.setText("安全");
            tv_status.setTextColor(getResources().getColor(R.color.green_txt));
            ll_status.setBackgroundResource(R.mipmap.bg_conner_green);
        }else{
        } else {
            iv_status.setImageResource(R.mipmap.icon_danger);
            tv_status.setText("危险");
            tv_status.setTextColor(getResources().getColor(R.color.red_txt));
            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.rawproto
Binary files differ
build/android-profile/profile-2017-08-14-11-09-47-083.rawproto
Binary files differ
build/android-profile/profile-2017-08-14-11-10-21-059.rawproto
Binary files differ
build/android-profile/profile-2017-08-15-13-33-36-589.rawproto
Binary files differ
build/android-profile/profile-2017-08-15-13-33-56-473.rawproto
Binary files differ
build/android-profile/profile-2017-08-15-13-34-08-778.rawproto
Binary files differ
build/android-profile/profile-2017-09-04-13-42-50-053.rawproto
Binary files differ
build/android-profile/profile-2017-09-04-13-43-00-966.rawproto
Binary files differ
build/android-profile/profile-2017-09-06-10-14-02-139.rawproto
Binary files differ
build/android-profile/profile-2017-09-06-10-14-10-156.rawproto
Binary files differ
build/android-profile/profile-2017-09-06-10-48-49-596.rawproto
Binary files differ
build/android-profile/profile-2017-09-06-10-48-56-651.rawproto
Binary files differ
build/android-profile/profile-2017-11-15-11-52-40-127.rawproto
Binary files differ
build/android-profile/profile-2017-11-15-11-52-54-560.rawproto
Binary files differ
build/android-profile/profile-2017-11-15-11-53-11-557.rawproto
Binary files differ
build/android-profile/profile-2017-11-21-16-03-55-085.rawproto
Binary files differ
build/android-profile/profile-2017-11-21-16-04-06-744.rawproto
Binary files differ
build/android-profile/profile-2017-11-21-16-04-37-189.rawproto
Binary files differ
build/android-profile/profile-2017-12-14-09-12-40-564.rawproto
Binary files differ
build/android-profile/profile-2017-12-14-09-12-48-293.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-09-01-35-596.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-09-01-46-561.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-11-21-17-424.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-11-22-22-922.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-14-55-53-530.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-14-58-57-737.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-14-59-56-663.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-15-02-50-390.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-15-03-44-550.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-15-08-44-603.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-15-09-40-265.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-15-11-47-942.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-15-12-49-736.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-15-13-11-997.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-15-33-33-891.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-15-40-49-112.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-15-42-03-604.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-15-42-44-788.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-16-02-40-720.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-16-34-41-888.rawproto
Binary files differ
build/android-profile/profile-2017-12-21-16-36-29-234.rawproto
Binary files differ
build/android-profile/profile-2017-12-22-14-24-48-339.rawproto
Binary files differ
build/android-profile/profile-2017-12-22-14-25-02-521.rawproto
Binary files differ
build/android-profile/profile-2017-12-25-09-23-02-032.rawproto
Binary files differ
build/android-profile/profile-2017-12-25-09-23-15-885.rawproto
Binary files differ
build/android-profile/profile-2018-01-16-10-04-17-007.rawproto
Binary files differ
build/android-profile/profile-2018-01-16-10-04-23-596.rawproto
Binary files differ
build/android-profile/profile-2018-01-16-10-04-33-552.rawproto
Binary files differ
build/android-profile/profile-2018-01-23-11-27-57-949.rawproto
Binary files differ
build/android-profile/profile-2018-01-23-11-28-05-597.rawproto
Binary files differ
build/android-profile/profile-2018-01-26-09-49-25-891.rawproto
Binary files differ
build/android-profile/profile-2018-01-26-09-49-36-336.rawproto
Binary 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