1 修改之前传值逻辑

YangShuai
1 parent 066cf961
Showing 37 changed files with 115 additions and 183 deletions
app/strike/src/main/java/com/cnlive/strike/MainActivity.java
app/strike/src/main/java/com/cnlive/strike/demo/activity/DemoActivity.java
app/strike/src/main/java/com/cnlive/strike/demo/activity/DemoMvpActivity.java
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/FirstLoginActivity.java
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/LoginActivity.java
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/UpdateContentActivity.java
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/ui/activity/ScanZarBarActivity.java
core/base/src/main/java/com/cnlive/core/libs/base/frame/activity/BaseActivity.java
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollPedometerMainActivity.java
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollRunningMapActivity.java
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollTraceListDetailActivity.java
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/RaceNameListActivity.java
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/StartCollectTraceActivity.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/ALLScoreDetailActivity.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/OnGoingActivity.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/PedometerMainActivity.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RegistrationInfoActivity.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunLineActivity.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunningFinishActivity.java
@@ -37,7 +37,7 @@ public class MainActivity extends AppCompatActivity {
         findViewById(R.id.go_to).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(MainActivity.this, DemoMvpActivity.class));
+                startActivity(new Intent(MainActivity.this, DemoMvpActivity.class).putExtra("ys","杨帅"));
 //
             }
         });
