[*]优化微信登陆用户信息

陈奇

2018-12-07 4203968ed148a7e56ab460c8d6edb744cb1645e4

 app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java

@@ -14,7 +14,6 @@
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.ActivityOptionsCompat;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
@@ -65,8 +64,6 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
import java.util.Timer;
import java.util.TimerTask;

/**
 * 辐射监测
@@ -271,10 +268,7 @@
            isVirating = false;
            AudioUtils.virateCancle(getActivity());
        } else if (msg.getType() == AppConfig.CHANGE_SETTING) {
            if (timer != null) {
                timer.cancel();
                timer = null;
            }
            handler.removeCallbacks(taskRunnable);
            submitTime = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getRefresh_frequency();
            isupLoad = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getIs_open_upload();
            doTask();
@@ -364,10 +358,6 @@
        super.onDestroy();
        System.out.println("chenqi onDestroy");
        EventBus.getDefault().unregister(this);
        if (timer != null) {
            timer.cancel();
            timer = null;
        }
        handler.removeCallbacksAndMessages(null);
        stop();
        isVirating = false;
@@ -402,12 +392,9 @@
        iv_dianliang.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                Intent intent = new Intent(getActivity(), BLESearchActivity.class);
                ActivityOptionsCompat optionsCompat = ActivityOptionsCompat.makeSceneTransitionAnimation(getActivity(), iv_dianliang, "dddd");
                startActivity(intent,optionsCompat.toBundle());
//                if (BuildConfig.BUILD_TYPE.equals(VersionConstants.DEBUG)) {
//                    FlipAnimatorXViewShow(iv_dianliang, tv_dianliang2, 200);
//                }
                if (BuildConfig.BUILD_TYPE.equals(VersionConstants.DEBUG)) {
                    FlipAnimatorXViewShow(iv_dianliang, tv_dianliang2, 200);
                }
            }
        });
        tv_dianliang2.setOnClickListener(new View.OnClickListener() {
@@ -419,7 +406,6 @@
            }
        });
        showStatus(-1);

    }

    @Override
@@ -429,7 +415,7 @@
        iv_search.setOnClickListener(this);
    }

    int submitTime;
    int submitTime = 0;
    int isupLoad;

    @Override
@@ -480,6 +466,7 @@
                if (MainApp.theApp.bleManager == null || !(MainApp.theApp.bleManager != null && MainApp.theApp.bleManager.isSupportBle())) {
                    return;
                }
                startActivity(new Intent(getActivity(), BLESearchActivity.class));
                break;
            case R.id.iv_his:
                intent = new Intent(getActivity(), ChartActivity.class);
@@ -497,19 +484,22 @@

    }

    Timer timer;
    Runnable taskRunnable = new Runnable() {
        @Override
        public void run() {
            if (isupLoad == 1) {
                //上传数据
                submitData();
            }
            doTask();
        }
    };

    private void doTask() {
        timer = new Timer();
        timer.schedule(new TimerTask() {
            @Override
            public void run() {
                if (isupLoad == 1) {
                    //上传数据
                    submitData();
                }
            }
        }, 0, submitTime * 1000);
        if (submitTime == 0) {
            submitTime = 20;
        }
        handler.postDelayed(taskRunnable, submitTime * 1000);
    }

    private void heart() {
@@ -634,7 +624,6 @@
            tv_status.setTextColor(getResources().getColor(R.color.red_txt));
            ll_status.setBackgroundResource(R.mipmap.bg_conner_red);
        } else if (level == -1) {
//            iv_dianliang.setVisibility(View.GONE);
            tv_tishi.setText("当前设备离线");
            tv_tishi.setBackgroundResource(R.mipmap.bt_offline);
            iv_bottom_status.setImageResource(R.mipmap.icon_offline);
@@ -776,9 +765,11 @@
     * 电磁辐射显示
     */
    private void parseHoutData(String nowResult) {
        System.out.println("chenqi parseHoutData first" + nowResult);
        if (TextUtils.isEmpty(nowResult)) {
            return;
        }
        System.out.println("chenqi parseHoutData begin" + nowResult);
        type = 2;
        String[] strings = StringUtils.splitString(nowResult, 2);
        if (strings[0].startsWith("7A") && strings[35].endsWith("7B")) {