张海江
2018-03-26 b4f0e07335e97d66d5a40c396f15a772619066b0
提交代码,准备改版
141 files deleted
10 files added
18 files modified
234 ■■■■ 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/_FastBleLib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock patch | view | raw | blame | history
.gradle/3.3/tasks/_FastBleLib_compileReleaseJavaWithJavac/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.lock patch | view | raw | blame | history
app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java 108 ●●●● patch | view | raw | blame | history
app/src/main/java/com/moral/yunfushao/fragment/FragmentShoppongMall.java 48 ●●●●● patch | view | raw | blame | history
app/src/main/java/com/moral/yunfushao/ui/PanelView.java 73 ●●●●● patch | view | raw | blame | history
app/src/main/res/layout/fragment_shoppingmall_layout.xml 5 ●●●● patch | view | raw | blame | history
app/src/main/res/mipmap-xxhdpi/icon.png patch | view | raw | blame | history
app/src/main/res/mipmap-xxhdpi/logo_login.png patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-09-07-41-960.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-09-08-12-050.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-09-09-59-887.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-09-12-45-460.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-09-59-29-610.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-10-00-16-632.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-10-02-16-651.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-10-06-59-586.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-10-28-03-911.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-10-28-50-206.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-10-31-11-993.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-10-33-02-522.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-10-34-44-382.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-10-38-57-997.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-10-39-24-892.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-13-15-10-789.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-13-23-08-787.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-13-43-29-527.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-16-32-50-500.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-16-46-49-076.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-16-50-24-379.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-16-53-43-859.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-16-57-12-285.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-29-17-28-23-041.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-31-08-40-11-516.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-31-08-40-27-257.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-31-08-51-00-086.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-31-09-12-55-082.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-31-09-29-34-235.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-31-11-39-32-386.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-31-11-41-16-619.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-31-11-49-11-518.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-31-12-19-12-987.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-07-31-15-56-39-330.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-01-08-43-31-565.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-01-08-43-47-861.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-01-10-07-33-659.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-02-08-51-34-457.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-02-08-51-59-753.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-02-15-06-04-877.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-02-15-08-38-735.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-03-09-57-50-580.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-03-09-58-07-564.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-03-10-57-14-783.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-03-11-18-54-403.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-03-11-20-16-330.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-03-14-05-00-587.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-03-14-09-17-494.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-03-14-11-10-130.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-04-11-19-38-914.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-04-11-19-55-955.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-07-08-45-52-919.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-07-08-46-08-185.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-08-31-35-688.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-08-32-37-679.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-09-09-29-719.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-09-38-19-496.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-09-43-42-143.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-09-45-14-995.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-09-48-19-335.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-09-49-26-011.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-09-52-23-953.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-09-54-08-973.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-10-00-18-383.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-10-03-41-677.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-10-09-11-877.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-10-12-14-432.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-10-13-40-162.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-10-32-39-938.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-10-33-59-541.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-10-41-47-446.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-10-43-52-075.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-10-45-07-572.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-10-54-04-880.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-11-10-28-423.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-11-12-28-001.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-11-12-54-353.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-11-25-47-669.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-08-11-27-54-968.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-09-13-44-18-198.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-09-13-45-43-901.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-09-13-46-19-228.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-09-13-50-29-287.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-10-14-03-54-685.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-10-14-04-14-234.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-11-08-58-50-769.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-11-08-59-07-538.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-11-09-09-21-642.rawproto patch | view | raw | blame | history
build/android-profile/profile-2017-08-11-09-11-59-541.rawproto 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/android-profile/profile-2018-03-07-15-13-25-489.rawproto patch | view | raw | blame | history
build/android-profile/profile-2018-03-07-15-16-09-110.rawproto patch | view | raw | blame | history
build/android-profile/profile-2018-03-07-16-36-06-006.rawproto patch | view | raw | blame | history
build/android-profile/profile-2018-03-07-16-36-14-112.rawproto patch | view | raw | blame | history
build/android-profile/profile-2018-03-12-17-00-58-516.rawproto patch | view | raw | blame | history
build/android-profile/profile-2018-03-12-17-01-07-316.rawproto patch | view | raw | blame | history
build/android-profile/profile-2018-03-16-15-34-18-401.rawproto patch | view | raw | blame | history
build/android-profile/profile-2018-03-16-15-34-26-896.rawproto patch | view | raw | blame | history
build/android-profile/profile-2018-03-26-13-17-30-049.rawproto patch | view | raw | blame | history
build/android-profile/profile-2018-03-26-13-17-38-207.rawproto patch | view | raw | blame | history
build/generated/mockable-android-25.jar 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/_FastBleLib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
Binary files differ
.gradle/3.3/tasks/_FastBleLib_compileReleaseJavaWithJavac/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.lock
Binary files differ
app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
@@ -5,8 +5,11 @@
import android.bluetooth.BluetoothGattService;
import android.content.Context;
import android.content.Intent;
import android.content.res.AssetManager;
import android.media.MediaPlayer;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
@@ -38,6 +41,7 @@
import com.moral.yunfushao.model.EventMessage;
import com.moral.yunfushao.model.RecData;
import com.moral.yunfushao.model.UpLoadParam;
import com.moral.yunfushao.model.VoiceBean;
import com.moral.yunfushao.ui.PanelView;
import org.greenrobot.eventbus.EventBus;
@@ -56,6 +60,13 @@
 */
