[*]修改页面动画

陈奇

2018-11-27 2c76ecbb7edf6e30f1dda4c930a02945c360ecab

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

@@ -98,11 +98,12 @@

    //心跳时间
    private int HEARTTIMES = 2;
    //重连时间
    private int RECONNECTTIMES = 8000;

    //是否在本页面
    private boolean isMySelfPage = false;

    //handler管理线程
    private Handler handler = new Handler();


    private Runnable heartRunnable = new Runnable() {
        @Override
@@ -126,15 +127,16 @@
            FragmentMonitor.this.mBluetoothService.write(FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(),
                    FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getUuid().toString(),
                    BLECommon.BLE_HEART, null);
            Log.d(TGA, "发送心跳");
            heart();
        }
    };


    private Runnable reconnectRunnable = new Runnable() {
        @Override
        public void run() {
            //重连
            if (FragmentMonitor.this.mBluetoothService == null) {
            if (mBluetoothService == null) {
                return;
            }
            String mac = MainApp.theApp.sharedPreferencesUtil.getBLE();
@@ -142,10 +144,8 @@
                if (MainApp.theApp.bleManager.isConnectingOrConnected()) {
                    return;
                }
                Log.d(TGA, "正在重连");
                FragmentMonitor.this.mBluetoothService.scanAndConnect5(mac);
                mBluetoothService.scanAndConnect5(mac);
            }
            reconnect();
        }
    };

@@ -196,11 +196,12 @@
     */
    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
    public void eventComing(EventMessage msg) {
        mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
        if (msg.getType() == AppConfig.GET_BLE_SERVICE) {
            resetHandler();
            textShowMac();//
            pv.setStatusStr("检测中");
            //发现服务
            mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
            ((MainActivity) getActivity()).resetBLECallBack();
            if (mBluetoothService != null) {
                BluetoothGatt gatt = mBluetoothService.getGatt();
@@ -211,8 +212,8 @@
                            mBluetoothService.setService(service);
                            break;
                        }
                    }
                    //获取特征

                    }//获取特征
                    for (BluetoothGattCharacteristic characteristic : mBluetoothService.getService().getCharacteristics()) {
                        int charaProp = characteristic.getProperties();
                        if ((charaProp & BluetoothGattCharacteristic.PROPERTY_READ) > 0) {
@@ -249,26 +250,25 @@

                            @Override
                            public void onFailure(final BleException exception) {

                            }

                            @Override
                            public void onInitiatedResult(boolean result) {
                            }
                        });
                /**
                 * 发送时间校准
                 */
//                handler.postDelayed(runnable, 5000);
                //重置handler
                HEARTTIMES = 2;
                //发送心跳
                heart();
            }
        } else if (msg.getType() == AppConfig.GET_BLE_DISCONNECT) {
            preLevel = -1;
            showStatus(-1);
            handler.postDelayed(reconnectRunnable, RECONNECTTIMES);
            reconnect();
            stop();
            isVirating = false;
            AudioUtils.virateCancle(getActivity());

        } else if (msg.getType() == AppConfig.CHANGE_SETTING) {
            if (timer != null) {
                timer.cancel();
@@ -304,6 +304,7 @@
            }
        } else if (msg.getType() == AppConfig.BLUETOOCH_CHANGE_CONNECT) {
            showStatus(-1);
            stopReconnect();
        }
    }

@@ -339,18 +340,28 @@
    @Override
    public void onAttach(Context context) {
        super.onAttach(context);
        FragmentMonitor.this.mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
        mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
    }

    @Override
    public void onResume() {
        super.onResume();
        isMySelfPage = true;
        textShowMac();
    }

    @Override
    public void onPause() {
        super.onPause();
        System.out.println("chenqi onPause");
        isMySelfPage = false;
        stopReconnect();
    }

    @Override
    public void onDestroy() {
        super.onDestroy();
        System.out.println("chenqi onDestroy");
        EventBus.getDefault().unregister(this);
        if (timer != null) {
            timer.cancel();
@@ -404,6 +415,7 @@
            }
        });
        showStatus(-1);

    }

    @Override