@@ -36,13 +36,6 @@ public class DemoActivity extends BaseActivity {
 ////        binding=(你的bingding)baseBinding;
 //    }
-    /**
-     * 初始化intent传递参数
-     */
-    @Override
-    protected void initParam() {
-        super.initParam();
-    }
     @Override
     protected void initView() {
@@ -66,7 +66,7 @@ public class DemoMvpActivity extends BaseActivity&lt;DemoActivityView, DemoActivity
     @Override
     protected void initView() {
-        setStatusBarColor(R.color.black,0, StatusBarConfig.BLACK);
+        setStatusBarColor(R.color.red,100, StatusBarConfig.BLACK);
 //        //登录页
         binding.btnLogin.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -128,8 +128,8 @@ public class DemoMvpActivity extends BaseActivity&lt;DemoActivityView, DemoActivity
                             UserService.getInstance(me).getAppAccount().getNickName(),
                             UserService.getInstance(me).getAppAccount().getFaceUrl(),
                             UserService.getInstance(me).getAppAccount().getMobile());
+                    startActivity(new Intent(me, RunLineActivity.class));
                 }
-                startActivity(new Intent(me, RunLineActivity.class));
             }
         });
         //路径工具
 package com.cnlive.strike.user.ui.activity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -20,11 +21,12 @@ public class FirstLoginActivity extends BaseActivity {
     public static String TAG_CLICK_AD = "clickAd";
+
     @Override
-    protected void initParam() {
-        super.initParam();
-        tagMsg = getIntent().getStringExtra(LoginActivity.TAG_MSG);
-        boolean clickAd = getIntent().getBooleanExtra(TAG_CLICK_AD, false);
+    protected void initParam(Intent params) {
+        super.initParam(params);
+        tagMsg = params.getStringExtra(LoginActivity.TAG_MSG);
+        boolean clickAd = params.getBooleanExtra(TAG_CLICK_AD, false);
         firstLoginFragment = new FirstLoginFragment();
         Bundle args = new Bundle();
         args.putString(LoginActivity.TAG_MSG, TextUtils.isEmpty(tagMsg) ? "" : tagMsg);
@@ -69,12 +69,12 @@ public class LoginActivity extends BaseActivity  {
     }
     @Override
-    protected void initParam() {
-        super.initParam();
-        fromTokenError = getIntent().getBooleanExtra(FROM_TOKEN_ERROR, false);
-        tagMsg = getIntent().getStringExtra(TAG_MSG) == null ? "" : getIntent().getStringExtra(TAG_MSG);
-        shareType = getIntent().getStringExtra(TAG_SHARE);
-        clickAd = getIntent().getBooleanExtra(TAG_CLICK_AD, false);
+    protected void initParam(Intent params) {
+        super.initParam(params);
+        fromTokenError = params.getBooleanExtra(FROM_TOKEN_ERROR, false);
+        tagMsg = params.getStringExtra(TAG_MSG) == null ? "" : params.getStringExtra(TAG_MSG);
+        shareType = params.getStringExtra(TAG_SHARE);
+        clickAd = params.getBooleanExtra(TAG_CLICK_AD, false);
     }
     @Override
@@ -69,8 +69,8 @@ public class UpdateContentActivity extends BaseActivity implements View.OnClickL
     }
     @Override
-    protected void initParam() {
-        super.initParam();
+    protected void initParam(Intent params) {
+        super.initParam(params);
         type = getIntent().getStringExtra("type");
     }
@@ -110,10 +110,8 @@ public class ScanZarBarActivity extends BaseActivity&lt;ScanNewView, ScanNewPresent
     }
     @Override
-    protected void initParam() {
-        super.initParam();
-        type = getIntent().getStringExtra("where");
-
+    protected void initParam(Intent params) {
+        type = params.getStringExtra("where");
     }
     @Override
@@ -164,7 +164,9 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         if (null != baseBinding) {
             initBindingLayoutData(baseBinding);
         }
-        initParam();
+        if (null != getIntent()) {
+            initParam(getIntent());
+        }
         //初始化控件
         initView();
         //设置数据
@@ -278,7 +280,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     protected void init(@Nullable Bundle savedInstanceState) {
     }
-    protected void initParam() {
+    protected void initParam(Intent params) {
     }
     /**
@@ -36,11 +36,8 @@ public class CollPedometerMainActivity extends BaseActivity {
     private RunRaceDetailInfo runRaceDetailInfo;
     @Override
-    protected void initParam() {
-        super.initParam();
-        if (null != getIntent().getExtras()) {
-            runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().getSerializable("runRaceDetailInfo");
-        }
+    protected void initParam(Intent params) {
+        runRaceDetailInfo = (RunRaceDetailInfo) params.getSerializableExtra("runRaceDetailInfo");
     }
     @Override
@@ -111,7 +108,6 @@ public class CollPedometerMainActivity extends BaseActivity {
     }
-
     /**
      * 一次申请一组权限（使用拒绝弹框）点击事件
      */
@@ -15,12 +15,10 @@ public class CollRunningMapActivity extends BaseActivity {
     @Override
     protected void initView() {
-        setStatusBarColor(R.color.run_main_bg,0);
-        if (null != getIntent().getExtras()) {
-            RunRaceDetailInfo runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().getSerializable("runRaceDetailInfo");
-            if (runRaceDetailInfo != null) {
-                loadRootFragment(CollRunningMapFragment.getInstance(runRaceDetailInfo));
-            }
+        setStatusBarColor(R.color.run_main_bg, 0);
+        RunRaceDetailInfo runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getSerializableExtra("runRaceDetailInfo");
+        if (runRaceDetailInfo != null) {
+            loadRootFragment(CollRunningMapFragment.getInstance(runRaceDetailInfo));
         }
     }
@@ -19,14 +19,12 @@ public class CollTraceListDetailActivity extends BaseActivity {
     @Override
     protected void initView() {
-        if (null != getIntent().getExtras()) {
-            eventShoeLinesBean = (RaceNameListInfo.EventShoeLinesBean) getIntent().getExtras().get("eventShoeLinesBean");
-            String fenceEntityName = getIntent().getExtras().getString("fenceEntityName");
-            String position = getIntent().getExtras().getString("position");
+            eventShoeLinesBean = (RaceNameListInfo.EventShoeLinesBean) getIntent().getSerializableExtra("eventShoeLinesBean");
+            String fenceEntityName = getIntent().getStringExtra("fenceEntityName");
+            String position = getIntent().getStringExtra("position");
             if (null != eventShoeLinesBean) {
                 loadRootFragment(CollTraceListDetailFragment.newInstance(eventShoeLinesBean, position));
             }
-        }
     }
@@ -27,12 +27,10 @@ public class RaceNameListActivity extends BaseActivity {
     @Override
     protected void initView() {
         setStatusBarTextColor(StatusBarConfig.BLACK);
-        setStatusBarColor(R.color.white,0);
-        if (null != getIntent().getExtras()) {
-            RunRaceDetailInfo runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().getSerializable("runRaceDetailInfo");
-            if (null != runRaceDetailInfo) {
+        setStatusBarColor(R.color.white, 0);
+        RunRaceDetailInfo runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getSerializableExtra("runRaceDetailInfo");
+        if (null != runRaceDetailInfo) {
             loadRootFragment(RaceNameListFragment.newInstance(getIntent().getStringExtra("eventId"), runRaceDetailInfo));
-            }
         }
     }
@@ -39,11 +39,8 @@ public class StartCollectTraceActivity extends BaseActivity {
     }
     @Override
-    protected void initParam() {
-        super.initParam();
-        if (null != getIntent().getExtras()) {
-            runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().getSerializable("runRaceDetailInfo");
-        }
+    protected void initParam(Intent params) {
+        runRaceDetailInfo = (RunRaceDetailInfo) params.getSerializableExtra("runRaceDetailInfo");
     }
     @Override
@@ -91,7 +88,7 @@ public class StartCollectTraceActivity extends BaseActivity {
             isFirstRequestGPS = false;
             if (!isOpenGps) {
                 //开启GPS
-               CheckUtil.openHighAccuracyGPS(this);
+                CheckUtil.openHighAccuracyGPS(this);
             } else {
                 checkIgnore();
             }
@@ -18,12 +18,10 @@ public class ALLScoreDetailActivity extends BaseActivity {
     @Override
     protected void initView() {
-        if (null != getIntent().getExtras()) {
-            RunningFinishBean runningFinishBean = (RunningFinishBean) getIntent().getExtras().getSerializable("runningFinishBean");
+            RunningFinishBean runningFinishBean = (RunningFinishBean) getIntent().getSerializableExtra("runningFinishBean");
             if (runningFinishBean != null) {
                 loadRootFragment(ALLScoreDetailFragment.newInstance(runningFinishBean));
             }
-        }
     }
@@ -15,11 +15,9 @@ import com.example.moudle_pedometer.R;
 public class OnGoingActivity extends BaseActivity {
     @Override
     protected void initView() {
-        if (null != getIntent().getExtras()) {
-            String eventId = getIntent().getExtras().getString("eventId");
-            if (null != eventId) {
-                loadRootFragment(OnGoingFragment.newInstance(eventId));
-            }
+        String eventId = getIntent().getStringExtra("eventId");
+        if (null != eventId) {
+            loadRootFragment(OnGoingFragment.newInstance(eventId));
         }
     }
@@ -35,5 +33,4 @@ public class OnGoingActivity extends BaseActivity {
     }
-
 }
@@ -39,20 +39,17 @@ public class PedometerMainActivity extends BaseActivity {
     @Override
     protected void initView() {
-        if (null != getIntent().getExtras()) {
-            if (null != getIntent().getExtras().get("runRaceDetailInfo")) {
-                runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().get("runRaceDetailInfo");
-                if (getTopFragment() == null) {
-                    if (runRaceDetailInfo != null) {
-                        loadRootFragment(RunMainFragment.newInstance(runRaceDetailInfo));
-                    }
+        if (null != getIntent().getSerializableExtra("runRaceDetailInfo")) {
+            runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getSerializableExtra("runRaceDetailInfo");
+            if (getTopFragment() == null) {
+                if (runRaceDetailInfo != null) {
+                    loadRootFragment(RunMainFragment.newInstance(runRaceDetailInfo));
                 }
             }
         }
     }
-
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -71,7 +68,6 @@ public class PedometerMainActivity extends BaseActivity {
     }
-
     @Override
     public void onBackPressed() {
         return;
@@ -25,7 +25,7 @@ public class RegistrationInfoActivity extends BaseActivity {
     protected void initView() {
         setStatusBarColor(R.color.color_fff,0);
         setStatusBarTextColor(StatusBarConfig.BLACK);
-        String fenceId = getIntent().getExtras().getString("fenceId");
+        String fenceId = getIntent().getStringExtra("fenceId");
         loadRootFragment(RegistrationInfoFragment.newInstance(fenceId));
     }
 }
@@ -3,6 +3,7 @@ package com.cnlive.moudle.pedometer.ui.activity;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
@@ -29,13 +30,12 @@ public class RunLineActivity extends BaseActivity {
     @Override
-    protected void initParam() {
-        super.initParam();
-        if (getIntent().getStringExtra("userId") != null) {
-            CommonInfo.setUserId(this, getIntent().getStringExtra("userId"));
-            CommonInfo.setUserNickName(this, getIntent().getStringExtra("userName"));
-            CommonInfo.setUserIcon(this, getIntent().getStringExtra("userIcon"));
-            CommonInfo.setUserPhone(this, getIntent().getStringExtra("userPhone"));
+    protected void initParam(Intent params) {
+        if (!TextUtils.isEmpty(params.getStringExtra("userId"))) {
+            CommonInfo.setUserId(this, params.getStringExtra("userId"));
+            CommonInfo.setUserNickName(this, params.getStringExtra("userName"));
+            CommonInfo.setUserIcon(this, params.getStringExtra("userIcon"));
+            CommonInfo.setUserPhone(this, params.getStringExtra("userPhone"));
         }
     }
@@ -48,18 +48,15 @@ public class RunRaceDetailActivity extends BaseActivity {
     }
     @Override
-    protected void initParam() {
-        super.initParam();
-        if (null != getIntent().getExtras()) {
-            if (getIntent().getStringExtra("eventId") != null) {
-                eventId = getIntent().getStringExtra("eventId");
-            }
-            if (getIntent().getStringExtra("userId") != null) {
-                CommonInfo.setUserId(this, getIntent().getStringExtra("userId"));
-                CommonInfo.setUserNickName(this, getIntent().getStringExtra("userName"));
-                CommonInfo.setUserIcon(this, getIntent().getStringExtra("userIcon"));
-                CommonInfo.setUserPhone(this, getIntent().getStringExtra("userPhone"));
-            }
+    protected void initParam(Intent params) {
+        if (params.getStringExtra("eventId") != null) {
+            eventId = params.getStringExtra("eventId");
+        }
+        if (getIntent().getStringExtra("userId") != null) {
+            CommonInfo.setUserId(this, params.getStringExtra("userId"));
+            CommonInfo.setUserNickName(this, params.getStringExtra("userName"));
+            CommonInfo.setUserIcon(this, params.getStringExtra("userIcon"));
+            CommonInfo.setUserPhone(this, params.getStringExtra("userPhone"));
         }
     }
@@ -26,12 +26,10 @@ public class RunningFinishActivity extends BaseActivity {
     protected void initView() {
         setStatusBarColor(R.color.run_main_bg, 0);
         setStatusBarTextColor(StatusBarConfig.WHITE);
-        if (null != getIntent().getExtras()) {
-            if (getIntent().getSerializableExtra("runningFinishBean") != null) {
-                RunningFinishBean runningFinishBean = (RunningFinishBean) getIntent().getSerializableExtra("runningFinishBean");
-                if (null != runningFinishBean) {
-                    loadRootFragment(RunningFinishFragment.instance(runningFinishBean));
-                }
+        if (getIntent().getSerializableExtra("runningFinishBean") != null) {
+            RunningFinishBean runningFinishBean = (RunningFinishBean) getIntent().getSerializableExtra("runningFinishBean");
+            if (null != runningFinishBean) {
+                loadRootFragment(RunningFinishFragment.instance(runningFinishBean));
             }
         }
@@ -23,12 +23,10 @@ public class RunningMapActivity extends BaseActivity {
     protected void initView() {
         setStatusBarColor(R.color.run_main_bg, 0);
         setStatusBarTextColor(StatusBarConfig.WHITE);
-        if (null != getIntent().getExtras()) {
-            RunningMapBean chronometerBean = (RunningMapBean) getIntent().getExtras().getSerializable("runningMapBean");
+            RunningMapBean chronometerBean = (RunningMapBean) getIntent().getSerializableExtra("runningMapBean");
             if (chronometerBean != null) {
                 loadRootFragment(RunningMapFragment.getInstance(chronometerBean));
             }
-        }
     }
@@ -25,14 +25,14 @@ public class SelfRecordActivity extends BaseActivity {
         context.startActivity(intent);
     }
+
     @Override
-    protected void initParam() {
-        super.initParam();
-        if (getIntent().getStringExtra("userId") != null) {
-            CommonInfo.setUserId(this, getIntent().getStringExtra("userId"));
-            CommonInfo.setUserNickName(this, getIntent().getStringExtra("userName"));
-            CommonInfo.setUserIcon(this, getIntent().getStringExtra("userIcon"));
-            CommonInfo.setUserPhone(this, getIntent().getStringExtra("userPhone"));
+    protected void initParam(Intent params) {
+        if (params.getStringExtra("userId") != null) {
+            CommonInfo.setUserId(this, params.getStringExtra("userId"));
+            CommonInfo.setUserNickName(this, params.getStringExtra("userName"));
+            CommonInfo.setUserIcon(this, params.getStringExtra("userIcon"));
+            CommonInfo.setUserPhone(this, params.getStringExtra("userPhone"));
         }
     }
@@ -70,11 +70,11 @@ public class ShareRecordActivity extends BaseActivity {
         return R.layout.activity_share_record;
     }
+
     @Override
-    protected void initParam() {
-        super.initParam();
-        if (getIntent().getStringExtra("idName") != null)
-            idName = getIntent().getStringExtra("idName");
+    protected void initParam(Intent params) {
+        if (params.getStringExtra("idName") != null)
+            idName = params.getStringExtra("idName");
     }
     @Override
@@ -14,11 +14,9 @@ import java.io.Serializable;
 public class UploadFailDetailActivity extends BaseActivity {
     @Override
     protected void initView() {
-        if (null != getIntent().getExtras()) {
-            FailedEntity failedEntity = (FailedEntity) getIntent().getExtras().getSerializable("failedEntity");
-            if (failedEntity != null) {
-                loadRootFragment(UploadFailDetailFragment.newInstance(failedEntity));
-            }
+        FailedEntity failedEntity = (FailedEntity) getIntent().getSerializableExtra("failedEntity");
+        if (failedEntity != null) {
+            loadRootFragment(UploadFailDetailFragment.newInstance(failedEntity));
         }
     }
@@ -15,14 +15,11 @@ import com.cnlive.strike.xiaojiaspeaker.ui.fragment.ChangeDeviceNameFragment;
 public class ChangeDeviceNameActivity extends BaseActivity {
     @Override
     protected void initView() {
-        if (null != getIntent().getExtras()) {
-            String deviceId = getIntent().getExtras().getString("deviceId");
-            String oldName = getIntent().getExtras().getString("oldName");
+            String deviceId = getIntent().getStringExtra("deviceId");
+            String oldName = getIntent().getStringExtra("oldName");
             if (!TextUtils.isEmpty(deviceId)) {
                 loadRootFragment(ChangeDeviceNameFragment.newInstance(deviceId, oldName));
-//                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, ChangeDeviceNameFragment.newInstance(deviceId,oldName)).commitAllowingStateLoss();
             }
-        }
     }
@@ -33,10 +33,8 @@ public class ChangeWifiActivity extends BaseActivity {
     @Override
     protected void initView() {
-        if (null != getIntent().getExtras()) {
-            currentUser = (FamilyListBean.UsersBeanX) getIntent().getExtras().getSerializable("currentUser");
-            sn = getIntent().getExtras().getString("sn");
-        }
+        currentUser = (FamilyListBean.UsersBeanX) getIntent().getSerializableExtra("currentUser");
+        sn = getIntent().getStringExtra("sn");
         wifiUtils = new WifiUtils(this);
         if (null != currentUser && !TextUtils.isEmpty(sn)) {
             loadRootFragment(ChangeWifiFragment.newInstance(sn, currentUser));
@@ -43,12 +43,11 @@ public class ConnBluetoothSuccessActivity extends BaseActivity {
     }
+
     @Override
-    protected void initParam() {
-        super.initParam();
-        if (null != getIntent().getExtras()) {
-            networkResultBean = (NetworkResultBean) getIntent().getExtras().getSerializable("networkResultBean");
-        }
+    protected void initParam(Intent params) {
+        networkResultBean = (NetworkResultBean) params.getSerializableExtra("networkResultBean");
+
     }
     @Override
@@ -25,20 +25,16 @@ public class ConnFailActivity extends BaseActivity {
     @Override
     protected void initBindingLayoutData(ViewDataBinding baseBinding) {
         super.initBindingLayoutData(baseBinding);
-        binding= (ActivityConnFailBinding) baseBinding;
+        binding = (ActivityConnFailBinding) baseBinding;
     }
     @Override
-    protected void initParam() {
-        super.initParam();
-        if (null != getIntent().getExtras()) {
-            phone = getIntent().getExtras().getString("phone");
-        }
+    protected void initParam(Intent params) {
+        phone = params.getStringExtra("phone");
         if (!TextUtils.isEmpty(phone)) {
             binding.tvTip.setText("该设备已被" + phone + "绑定");
         }
-
     }
     @Override
@@ -59,7 +55,7 @@ public class ConnFailActivity extends BaseActivity {
     private void initTopBar() {
-        setStatusBarColor(R.color.white,0);
+        setStatusBarColor(R.color.white, 0);
         setStatusBarTextColor(StatusBarConfig.BLACK);
         if (null != binding) {
             //设置返回按钮
@@ -18,14 +18,12 @@ public class DeviceDetailActivity extends BaseActivity {
     @Override
     protected void initView() {
-        if (null != getIntent().getExtras()) {
-            FamilyListBean.UsersBeanX.DeviceListBean allDeviceInfo = (FamilyListBean.UsersBeanX.DeviceListBean) getIntent().getExtras().getSerializable("allDeviceInfo");
-            FamilyListBean.UsersBeanX currentUser = (FamilyListBean.UsersBeanX) getIntent().getExtras().getSerializable("currentUser");
+            FamilyListBean.UsersBeanX.DeviceListBean allDeviceInfo = (FamilyListBean.UsersBeanX.DeviceListBean) getIntent().getSerializableExtra("allDeviceInfo");
+            FamilyListBean.UsersBeanX currentUser = (FamilyListBean.UsersBeanX) getIntent().getSerializableExtra("currentUser");
             if (null != allDeviceInfo && null!=currentUser) {
                 loadRootFragment(DeviceDetailFragment.newInstance(allDeviceInfo, currentUser));
             }
-        }
     }
@@ -26,18 +26,16 @@ public class DeviceInfoActivity extends BaseActivity {
     @Override
     protected void initBindingLayoutData(ViewDataBinding baseBinding) {
         super.initBindingLayoutData(baseBinding);
-        binding= (ActivityDeviceInfoBinding) baseBinding;
+        binding = (ActivityDeviceInfoBinding) baseBinding;
     }
     @Override
     protected void initView() {
         initTopBar();
-        if (null != getIntent().getExtras()) {
-            DeviceDetail deviceDetail = (DeviceDetail) getIntent().getExtras().getSerializable("deviceDetail");
-            if (null != deviceDetail) {
-                initView(deviceDetail.getIP(), deviceDetail.getMAC(), deviceDetail.getSN());
-            }
+        DeviceDetail deviceDetail = (DeviceDetail) getIntent().getSerializableExtra("deviceDetail");
+        if (null != deviceDetail) {
+            initView(deviceDetail.getIP(), deviceDetail.getMAC(), deviceDetail.getSN());
         }
     }
@@ -49,7 +47,7 @@ public class DeviceInfoActivity extends BaseActivity {
     private void initTopBar() {
         setStatusBarTextColor(StatusBarConfig.BLACK);
-        setStatusBarColor(R.color.white,0);
+        setStatusBarColor(R.color.white, 0);
         if (null != binding) {
             binding.topbar.setTitle("设备信息");
             //设置返回按钮
@@ -23,14 +23,12 @@ public class DeviceManagerActivity extends BaseActivity {
     @Override
     protected void initView() {
-        if (null != getIntent().getExtras()) {
-            FamilyListBean.UsersBeanX.DeviceListBean currentDeviceInfo = (FamilyListBean.UsersBeanX.DeviceListBean) getIntent().getExtras().getSerializable("currentDeviceInfo");
-            FamilyListBean.UsersBeanX currentUser = (FamilyListBean.UsersBeanX) getIntent().getExtras().getSerializable("currentUser");
+            FamilyListBean.UsersBeanX.DeviceListBean currentDeviceInfo = (FamilyListBean.UsersBeanX.DeviceListBean) getIntent().getSerializableExtra("currentDeviceInfo");
+            FamilyListBean.UsersBeanX currentUser = (FamilyListBean.UsersBeanX) getIntent().getSerializableExtra("currentUser");
             if (null != currentDeviceInfo && null != currentUser) {
                 fragment = DeviceManagerFragment.newInstance(currentUser, currentDeviceInfo);
                 loadRootFragment(fragment);
             }
-        }
     }
@@ -16,11 +16,9 @@ public class FirmwareUpdateActivity extends BaseActivity {
     @Override
     protected void initView() {
-        if (null!=getIntent().getExtras()){
-            DeviceDetail deviceDetail= (DeviceDetail) getIntent().getExtras().getSerializable("deviceDetail");
+            DeviceDetail deviceDetail= (DeviceDetail) getIntent().getSerializableExtra("deviceDetail");
             loadRootFragment(FirmwareUpdateFragment.newInstance(deviceDetail));
 //            getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, FirmwareUpdateFragment.newInstance(deviceDetail)).commitAllowingStateLoss();
-        }
     }
     public static void startActivity(Activity activity, DeviceDetail deviceDetail) {
@@ -16,13 +16,10 @@ public class InvitFriendActivity extends BaseActivity {
     @Override
     protected void initView() {
-        if (null != getIntent().getExtras()) {
-            String currentSelectFamilyId = getIntent().getExtras().getString("currentSelectFamilyId");
+            String currentSelectFamilyId = getIntent().getStringExtra("currentSelectFamilyId");
             if (!TextUtils.isEmpty(currentSelectFamilyId)) {
                 loadRootFragment(InvitFriendFragment.newInstance(currentSelectFamilyId));
-//                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, InvitFriendFragment.newInstance(currentSelectFamilyId)).commitAllowingStateLoss();
             }
-        }
     }
     public static void startActivity(Activity activity, String currentSelectFamilyId) {
@@ -12,13 +12,10 @@ import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectIMFriendFragment;
 public class SelectIMFriendActivity extends BaseActivity {
     @Override
     protected void initView() {
-        if (null != getIntent().getExtras()) {
-            String currentSelectFamilyId = getIntent().getExtras().getString("currentSelectFamilyId");
+            String currentSelectFamilyId = getIntent().getStringExtra("currentSelectFamilyId");
             if (!TextUtils.isEmpty(currentSelectFamilyId)) {
                 loadRootFragment(R.id.root_container, SelectIMFriendFragment.newInstance(currentSelectFamilyId));
-//                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, SelectIMFriendFragment.newInstance(currentSelectFamilyId)).commit();
             }
-        }
     }
@@ -30,15 +30,12 @@ public class SelectWifiActivity extends BaseActivity {
     @Override
     protected void initView() {
-        if (null != getIntent().getExtras()) {
-            bleDevice = (BleDevice) getIntent().getExtras().get("bleDevice");
-        }
+        bleDevice = (BleDevice) getIntent().getSerializableExtra("bleDevice");
         wifiUtils = new WifiUtils(this);
-        loadRootFragment(R.id.root_container,SelectWifiFragment.newInstance(bleDevice));
+        loadRootFragment(R.id.root_container, SelectWifiFragment.newInstance(bleDevice));
     }
-
     private void initPermissionDefineTip() {
         selectDialog = new SelectDialog(SelectWifiActivity.this, "您尚未授予程序运行所需权限\n是否设置?",
                 "返回", new SelectDialog.DialogInterface() {
@@ -16,16 +16,13 @@ import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SetFriendsRoleFragment;
 public class SetFriendsRoleActivity extends BaseActivity {
     @Override
     protected void initView() {
-        if (null != getIntent().getExtras()) {
-            String selectUid = getIntent().getExtras().getString("selectUid");
-            String currentSelectFamilyId = getIntent().getExtras().getString("currentSelectFamilyId");
-            if (!TextUtils.isEmpty(selectUid) && !TextUtils.isEmpty(currentSelectFamilyId)) {
-                loadRootFragment(R.id.root_container,SetFriendsRoleFragment.newInstance(selectUid, currentSelectFamilyId));
+        String selectUid = getIntent().getStringExtra("selectUid");
+        String currentSelectFamilyId = getIntent().getStringExtra("currentSelectFamilyId");
+        if (!TextUtils.isEmpty(selectUid) && !TextUtils.isEmpty(currentSelectFamilyId)) {
+            loadRootFragment(R.id.root_container, SetFriendsRoleFragment.newInstance(selectUid, currentSelectFamilyId));
 //                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, SetFriendsRoleFragment.newInstance(selectUid, currentSelectFamilyId)).commitAllowingStateLoss();
-            }else {
-                AlertUtil.showDeftToast(this,"参数异常");
-            }
         } else {
+            AlertUtil.showDeftToast(this, "参数异常");
             finish();
         }
     }
@@ -14,13 +14,11 @@ import com.cnlive.strike.xiaojiaspeaker.ui.fragment.UserManagerFragment;
 public class UserManagerActivity extends BaseActivity {
     @Override
     protected void initView() {
-        if (null != getIntent().getExtras()) {
-            String currentSelectFamilyId = getIntent().getExtras().getString("currentSelectFamilyId");
+            String currentSelectFamilyId = getIntent().getStringExtra("currentSelectFamilyId");
             if (!TextUtils.isEmpty(currentSelectFamilyId)) {
                 loadRootFragment(R.id.root_container,UserManagerFragment.newInstance(currentSelectFamilyId));
 //                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, UserManagerFragment.newInstance(currentSelectFamilyId)).commitAllowingStateLoss();
             }
-        }
     }