public class FragmentMonitor extends BaseFragment {
    /**
     * 报警铃声
     */
    private ArrayList<VoiceBean> voiceList = new ArrayList<>();
    AssetManager am;
    MediaPlayer mp;
    private LinearLayout ll_status;
    private TextView tv_ljjl, tv_tishi, tv_desc, tv_shishi, tv_status;
    private PanelView pv;
@@ -140,10 +151,6 @@
                        });
                /**
                 * 一连上先发数据包
                 */
                heart();
                /**
                 * 发送时间校准
                 */
                handler.postDelayed(new Runnable() {
@@ -152,6 +159,17 @@
                        checkTime();
                    }
                }, 2000);
                /**
                 * 一连上先发数据包
                 */
                if (mBluetoothService == null) {
                    return;
                }
                if (mBluetoothService.getWirteCharacteristic() == null) {
                    return;
                }
                mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), BLECommon.BLE_HEART, null);
                heart();
            }
        } else if (msg.getType() == AppConfig.GET_BLE_DISCONNECT) {
            pv.setStatusStr("未连接");
@@ -173,6 +191,17 @@
    public void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        EventBus.getDefault().register(this);
        VoiceBean voiceBean = new VoiceBean();
        voiceBean.setId(0);
        voiceBean.setRes(R.raw.music);
        voiceBean.setName("music");
        voiceList.add(voiceBean);
        voiceBean = new VoiceBean();
        voiceBean.setId(1);
        voiceBean.setRes(R.raw.music1);
        voiceBean.setName("music1");
        voiceList.add(voiceBean);
    }
    @Override
@@ -192,6 +221,7 @@
            timer.cancel();
            timer = null;
        }
        stop();
    }
    @Override
@@ -281,21 +311,34 @@
    /**
     * 发送心跳包,每3分钟
     */
    Handler heartHandler = new Handler(){
        public void handleMessage(Message msg) {
            switch (msg.what) {
                case 1:
                    //发送心跳
                    if (mBluetoothService == null) {
                        return;
                    }
                    if (mBluetoothService.getWirteCharacteristic() == null) {
                        return;
                    }
                    mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), BLECommon.BLE_HEART, null);
                    break;
            }
            super.handleMessage(msg);
        }
    };
    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);
                Message message = new Message();
                message.what = 1;
                heartHandler.sendMessage(message);
            }
        }, 0, 1000 * 60 * 3);
        }, 0, 1000 * 60*3);
    }
    private long timeComplete = 0;
