[*]将电磁版本的唤醒心跳改成两秒，唤醒之后回到30一次心跳 [*]整体版本页面显示的绝对安全换成了安全 [*]自定义语音修改和优化，添加了无声的选择

陈奇

2018-11-07 3bd6e9023e011336da840e11a9d48bb31c7a0261

 app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java

@@ -105,7 +105,10 @@
                    if (MainApp.theApp.bleManager != null) {
                        MainApp.theApp.bleManager.closeBluetoothGatt();
                    }
                    mBluetoothService.scanAndConnect5(scanResultList.get(position).getDevice().getAddress());
                    mBluetoothService.connectDevice(scanResultList.get(position));
                    EventMessage eventMessage = new EventMessage();
                    eventMessage.setType(AppConfig.BLUETOOCH_CHANGE_CONNECT);
                    EventBus.getDefault().post(eventMessage);
                }
            }

@@ -118,7 +121,8 @@

    @Override
    protected void initListener() {
        iv_search.setOnClickListener(this);
//        iv_search.setOnClickListener(this);
        iv_searchpic.setOnClickListener(this);
    }

    @Override
@@ -129,7 +133,8 @@
    @Override
    protected void processClick(View view) {
        switch (view.getId()) {
            case R.id.iv_search:
            case R.id.iv_searchpic:
                mBluetoothService.openBlueTooth();
                if (isScan) {
                    if (mBluetoothService != null) {
                        mBluetoothService.cancelScan();
@@ -246,7 +251,6 @@
                progressDialog.dismiss();
                finish();
            }

        }
    };