杨帅 / XiaojiaSoundBox · Commits

Commit 75eb85c25d2935949329d23ff10404455bfcc6e0

Authored by YangShuai
1 parent 1d688198

1 修复搜索wifi返回后,异常问题

Inline Side-by-side
Showing 2 changed files with 9 additions and 4 deletions
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/SelectWifiActivity.java
  View file @75eb85c
@@ -20,6 +20,7 @@ import android.util.Log; @@ -20,6 +20,7 @@ import android.util.Log;
20 20
21 import com.clj.fastble.BleManager; 21 import com.clj.fastble.BleManager;
22 import com.clj.fastble.data.BleDevice; 22 import com.clj.fastble.data.BleDevice;
  23 +import com.cnlive.libs.base.util.AlertUtil;
23 import com.cnlive.strike.xiaojiaspeaker.R; 24 import com.cnlive.strike.xiaojiaspeaker.R;
24 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SearchDevicefragment; 25 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SearchDevicefragment;
25 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectWifiFragment; 26 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectWifiFragment;
@@ -43,11 +44,15 @@ public class SelectWifiActivity extends AppCompatActivity { @@ -43,11 +44,15 @@ public class SelectWifiActivity extends AppCompatActivity {
43 protected void onCreate(Bundle savedInstanceState) { 44 protected void onCreate(Bundle savedInstanceState) {
44 super.onCreate(savedInstanceState); 45 super.onCreate(savedInstanceState);
45 setContentView(R.layout.activity_select_wifi); 46 setContentView(R.layout.activity_select_wifi);
46 - bleDevice = (BleDevice) getIntent().getSerializableExtra("bleDevice"); 47 + bleDevice = (BleDevice) getIntent().getParcelableExtra("bleDevice");
47 wifiUtils = new WifiUtils(this); 48 wifiUtils = new WifiUtils(this);
48 -// registerBroadcast();  
49 // getPermissionsWithTip(); 49 // getPermissionsWithTip();
50 - getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, SelectWifiFragment.newInstance(bleDevice)).commitAllowingStateLoss(); 50 + if (null != bleDevice) {
  51 + getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, SelectWifiFragment.newInstance(bleDevice)).commitAllowingStateLoss();
  52 + }else {
  53 + AlertUtil.showDeftToast(this,"参数异常");
  54 + finish();
  55 + }
51 } 56 }
52 57
53 58
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SelectWifiFragment.java
  View file @75eb85c
@@ -56,7 +56,7 @@ public class SelectWifiFragment extends MvpBindingFragment<SelectWifiFragmentVie @@ -56,7 +56,7 @@ public class SelectWifiFragment extends MvpBindingFragment<SelectWifiFragmentVie
56 56
57 initTopBar(); 57 initTopBar();
58 if (null != getArguments()) { 58 if (null != getArguments()) {
59 - BleDevice bleDevice = (BleDevice) getArguments().get("bleDevice"); 59 + BleDevice bleDevice = (BleDevice) getArguments().getParcelable("bleDevice");
60 if (null != getMvpView() && null != bleDevice) { 60 if (null != getMvpView() && null != bleDevice) {
61 getMvpView().initWifiList(bleDevice); 61 getMvpView().initWifiList(bleDevice);
62 registerBroadcast(); 62 registerBroadcast();