@@ -446,30 +489,34 @@
            data.setTime(TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss"));
            submitResult.add(data);
            if (level >= 0 && level < 15) {
                pv.setPercent(level / 50);
            if (shishiValue<0.25) {
                pv.setPercent((float) (shishiValue / 2.0));
                tv_tishi.setText("当前辐射安全");
                tv_desc.setText("您所处位置辐射安全\n处于安全区域,可以长时间逗留!");
                showStatus(true);
            } else if (level >= 15 && level < 26) {
                pv.setPercent(level / 50);
                stop();
            } else if (shishiValue >= 0.25 && shishiValue < 0.8) {
                pv.setPercent((float) (shishiValue / 2.0));
                tv_tishi.setText("当前辐射轻微");
                tv_desc.setText("您所处位置辐射轻微\n不利于您的健康,请远离到安全区域!");
                showStatus(true);
            } else if (level >= 26 && level < 65) {
                play();
            } else if (shishiValue >=0.8 && shishiValue < 2) {
                showStatus(false);
                tv_tishi.setText("当前辐射偏高");
                tv_desc.setText("您所处位置辐射偏高\n不利于您的健康,请远离到安全区域!");
                if (level <= 45) {
                    pv.setPercent(level / 50);
                } else {
                if(shishiValue>1.8){
                    pv.setPercent(0.9f);
                }else{
                    pv.setPercent((float) (shishiValue / 2.0));
                }
            } else if (level >= 65) {
                play();
            } else if (shishiValue >= 2) {
                showStatus(false);
                tv_tishi.setText("当前辐射超标");
                tv_desc.setText("您所处位置辐射超标\n不利于您的健康,请远离到安全区域!");
                pv.setPercent(1.0f);
                play();
            }
            realResult.clear();
        }
@@ -529,4 +576,21 @@
            return s;
        }
    }
    public void play(){
        if(mp!=null){
            stop();
        }
        int index = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getVideo();
        mp = MediaPlayer.create(getActivity(), voiceList.get(index).getRes());
        mp.start();
    }
    public void stop(){
        if(mp!=null&&mp.isPlaying()){
            mp.stop();
            mp.release();
            mp = null;
        }
    }
}
app/src/main/java/com/moral/yunfushao/fragment/FragmentShoppongMall.java
@@ -1,6 +1,10 @@
package com.moral.yunfushao.fragment;
import android.os.Build;
import android.view.View;
import android.webkit.WebChromeClient;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import com.moral.yunfushao.R;
import com.moral.yunfushao.base.BaseFragment;
@@ -11,6 +15,7 @@
 */
