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

陈奇

2018-11-07 3bd6e9023e011336da840e11a9d48bb31c7a0261

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

@@ -8,7 +8,6 @@
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.IBinder;
import android.os.Message;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.ActivityCompat;
@@ -107,6 +106,9 @@
                        MainApp.theApp.bleManager.closeBluetoothGatt();
                    }
                    mBluetoothService.connectDevice(scanResultList.get(position));
                    EventMessage eventMessage = new EventMessage();
                    eventMessage.setType(AppConfig.BLUETOOCH_CHANGE_CONNECT);
                    EventBus.getDefault().post(eventMessage);
                }
            }

@@ -119,7 +121,8 @@

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

    @Override
@@ -130,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();
@@ -176,7 +180,11 @@

        @Override
        public void onServiceDisconnected(ComponentName name) {
            mBluetoothService = null;
            if (mBluetoothService != null) {
                mBluetoothService.cancelScan();
                mBluetoothService.closeConnect();
                mBluetoothService = null;
            }
        }
    };

@@ -226,7 +234,7 @@
            if (ActivityManager.getActivityManager().isActivityExist(BLESearchActivity.this.getClass().getName())) {
                progressDialog.dismiss();
            }
            Log.d("chonglian","孕妇哨连接断开");
            Log.d("chonglian", "孕妇哨连接断开");
            mToatUtils.showSingletonToast("孕妇哨连接断开");
            EventMessage msg = new EventMessage();
            msg.setType(AppConfig.GET_BLE_DISCONNECT);
@@ -235,7 +243,7 @@

        @Override
        public void onServicesDiscovered() {
            Log.d("chonglian","孕妇哨连接成功");
            Log.d("chonglian", "孕妇哨连接成功");
            EventMessage msg = new EventMessage();
            msg.setType(AppConfig.GET_BLE_SERVICE);
            EventBus.getDefault().postSticky(msg);
@@ -243,7 +251,6 @@
                progressDialog.dismiss();
                finish();
            }

        }
    };