[*]添加了微信登陆

陈奇

2018-12-07 0e7dd8919ae2811063057f18a4db4156c771448a

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

@@ -2,7 +2,6 @@

import android.animation.Animator;
import android.animation.ObjectAnimator;
import android.annotation.SuppressLint;
import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCharacteristic;
import android.bluetooth.BluetoothGattService;
@@ -13,7 +12,6 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
@@ -35,6 +33,7 @@
import com.moral.andbrickslib.utils.TimeUtil;
import com.moral.andbrickslib.utils.dialog.MaterialDialogUtils;
import com.moral.andbrickslib.utils.log.XLog;
import com.moral.yunfushao.BuildConfig;
import com.moral.yunfushao.MainActivity;
import com.moral.yunfushao.MainApp;
import com.moral.yunfushao.R;
@@ -45,6 +44,7 @@
import com.moral.yunfushao.ble.BluetoothService;
import com.moral.yunfushao.common.API;
import com.moral.yunfushao.common.AppConfig;
import com.moral.yunfushao.common.VersionConstants;
import com.moral.yunfushao.httputils.HttpCallBack;
import com.moral.yunfushao.httputils.HttpUtils;
import com.moral.yunfushao.imageload.ImageLoader;
@@ -64,8 +64,6 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
import java.util.Timer;
import java.util.TimerTask;

/**
 * 辐射监测
@@ -73,6 +71,7 @@
 */

public class FragmentMonitor extends BaseFragment {
    private String TGA = getClass().getSimpleName();
    /**
     * 报警铃声
     */
@@ -90,40 +89,69 @@
    private ArrayList<RecData> submitResult = new ArrayList<>();

    private StringBuilder stringResult = new StringBuilder();
    private String deviceName = "";//当前连接的设备名称

    //临时存储上传数据
    private ArrayList<RecData> submitTempResult = new ArrayList<>();
    private Timer heartTimer, resTimer, chonglianTimer;

    //心跳时间
    private int HEARTTIMES = 2;

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

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

