添加新功能

陈奇

2019-05-29 c5bf501d8b507d1e3e79541e7ac9b45910860b4d

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

@@ -13,13 +13,11 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v13.app.ActivityCompat;
import android.support.v4.app.ActivityOptionsCompat;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
@@ -28,7 +26,6 @@
import com.moral.andbrickslib.baseadapter.headandfooter.DividerItemDecoration;
import com.moral.andbrickslib.baseadapter.recyclerview.MultiItemTypeAdapter;
import com.moral.andbrickslib.utils.ActivityManager;
import com.moral.yunfushao.MainActivity;
import com.moral.yunfushao.MainApp;
import com.moral.yunfushao.R;
import com.moral.yunfushao.adapter.BleDeviceAdapter;
@@ -71,8 +68,11 @@
    @Override
    protected void onDestroy() {
        super.onDestroy();
        if (mBluetoothService != null)
        if (mBluetoothService != null) {
            mBluetoothService.cancelScan();
            unbindService();
        }

        EventMessage msg = new EventMessage();
        msg.setType(AppConfig.SET_MAIN_CALL);
        EventBus.getDefault().postSticky(msg);
@@ -153,7 +153,7 @@
                isScan = !isScan;
                break;
            case R.id.tv_left:
                finishA();
                finish();
                break;
        }

@@ -329,21 +329,5 @@
        } else {
            mBluetoothService.scanDevice();
        }
    }

    @Override
    public boolean onKeyDown(int keyCode, KeyEvent event) {
        if (keyCode == KeyEvent.KEYCODE_BACK) {
            finishA();
            return true;
        }
        return super.onKeyDown(keyCode, event);
    }

    public void finishA(){
        Intent i = new Intent(this, MainActivity.class);
        ActivityOptionsCompat optionsCompat = ActivityOptionsCompat.makeSceneTransitionAnimation(this, iv_searchpic, "dddd");
        startActivity(i, optionsCompat.toBundle());
        finish();
    }
}