1.0.3-1测试版本 [*]修改重新连接的方式 [*]修改商城连接 [*]修改心跳机制 [*]主要针对oppo和vivo机型添加开启定位服务

陈奇

2018-11-13 fc9dc236266700d61e3538bee669f2f4abb242f2

 app/src/main/java/com/moral/yunfushao/MainActivity.java

@@ -6,9 +6,11 @@
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.content.pm.PackageManager;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.IBinder;
import android.os.Looper;
@@ -42,6 +44,7 @@
import com.moral.yunfushao.model.EventMessage;
import com.moral.yunfushao.model.User;
import com.moral.yunfushao.update.UpdateManager;
import com.moral.yunfushao.utils.PermissionUtil;

import org.greenrobot.eventbus.EventBus;
import org.json.JSONException;
@@ -63,13 +66,14 @@
    //定义fragments
    private Class fragments[] = {FragmentMonitor.class, FragmentShoppongMall.class, FragmentSettings.class};
    //定义底部按钮图标数组
    private int mIcons[] = {R.drawable.menu1, R.drawable.menu2,R.drawable.menu3};
    private int mIcons[] = {R.drawable.menu1, R.drawable.menu2, R.drawable.menu3};
    //Tab选项卡文字
    private String mTextArray[] = {"辐射监测", "商城","设置"};
    private String mTextArray[] = {"辐射监测", "商城", "设置"};
    private int index = 0;
    private boolean islogin = false;

    private BluetoothService mBluetoothService;
    public static BluetoothService mBluetoothService;

    @Override
    protected void getBundleExtras(Bundle extras) {
        islogin = extras.getBoolean("islogin", false);
@@ -81,9 +85,15 @@
    }

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
    protected void onStart() {
        super.onStart();
        bindService();
        PermissionUtil.verifyStoragePermissions(this);
    }

    @Override
    protected void onStop() {
        super.onStop();
    }

    @Override
@@ -133,13 +143,13 @@
    @Override
    protected void initData() {
        prepare();
        if(MainApp.theApp.bleManager!=null){
            if(MainApp.theApp.bleManager.isSupportBle()){
        if (MainApp.theApp.bleManager != null) {
            if (MainApp.theApp.bleManager.isSupportBle()) {
                MainApp.theApp.bleManager.enableBluetooth();
            }else{
            } else {
                mToatUtils.showSingletonToast("对不起，您的手机不支持BLE！");
            }
        }else{
        } else {
            mToatUtils.showSingletonToast("对不起，您的手机不支持BLE！");
        }
        getAd();
@@ -211,6 +221,20 @@
        }
    }

    @Override
    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);

        if (requestCode == 1) {
            for (int i = 0; i < permissions.length; i++) {
                if (grantResults[i] != PackageManager.PERMISSION_GRANTED) {
                    //申请失败
                    PermissionUtil.verifyStoragePermissions(this);
                }
            }
        }
    }

    UpdateManager manager = new UpdateManager(MainActivity.this);

    private class checkUpdateTask extends AsyncTask<String, Void, String> {
@@ -218,7 +242,7 @@
        protected String doInBackground(String... params) {
            Looper.prepare();
            // 检查软件更新
            manager.checkUpdate();
            manager.checkUpdateJson();
            Looper.loop();
            return null;
        }
@@ -244,16 +268,16 @@
            /**
             * 版本更新
             */
//            if (Build.VERSION.SDK_INT >= 11) {
//                new checkUpdateTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
//            } else {
//                new checkUpdateTask().execute();
//            }
            if (Build.VERSION.SDK_INT >= 11) {
                new checkUpdateTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
            } else {
                new checkUpdateTask().execute();
            }
            if (islogin)
                return;
            String url = API.GET_INFO;
            Map<String, String> params = new HashMap<>();
            params.put("phone",MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getPhone());
            params.put("phone", MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getPhone());
            HttpUtils.doPost(url, params, CacheMode.DEFAULT, false, new HttpCallBack() {
                @Override
                public void onSuccess(String res, String msg) {
@@ -270,12 +294,13 @@
                }

                @Override
                public void onFail(int errno,String s) {
                public void onFail(int errno, String s) {

                }
            });
        }
    }

    public BluetoothService getBluetoothService() {
        return mBluetoothService;
    }