    private Runnable runnable = new Runnable() {
    private Runnable heartRunnable = new Runnable() {
        @Override
        public void run() {
            checkTime();
            checkTimeCount++;
            handler.postDelayed(this, 5000);
            if (MainApp.theApp.bleManager == null) {
                return;
            }
            if (!MainApp.theApp.bleManager.isConnectingOrConnected()) {
                return;
            }
            //发送心跳
            if (FragmentMonitor.this.mBluetoothService == null) {
                return;
            }
            if (FragmentMonitor.this.mBluetoothService.getWirteCharacteristic() == null) {
                return;
            }
            if (FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getService() == null) {
                return;
            }
            FragmentMonitor.this.mBluetoothService.write(FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(),
                    FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getUuid().toString(),
                    BLECommon.BLE_HEART, null);
            heart();
        }
    };

    private int checkTimeCount = 0;

    private Runnable reconnectRunnable = new Runnable() {
        @Override
        public void run() {
            //重连
            if (mBluetoothService == null) {
                return;
            }
            String mac = MainApp.theApp.sharedPreferencesUtil.getBLE();
            if (!TextUtils.isEmpty(mac) && MainApp.theApp.bleManager.isBlueEnable()) {
                if (MainApp.theApp.bleManager.isConnectingOrConnected()) {
                    return;
                }
                mBluetoothService.scanAndConnect5(mac);
            }
        }
    };


    private void doHandleData(String result) {
        if (StringUtils.isEmpty(result)) {
            return;
        }

        //如果包含"时间校准成功确认信号"或重试5次以上则停止继续校准时间操作
        if (result.startsWith(BLECommon.BLE_REC_TIME) || checkTimeCount > 5) {
            DebugUtils.sendData("data", result);

            handler.removeCallbacks(runnable);
            checkTimeCount = 0;

            result = result.substring(14);
            doHandleData(result);
        }

        if (result.startsWith("3A")) {
            if (result.length() >= 16) {
                DebugUtils.sendData("data", result);
@@ -151,7 +179,6 @@
            if (result.length() >= 76) {
                DebugUtils.sendData("data", result);
                parseHoutData(result.substring(0, 76));
                mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), BLECommon.BLE_SEND_7A, null);
                result = result.substring(76);
                doHandleData(result);
            } else {
@@ -167,14 +194,12 @@
     */
    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
    public void eventComing(EventMessage msg) {
        mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
        if (msg.getType() == AppConfig.GET_BLE_SERVICE) {
            if (chonglianTimer != null) {
                chonglianTimer.cancel();
                chonglianTimer = null;
            }
            resetHandler();
            textShowMac();//
            pv.setStatusStr("检测中");
            //发现服务
            mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
            ((MainActivity) getActivity()).resetBLECallBack();
            if (mBluetoothService != null) {
                BluetoothGatt gatt = mBluetoothService.getGatt();
@@ -185,12 +210,11 @@
                            mBluetoothService.setService(service);
                            break;
                        }
                    }
                    //获取特征

                    }//获取特征
                    for (BluetoothGattCharacteristic characteristic : mBluetoothService.getService().getCharacteristics()) {
                        int charaProp = characteristic.getProperties();
                        if ((charaProp & BluetoothGattCharacteristic.PROPERTY_READ) > 0) {

                        }
                        if ((charaProp & BluetoothGattCharacteristic.PROPERTY_WRITE) > 0 || (charaProp & BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE) > 0) {
                            mBluetoothService.setWirteCharacteristic(characteristic);
@@ -216,10 +240,10 @@
                                        String result = StringUtils.byteArrayToHexStr(characteristic.getValue());
                                        stringResult.append(result);
                                        doHandleData(result);

                                        stringResult = new StringBuilder();
                                    }
                                });
                                HEARTTIMES = 30;
                            }

                            @Override
@@ -229,43 +253,22 @@

                            @Override
                            public void onInitiatedResult(boolean result) {

                            }
                        });
                /**
                 * 发送时间校准
                 */
                handler.postDelayed(runnable, 5000);

                /**
                 * 一连上先发数据包
                 */
                if (mBluetoothService == null) {
                    return;
                }
                if (mBluetoothService.getWirteCharacteristic() == null) {
                    return;
                }
                mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), BLECommon.BLE_HEART, null);
                //重置handler
                HEARTTIMES = 2;
                //发送心跳
                heart();
            }
        } else if (msg.getType() == AppConfig.GET_BLE_DISCONNECT) {
            preLevel = -1;
            showStatus(-1);
            pv.setStatusStr("未连接");
            pv.setPercent(0);
            tv_ljjl.setText("0");
            tv_shishi.setText("0");
            chonglian();
            reconnect();
            stop();
            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();
@@ -294,7 +297,9 @@
                voiceBean.setName("严重铃声");
                voiceList.add(voiceBean);
            }

        } else if (msg.getType() == AppConfig.BLUETOOCH_CHANGE_CONNECT) {
            showStatus(-1);
            stopReconnect();
        }
    }

@@ -330,25 +335,30 @@
    @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 (heartTimer != null) {
            heartTimer.cancel();
            heartTimer = null;
        }
        if (timer != null) {
            timer.cancel();
            timer = null;
        }
        if (chonglianTimer != null) {
            chonglianTimer.cancel();
            chonglianTimer = null;
        }
        handler.removeCallbacksAndMessages(null);
        stop();
        isVirating = false;
        AudioUtils.virateCancle(getActivity());
@@ -382,14 +392,17 @@
        iv_dianliang.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                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() {
            @Override
            public void onClick(View v) {
                FlipAnimatorXViewShow(tv_dianliang2, iv_dianliang, 200);

                if (BuildConfig.BUILD_TYPE.equals(VersionConstants.DEBUG)) {
                    FlipAnimatorXViewShow(tv_dianliang2, iv_dianliang, 200);
                }
            }
        });
        showStatus(-1);
@@ -402,7 +415,7 @@
        iv_search.setOnClickListener(this);
    }

    int submitTime;
    int submitTime = 0;
    int isupLoad;

    @Override