@@ -458,14 +470,13 @@

    @Override
    protected void processClick(View v) {
        Intent intent = null;
        Intent intent;
        switch (v.getId()) {
            case R.id.pv:
                if (MainApp.theApp.bleManager == null || !(MainApp.theApp.bleManager != null && MainApp.theApp.bleManager.isSupportBle())) {
                    return;
                }
                intent = new Intent(getActivity(), BLESearchActivity.class);
                startActivity(intent);
                startActivity(new Intent(getActivity(), BLESearchActivity.class));
                break;
            case R.id.iv_his:
                intent = new Intent(getActivity(), ChartActivity.class);
@@ -502,14 +513,27 @@
        handler.postDelayed(heartRunnable, 1000 * HEARTTIMES);
    }

    /**
     * 开始重连
     */
    private void reconnect() {
        handler.postDelayed(reconnectRunnable, RECONNECTTIMES);
        if (isMySelfPage) {
            stopReconnect();
            //是否是在本页面
            handler.postDelayed(reconnectRunnable, 0);
        }
    }

    /**
     * 停止重连
     */
    private void stopReconnect() {
        handler.removeCallbacks(reconnectRunnable);
    }

    private void resetHandler() {
        handler.removeCallbacks(reconnectRunnable);
        handler.removeCallbacks(heartRunnable);
        HEARTTIMES = 2;
    }

    private void submitData() {
@@ -560,14 +584,14 @@
            danger = R.mipmap.icon_danger;
            tvLijiTitle.setText("累计计量(uSv)");
            tvShishiTitle.setText("实时计量(uSv/h)");
            iv_dianliang.setEnabled(false);
//            iv_dianliang.setEnabled(false);
        } else if (type == 2) {
            //电磁
            yanzhang = R.mipmap.dianliyanyang;
            danger = R.mipmap.dianlidanger;
            tvLijiTitle.setText("磁场辐射");
            tvShishiTitle.setText("电场辐射");
            iv_dianliang.setEnabled(true);
//            iv_dianliang.setEnabled(true);
        }

        if (level == 0) {
@@ -607,7 +631,7 @@
            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);
//            iv_dianliang.setVisibility(View.GONE);
            tv_tishi.setText("当前设备离线");
            tv_tishi.setBackgroundResource(R.mipmap.bt_offline);
            iv_bottom_status.setImageResource(R.mipmap.icon_offline);
@@ -637,7 +661,7 @@

    private void textShowMac() {
        if (BuildConfig.BUILD_TYPE.equals(VersionConstants.DEBUG)) {
            final TextView tv_text_mac = (TextView) findView(R.id.tv_text_mac);
            final TextView tv_text_mac = findView(R.id.tv_text_mac);
            tv_desc.setOnClickListener(new View.OnClickListener() {
                @Override
                public void onClick(View v) {
@@ -678,7 +702,6 @@
            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);
            int b1 = Integer.parseInt(nowResult.substring(6, 8), 16);
            int b2 = Integer.parseInt(nowResult.substring(12, 14), 16);
//            XLog.d("辐射：" + shunshiValue + "|累计：" + leijiValue + "-----电量：" + b1 + "|" + b2);
            tv_ljjl.setText(NumberUtils.getBigDecimalValue(leijiValue * 0.01, 3) + "");
            double realValue = NumberUtils.getBigDecimalValue((real) / 100.0, 3);
            tv_shishi.setText(realValue + "");
@@ -777,14 +800,11 @@

            tv_ljjl.setText(elecValue + "(μT)");

            /**
             * 保存数据至内存
             */
            //保存数据至内存
            RecData data = new RecData();
            data.setValue(electricFieldValue);
            data.setTime(TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss"));
            data.setType(0);


            showStatus(Integer.parseInt(strings[21], 16));

@@ -815,19 +835,10 @@
                    isVirating = true;
                    AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
                }
            } else if (baojing == 3) {
            } else if (baojing == 3 || baojing == 4) {
                data.setIs_warn(1);
                showStatus(3);
                pv.setPercent((float) (0.875));
                play(2);
                if (!isVirating) {
                    isVirating = true;
                    AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
                }
            } else if (baojing == 4) {
                data.setIs_warn(1);
                showStatus(3);
                pv.setPercent((float) (1.00));
                play(2);
                if (!isVirating) {
                    isVirating = true;