@@ -295,45 +320,47 @@
            mBluetoothService = ((BluetoothService.BluetoothBinder) service).getService();
            mBluetoothService.setScanCallback(callback);
            String mac = MainApp.theApp.sharedPreferencesUtil.getBLE();
            if(!TextUtils.isEmpty(mac)){
            System.out.println("BleGattCallback init");
            if (!TextUtils.isEmpty(mac)) {
                mBluetoothService.scanAndConnect5(mac);
            }
        }

        @Override
        public void onServiceDisconnected(ComponentName name) {
            System.out.println("BleGattCallback onServiceDisconnected");
            mBluetoothService = null;
        }


    };

    private BluetoothService.Callback callback = new BluetoothService.Callback() {
        @Override
        public void onStartScan() {

            System.out.println("MainActivity onStartScan");
        }

        @Override
        public void onScanning(ScanResult result) {

            System.out.println("MainActivity onScanning");
        }

        @Override
        public void onScanComplete() {

            System.out.println("MainActivity onScanComplete");
        }

        @Override
        public void onConnecting() {
            System.out.println("MainActivity onConnecting");
            progressDialog.setTitleText("正在连接...");
            progressDialog.show();
        }

        @Override
        public void onConnectFail() {
            System.out.println("MainActivity onConnectFail");
            progressDialog.dismiss();
            mToatUtils.showSingletonToast("连接失败");
            mBluetoothService.closeConnect();
            EventMessage msg = new EventMessage();
            msg.setType(AppConfig.GET_BLE_DISCONNECT);
            EventBus.getDefault().postSticky(msg);
@@ -341,6 +368,7 @@

        @Override
        public void onDisConnected() {
            System.out.println("MainActivity onDisConnected");
            progressDialog.dismiss();
            mToatUtils.showSingletonToast("孕妇哨连接断开");
            EventMessage msg = new EventMessage();
@@ -350,6 +378,7 @@

        @Override
        public void onServicesDiscovered() {
            System.out.println("MainActivity onServicesDiscovered");
            progressDialog.dismiss();
            EventMessage msg = new EventMessage();
            msg.setType(AppConfig.GET_BLE_SERVICE);
@@ -359,11 +388,12 @@

    private AlertDialog adDialog;
    private View adView;
    private TextView tv_content,tv_name;
    private TextView tv_content, tv_name;
    private ImageView iv_logo;
    private Button bt_cancel,bt_ok;
    private void showAd(String content,String logo,String name){
        adView = LayoutInflater.from(this).inflate(R.layout.dialog_ad_layout,null);
    private Button bt_cancel, bt_ok;

    private void showAd(String content, String logo, String name) {
        adView = LayoutInflater.from(this).inflate(R.layout.dialog_ad_layout, null);
        tv_content = (TextView) adView.findViewById(R.id.tv_content);
        tv_name = (TextView) adView.findViewById(R.id.tv_name);
        bt_cancel = (Button) adView.findViewById(R.id.bt_cancel);
@@ -371,7 +401,7 @@
        iv_logo = (ImageView) adView.findViewById(R.id.iv_logo);
        tv_content.setText(content);
        tv_name.setText(name);
        ImageLoader.setCircleImageView(this,logo,iv_logo,R.mipmap.circle);
        ImageLoader.setCircleImageView(this, logo, iv_logo, R.mipmap.circle);
        bt_cancel.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View view) {
@@ -379,30 +409,30 @@
            }
        });
        adDialog = new AlertDialog.Builder(this).setView(adView).create();
        Window window=adDialog.getWindow();
        Window window = adDialog.getWindow();
        window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
        adDialog.show();
    }


    private void getAd(){
    private void getAd() {
        HttpUtils.doPost(API.GETAD, null, CacheMode.DEFAULT, false, new HttpCallBack() {
            @Override
            public void onSuccess(String res, String msg) {
                if(TextUtils.isEmpty(res)){
                if (TextUtils.isEmpty(res)) {
                    return;
                }
                try {
                    JSONObject json = new JSONObject(res);
                    String time  = MainApp.theApp.sharedPreferencesUtil.getShowAd();
                    if(TextUtils.isEmpty(time)){
                        showAd(json.optString("content"),json.optString("logo"),json.optString("name"));
                    String time = MainApp.theApp.sharedPreferencesUtil.getShowAd();
                    if (TextUtils.isEmpty(time)) {
                        showAd(json.optString("content"), json.optString("logo"), json.optString("name"));
                        MainApp.theApp.sharedPreferencesUtil.saveShowAd(TimeUtil.getCurrentDate("yyyy-MM-dd"));
                    }else{
                        if(time.equals(TimeUtil.getCurrentDate("yyyy-MM-dd"))){
                    } else {
                        if (time.equals(TimeUtil.getCurrentDate("yyyy-MM-dd"))) {
                            return;
                        }else{
                            showAd(json.optString("content"),json.optString("logo"),json.optString("name"));
                        } else {
                            showAd(json.optString("content"), json.optString("logo"), json.optString("name"));
                            MainApp.theApp.sharedPreferencesUtil.saveShowAd(TimeUtil.getCurrentDate("yyyy-MM-dd"));
                        }
                    }
@@ -424,9 +454,10 @@
        });
    }

    public void resetBLECallBack(){
        if(mBluetoothService!=null){
    public void resetBLECallBack() {
        if (mBluetoothService != null) {
            mBluetoothService.setScanCallback(callback);
        }
    }

}