@@ -447,14 +460,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);
@@ -472,94 +484,49 @@

    }

    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() {
        handler.postDelayed(heartRunnable, 1000 * HEARTTIMES);
    }

    /**
     * 发送心跳包，每3分钟
     * 开始重连
     */
    @SuppressLint("HandlerLeak")
    Handler heartHandler = new Handler() {
        public void handleMessage(Message msg) {
            switch (msg.what) {
                case 1:
                    if (MainApp.theApp.bleManager == null) {
                        return;
                    }
                    if (!MainApp.theApp.bleManager.isConnectingOrConnected()) {
                        return;
                    }
                    //发送心跳
                    if (FragmentMonitor.this.mBluetoothService == null) {
                        return;
                    }
                    if (FragmentMonitor.this.mBluetoothService.getWirteCharacteristic() == null) {
                        return;
                    }
                    if (FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getService() == null) {
                        return;
                    }
                    FragmentMonitor.this.mBluetoothService.write(FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getUuid().toString(), BLECommon.BLE_HEART, null);
                    Log.d("xintiao", "发送心跳");
                    break;
                case 2:
                    //重连
                    if (FragmentMonitor.this.mBluetoothService == null) {
                        return;
                    }
                    String mac = MainApp.theApp.sharedPreferencesUtil.getBLE();
                    if (!TextUtils.isEmpty(mac) && MainApp.theApp.bleManager.isBlueEnable()) {
                        if (MainApp.theApp.bleManager.isConnectingOrConnected()) {
                            return;
                        }
                        Log.d("chonglian", "正在重连");
                        FragmentMonitor.this.mBluetoothService.scanAndConnect5(mac);
                    }
                    break;
            }
            super.handleMessage(msg);
        }

    };

    private void heart() {
        if (heartTimer == null) {
            heartTimer = new Timer();
            heartTimer.schedule(new TimerTask() {
                @Override
                public void run() {
                    Message message = new Message();
                    message.what = 1;
                    heartHandler.sendMessage(message);
                }
            }, 0, 1000 * 30);
    private void reconnect() {
        if (isMySelfPage) {
            stopReconnect();
            //是否是在本页面
            handler.postDelayed(reconnectRunnable, 0);
        }
    }

    private void chonglian() {
        if (chonglianTimer == null) {
            chonglianTimer = new Timer();
            chonglianTimer.schedule(new TimerTask() {
                @Override
                public void run() {
                    Message message = new Message();
                    message.what = 2;
                    heartHandler.sendMessage(message);
                }
            }, 0, 1000 * 8);
        }
    /**
     * 停止重连
     */
    private void stopReconnect() {
        handler.removeCallbacks(reconnectRunnable);
    }

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

    private void submitData() {
@@ -603,18 +570,21 @@
    private void showStatus(int level) {
        int yanzhang = R.mipmap.icon_yanzhong;
        int danger = R.mipmap.icon_danger;
        iv_dianliang.setVisibility(View.VISIBLE);
        if (type == 1) {
            //电离
            yanzhang = R.mipmap.dianliyanyang;
            danger = R.mipmap.dianlidanger;
            lv_ljjl.setVisibility(View.VISIBLE);
            tvShishiTitle.setText("实时计量(uSv/h)");
        } else if (type == 2) {
            //电磁
            yanzhang = R.mipmap.icon_yanzhong;
            danger = R.mipmap.icon_danger;
            tvShishiTitle.setText("实时计量(V/m)");
            lv_ljjl.setVisibility(View.GONE);
            tvLijiTitle.setText("累计计量(uSv)");
            tvShishiTitle.setText("实时计量(uSv/h)");
//            iv_dianliang.setEnabled(false);
        } else if (type == 2) {
            //电磁
            yanzhang = R.mipmap.dianliyanyang;
            danger = R.mipmap.dianlidanger;
            tvLijiTitle.setText("磁场辐射");
            tvShishiTitle.setText("电场辐射");
//            iv_dianliang.setEnabled(true);
        }

        if (level == 0) {
@@ -662,6 +632,42 @@
            tv_status.setText("离线");
            tv_status.setTextColor(getResources().getColor(R.color.gray_txt));
            ll_status.setBackgroundResource(R.mipmap.bg_corner_gray);
            pv.setStatusStr("未连接");
            pv.setPercent(0);
            tv_ljjl.setText("0");
            tv_shishi.setText("0");
            showPower(2, 0);
        } else if (level == -2) {
            tv_tishi.setText("当前设备充电中");
            tv_tishi.setBackgroundResource(R.mipmap.bt_green);
            tv_desc.setText("您当前设备在线！");
            iv_status.setVisibility(View.GONE);
            tv_status.setText("充电中");
            ll_status.setBackgroundResource(R.mipmap.bg_corner_gray);
            pv.setPercent(0);
            pv.setStatusStr("充电中");
            tv_ljjl.setText("0");
            tv_shishi.setText("0");
        }
    }

    private void textShowMac() {
        if (BuildConfig.BUILD_TYPE.equals(VersionConstants.DEBUG)) {
            final TextView tv_text_mac = findView(R.id.tv_text_mac);
            tv_desc.setOnClickListener(new View.OnClickListener() {
                @Override
                public void onClick(View v) {
                    tv_text_mac.setText("Mac: " + MainApp.theApp.sharedPreferencesUtil.getBLE());
                    FlipAnimatorXViewShow(tv_desc, tv_text_mac, 100L);
                }
            });

            tv_text_mac.setOnClickListener(new View.OnClickListener() {
                @Override
                public void onClick(View v) {
                    FlipAnimatorXViewShow(tv_text_mac, tv_desc, 100L);
                }
            });
        }
    }

@@ -672,7 +678,6 @@
     */
    private int preLevel = -1;


    /**
     * data : 5A160000FA1C0400004100E7000700000071005B
     * format : 20个字节，5A开头  5B结尾
@@ -682,13 +687,13 @@
     */
    //todo 解析实时数据
    private void parseCurrentData(String nowResult) {
        System.out.println("chenqi nowResult parseCurrentData");
        type = 1;
        if (!TextUtils.isEmpty(nowResult) && nowResult.length() == 40 && nowResult.startsWith("5A") && nowResult.endsWith("5B")) {
            int real = 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);
            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 + "");
@@ -701,10 +706,6 @@
            data.setTime(TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss"));
            data.setType(0);

            /**
             * 显示电量
             */
            showPower(b1, b2);

            if (realValue < 0.16) {
                data.setIs_warn(0);
@@ -748,11 +749,15 @@
                    AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
                }
            }

            /**
             * 显示电量
             */
            showPower(b1, b2);
            submitResult.add(data);
//            realResult.clear();
        }
    }


    /**
     * 7A开头的是电离
@@ -760,40 +765,45 @@
     * 电磁辐射显示
     */
    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")) {
            String realString = StringUtils.subStrings(strings, 21, 23);
            int real = Integer.parseInt(realString, 16);
            int b1 = Integer.parseInt(strings[24], 16);
            int b2 = Integer.parseInt(strings[25], 16);
            double realValue = NumberUtils.getBigDecimalValue((real) / 100.0, 3);
            String power = StringUtils.subStrings(strings, 26, 27);
            double textPower = Integer.parseInt(power, 16) / 1000.0;
            tv_dianliang2.setText(textPower + "V");
            tv_shishi.setText(realValue + "");
            int electric_field = Integer.parseInt(realString, 16);
            int b1 = Integer.parseInt(strings[24].trim(), 16);
            int b2 = Integer.parseInt(strings[25].trim(), 16);
            int baojing = Integer.parseInt(strings[29].trim(), 16);

            /**
             * 保存数据至内存
             */
            double elec = Integer.parseInt(StringUtils.subStrings(strings, 13, 15), 16);

            double electricFieldValue = (electric_field) / 100.0;
            double elecValue = (elec) / 100.0;

            String power = StringUtils.subStrings(strings, 26, 27);

            double textPower = Integer.parseInt(power, 16) / 1000.0;

            tv_shishi.setText(electricFieldValue + "(V/m)");

            tv_dianliang2.setText(textPower + "V");

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

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


            /**
             * 电量显示
             */
            showPower(b1, b2);
            showStatus(Integer.parseInt(strings[21], 16));

            if (realValue < 0.16) {
                data.setIs_warn(0);
                pv.setPercent((float) (realValue * (0.25 / 0.16)));
            if (baojing == 0) {
                pv.setPercent((float) (0.125));
                showStatus(0);
                stop();
                if (isVirating) {
@@ -801,40 +811,39 @@
                    AudioUtils.virateCancle(getActivity());
                }
                preLevel = -1;
            } else if (realValue >= 0.16 && realValue < 0.8) {
            } else if (baojing == 1) {
                data.setIs_warn(1);
                pv.setPercent((float) (0.25 + realValue * (0.25 / 0.8)));
                pv.setPercent((float) (0.375));
                showStatus(1);
                play(0);
                if (!isVirating) {
                    isVirating = true;
                    AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
                }
            } else if (realValue >= 0.8 && realValue < 2) {
            } else if (baojing == 2) {
                data.setIs_warn(1);
                showStatus(2);
                pv.setPercent((float) (0.5 + realValue * (0.25 / 2)));
                pv.setPercent((float) (0.625));
                play(1);
                if (!isVirating) {
                    isVirating = true;
                    AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
                }
            } else if (realValue >= 2) {
            } else if (baojing == 3 || baojing == 4) {
                data.setIs_warn(1);
                showStatus(3);
                if ((0.75 + realValue / 30) < 1.0) {
                    pv.setPercent((float) (0.75 + realValue / 30));
                } else {
                    pv.setPercent(1.0f);
                }
                pv.setPercent((float) (0.875));
                play(2);
                if (!isVirating) {
                    isVirating = true;
                    AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
                }
            }
            /**
             * 电量显示
             */
            showPower(b1, b2);
            submitResult.add(data);
//            realResult.clear();
        }
    }

@@ -868,7 +877,6 @@

            ArrayList<RecData> temp = new ArrayList<>();
            temp.add(data);
            Log.d("hourdata", "=====hourdata=====" + FastJsonTools.toJson(temp));
            test(nowResult, time.toString());
            submitHourData(temp);
        }