public class FragmentShoppongMall extends BaseFragment {
    private WebView mWebView;
    @Override
    protected int getLayoutId() {
        return R.layout.fragment_shoppingmall_layout;
@@ -18,7 +23,8 @@
    @Override
    protected void initViews() {
        mWebView = findView(R.id.webView);
        initWebViewSettings();
    }
    @Override
@@ -28,7 +34,7 @@
    @Override
    protected void initData() {
        mWebView.loadUrl("http://www.7drlb.cn");
    }
    @Override
@@ -40,4 +46,42 @@
    protected void onErrorPagerClick() {
    }
    private void initWebViewSettings() {
        mWebView.getSettings().setAllowFileAccess(true);
        mWebView.getSettings().setJavaScriptEnabled(true);
//        mWebView.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
        mWebView.getSettings().setAllowFileAccess(true);
        mWebView.getSettings().setAppCacheEnabled(true);
        mWebView.getSettings().setDomStorageEnabled(true);
        mWebView.getSettings().setDatabaseEnabled(true);
        if(Build.VERSION.SDK_INT >= 0x13) {
            mWebView.getSettings().setLoadsImagesAutomatically(true);
        } else {
            mWebView.getSettings().setLoadsImagesAutomatically(false);
        }
        mWebView.setWebViewClient(new WebViewClient() {
            @Override
            public boolean shouldOverrideUrlLoading(WebView view, String url) {
                progressDialog.show();
                return false;
            }
            @Override
            public void onPageFinished(WebView view, String url) {
                super.onPageFinished(view, url);
                if(!mWebView.getSettings().getLoadsImagesAutomatically()) {
                    mWebView.getSettings().setLoadsImagesAutomatically(true);
                }
            }
        });
        mWebView.setWebChromeClient(new WebChromeClient() {
            @Override
            public void onProgressChanged(WebView view, int newProgress) {
                super.onProgressChanged(view, newProgress);
                if(newProgress >= 64) {
                    progressDialog.dismiss();
                }
            }
        });
    }
}
app/src/main/java/com/moral/yunfushao/ui/PanelView.java
@@ -55,7 +55,7 @@
    private Paint drawTextPaint;
    private int textColor = Color.GRAY;
    private int textSize = 36;
    private String[] level = {"安全","低辐射","中低辐射","中高辐射","高辐射"};
    private String[] level = {"安全","低辐射","中辐射","高辐射"};
    //内进度圆
    private Paint mCirclePaint;
@@ -246,55 +246,80 @@
    private void drawTextKedu(Canvas canvas){
        for(int i=0;i<level.length;i++){
            float textWidth = drawTextPaint.measureText(level[i]);
            if(percent<0.25){
            if(percent<0.125){
                if(i==0){
                    drawTextPaint.setColor(line3Color);
                }else{
                    drawTextPaint.setColor(Color.GRAY);
                }
                canvas.save();
                canvas.rotate(-120+i*60,mWidth/2,mWidth/2);
                if(i==0){
                    canvas.rotate(-150,mWidth/2,mWidth/2);
                }else if(i==1){
                    canvas.rotate(-120,mWidth/2,mWidth/2);
                }else if(i==2){
                    canvas.rotate(0,mWidth/2,mWidth/2);
                }else if(i==3){
                    canvas.rotate(120,mWidth/2,mWidth/2);
                }
                canvas.drawText(level[i],mWidth / 2-textWidth/2, paddingKedu+line2Length+textSize,drawTextPaint);
                canvas.restore();
            }else if(percent<0.25&&percent>=0.44){
            }else if(percent>=0.125&&percent<0.4){
                if(i==1){
                    drawTextPaint.setColor(line3Color);
                }else{
                    drawTextPaint.setColor(Color.GRAY);
                }
                canvas.save();
                canvas.rotate(-120+i*60,mWidth/2,mWidth/2);
//                canvas.rotate(-120+i*75,mWidth/2,mWidth/2);
                if(i==0){
                    canvas.rotate(-150,mWidth/2,mWidth/2);
                }else if(i==1){
                    canvas.rotate(-120,mWidth/2,mWidth/2);
                }else if(i==2){
                    canvas.rotate(0,mWidth/2,mWidth/2);
                }else if(i==3){
                    canvas.rotate(120,mWidth/2,mWidth/2);
                }
                canvas.drawText(level[i],mWidth / 2-textWidth/2, paddingKedu+line2Length+textSize,drawTextPaint);
                canvas.restore();
            }else if(percent>=0.44&&percent<0.7){
            }else if(percent>=0.4&&percent<1.0){
                if(i==2){
                    drawTextPaint.setColor(line3Color);
                }else{
                    drawTextPaint.setColor(Color.GRAY);
                }
                canvas.save();
                canvas.rotate(-120+i*60,mWidth/2,mWidth/2);
//                canvas.rotate(-120+i*75,mWidth/2,mWidth/2);
                if(i==0){
                    canvas.rotate(-150,mWidth/2,mWidth/2);
                }else if(i==1){
                    canvas.rotate(-120,mWidth/2,mWidth/2);
                }else if(i==2){
                    canvas.rotate(0,mWidth/2,mWidth/2);
                }else if(i==3){
                    canvas.rotate(120,mWidth/2,mWidth/2);
                }
                canvas.drawText(level[i],mWidth / 2-textWidth/2, paddingKedu+line2Length+textSize,drawTextPaint);
                canvas.restore();
            }else if(percent>=0.7&&percent<0.9){
            }else if(percent>=1.0){
                if(i==3){
                    drawTextPaint.setColor(line3Color);
                }else{
                    drawTextPaint.setColor(Color.GRAY);
                }
                canvas.save();
                canvas.rotate(-120+i*60,mWidth/2,mWidth/2);
                canvas.drawText(level[i],mWidth / 2-textWidth/2, paddingKedu+line2Length+textSize,drawTextPaint);
                canvas.restore();
            }else {
                if (i == 4) {
                    drawTextPaint.setColor(line3Color);
                } else {
                    drawTextPaint.setColor(Color.GRAY);
//                canvas.rotate(-105+i*75,mWidth/2,mWidth/2);
                if(i==0){
                    canvas.rotate(-150,mWidth/2,mWidth/2);
                }else if(i==1){
                    canvas.rotate(-120,mWidth/2,mWidth/2);
                }else if(i==2){
                    canvas.rotate(0,mWidth/2,mWidth/2);
                }else if(i==3){
                    canvas.rotate(120,mWidth/2,mWidth/2);
                }
                canvas.save();
                canvas.rotate(-120 + i * 60, mWidth / 2, mWidth / 2);
                canvas.drawText(level[i], mWidth / 2 - textWidth / 2, paddingKedu + line2Length + textSize, drawTextPaint);
                canvas.drawText(level[i],mWidth / 2-textWidth/2, paddingKedu+line2Length+textSize,drawTextPaint);
                canvas.restore();
            }
        }
@@ -311,19 +336,15 @@
        canvas.drawArc(new RectF(mShaderWidth + widthInner, mShaderWidth + widthInner, mWidth - mShaderWidth - widthInner, mWidth - mShaderWidth - widthInner), 120, 300, false, mShaderPaint);
        //画圆环分隔
        canvas.save();
        canvas.rotate(30, mWidth / 2, mWidth / 2);
        canvas.rotate(120, mWidth / 2, mWidth / 2);
        canvas.drawLine(mWidth / 2, line2Length + paddingKedu*3, mWidth / 2, (float) (line2Length + paddingKedu*0.65+mShaderWidth*2), paintGapLine);
        canvas.restore();
        canvas.save();
        canvas.rotate(90, mWidth / 2, mWidth / 2);
        canvas.rotate(0, mWidth / 2, mWidth / 2);
        canvas.drawLine(mWidth / 2, line2Length + paddingKedu*3, mWidth / 2, (float) (line2Length + paddingKedu*0.65+mShaderWidth*2), paintGapLine);
        canvas.restore();
        canvas.save();
        canvas.rotate(-30, mWidth / 2, mWidth / 2);
        canvas.drawLine(mWidth / 2, line2Length + paddingKedu*3, mWidth / 2, (float) (line2Length + paddingKedu*0.65+mShaderWidth*2), paintGapLine);
        canvas.restore();
        canvas.save();
        canvas.rotate(-90, mWidth / 2, mWidth / 2);
        canvas.rotate(-120, mWidth / 2, mWidth / 2);
        canvas.drawLine(mWidth / 2, line2Length + paddingKedu*3, mWidth / 2, (float) (line2Length + paddingKedu*0.65+mShaderWidth*2), paintGapLine);
        canvas.restore();
    }
app/src/main/res/layout/fragment_shoppingmall_layout.xml
@@ -4,5 +4,8 @@
    android:layout_height="match_parent"
    android:background="@color/ac_bg"
    android:orientation="vertical">
    <WebView
        android:id="@+id/webView"
        android:layout_width="match_parent"
        android:layout_height="match_parent" />
</LinearLayout>
app/src/main/res/mipmap-xxhdpi/icon.png

app/src/main/res/mipmap-xxhdpi/logo_login.png

build/android-profile/profile-2017-07-29-09-07-41-960.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-09-08-12-050.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-09-09-59-887.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-09-12-45-460.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-09-59-29-610.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-10-00-16-632.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-10-02-16-651.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-10-06-59-586.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-10-28-03-911.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-10-28-50-206.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-10-31-11-993.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-10-33-02-522.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-10-34-44-382.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-10-38-57-997.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-10-39-24-892.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-13-15-10-789.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-13-23-08-787.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-13-43-29-527.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-16-32-50-500.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-16-46-49-076.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-16-50-24-379.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-16-53-43-859.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-16-57-12-285.rawproto
Binary files differ
build/android-profile/profile-2017-07-29-17-28-23-041.rawproto
Binary files differ
build/android-profile/profile-2017-07-31-08-40-11-516.rawproto
Binary files differ
build/android-profile/profile-2017-07-31-08-40-27-257.rawproto
Binary files differ
build/android-profile/profile-2017-07-31-08-51-00-086.rawproto
Binary files differ
build/android-profile/profile-2017-07-31-09-12-55-082.rawproto
Binary files differ
build/android-profile/profile-2017-07-31-09-29-34-235.rawproto
Binary files differ
build/android-profile/profile-2017-07-31-11-39-32-386.rawproto
Binary files differ
build/android-profile/profile-2017-07-31-11-41-16-619.rawproto
Binary files differ
build/android-profile/profile-2017-07-31-11-49-11-518.rawproto
Binary files differ
build/android-profile/profile-2017-07-31-12-19-12-987.rawproto
Binary files differ
build/android-profile/profile-2017-07-31-15-56-39-330.rawproto
Binary files differ
build/android-profile/profile-2017-08-01-08-43-31-565.rawproto
Binary files differ
build/android-profile/profile-2017-08-01-08-43-47-861.rawproto
Binary files differ
build/android-profile/profile-2017-08-01-10-07-33-659.rawproto
Binary files differ
build/android-profile/profile-2017-08-02-08-51-34-457.rawproto
Binary files differ
build/android-profile/profile-2017-08-02-08-51-59-753.rawproto
Binary files differ
build/android-profile/profile-2017-08-02-15-06-04-877.rawproto
Binary files differ
build/android-profile/profile-2017-08-02-15-08-38-735.rawproto
Binary files differ
build/android-profile/profile-2017-08-03-09-57-50-580.rawproto
Binary files differ
build/android-profile/profile-2017-08-03-09-58-07-564.rawproto
Binary files differ
build/android-profile/profile-2017-08-03-10-57-14-783.rawproto
Binary files differ
build/android-profile/profile-2017-08-03-11-18-54-403.rawproto
Binary files differ
build/android-profile/profile-2017-08-03-11-20-16-330.rawproto
Binary files differ
build/android-profile/profile-2017-08-03-14-05-00-587.rawproto
Binary files differ
build/android-profile/profile-2017-08-03-14-09-17-494.rawproto
Binary files differ
build/android-profile/profile-2017-08-03-14-11-10-130.rawproto
Binary files differ
build/android-profile/profile-2017-08-04-11-19-38-914.rawproto
Binary files differ
build/android-profile/profile-2017-08-04-11-19-55-955.rawproto
Binary files differ
build/android-profile/profile-2017-08-07-08-45-52-919.rawproto
Binary files differ
build/android-profile/profile-2017-08-07-08-46-08-185.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-08-31-35-688.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-08-32-37-679.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-09-09-29-719.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-09-38-19-496.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-09-43-42-143.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-09-45-14-995.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-09-48-19-335.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-09-49-26-011.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-09-52-23-953.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-09-54-08-973.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-10-00-18-383.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-10-03-41-677.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-10-09-11-877.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-10-12-14-432.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-10-13-40-162.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-10-32-39-938.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-10-33-59-541.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-10-41-47-446.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-10-43-52-075.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-10-45-07-572.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-10-54-04-880.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-11-10-28-423.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-11-12-28-001.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-11-12-54-353.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-11-25-47-669.rawproto
Binary files differ
build/android-profile/profile-2017-08-08-11-27-54-968.rawproto
Binary files differ
build/android-profile/profile-2017-08-09-13-44-18-198.rawproto
Binary files differ
build/android-profile/profile-2017-08-09-13-45-43-901.rawproto
Binary files differ
build/android-profile/profile-2017-08-09-13-46-19-228.rawproto
Binary files differ
build/android-profile/profile-2017-08-09-13-50-29-287.rawproto
Binary files differ
build/android-profile/profile-2017-08-10-14-03-54-685.rawproto
Binary files differ
build/android-profile/profile-2017-08-10-14-04-14-234.rawproto
Binary files differ
build/android-profile/profile-2017-08-11-08-58-50-769.rawproto
Binary files differ
build/android-profile/profile-2017-08-11-08-59-07-538.rawproto
Binary files differ
build/android-profile/profile-2017-08-11-09-09-21-642.rawproto
Binary files differ
build/android-profile/profile-2017-08-11-09-11-59-541.rawproto
Binary files differ
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/android-profile/profile-2018-03-07-15-13-25-489.rawproto
Binary files differ
build/android-profile/profile-2018-03-07-15-16-09-110.rawproto
Binary files differ
build/android-profile/profile-2018-03-07-16-36-06-006.rawproto
Binary files differ
build/android-profile/profile-2018-03-07-16-36-14-112.rawproto
Binary files differ
build/android-profile/profile-2018-03-12-17-00-58-516.rawproto
Binary files differ
build/android-profile/profile-2018-03-12-17-01-07-316.rawproto
Binary files differ
build/android-profile/profile-2018-03-16-15-34-18-401.rawproto
Binary files differ
build/android-profile/profile-2018-03-16-15-34-26-896.rawproto
Binary files differ
build/android-profile/profile-2018-03-26-13-17-30-049.rawproto
Binary files differ
build/android-profile/profile-2018-03-26-13-17-38-207.rawproto
Binary files differ
build/generated/mockable-android-25.jar
Binary files differ