@@ -880,6 +888,7 @@
    private void showPower(int b1, int b2) {
        if (b1 == 1) {
            ImageLoader.setGIFByUrl(getActivity(), R.mipmap.icon_chong, iv_dianliang);
            showStatus(-2);
        } else if (b1 == 2) {
            ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_full, iv_dianliang);
        } else {
@@ -944,6 +953,11 @@
        }
    }

    /**
     * 播放警告声音
     *
     * @param level
     */
    public void play(int level) {
        Log.d("music", "preLevel:" + preLevel + "----level:" + level);
        if (preLevel == level) {
@@ -955,9 +969,11 @@
        }
        VoiceBean voiceBean = voiceList.get(level);
        if (voiceBean.isDefaultMusic()) {
            mp = MediaPlayer.create(getActivity(), Uri.parse(voiceBean.getRes()));
            mp.start();
            mp.setLooping(true);
            if (voiceBean.getRes() != null) {
                mp = MediaPlayer.create(getActivity(), Uri.parse(voiceBean.getRes()));
                mp.start();
                mp.setLooping(true);
            }
        } else {
            mp = new MediaPlayer();
            try {
@@ -1065,7 +1081,6 @@
    }

    public static void FlipAnimatorXViewShow(final View oldView, final View newView, final long time) {

        ObjectAnimator animator1 = ObjectAnimator.ofFloat(oldView, "rotationX", 0, 90);
        final ObjectAnimator animator2 = ObjectAnimator.ofFloat(newView, "rotationX", -90, 0);
        animator2.setInterpolator(new OvershootInterpolator(2.0f));