1 优化基类传值逻辑

YangShuai
1 parent 666ed4ee
Showing 27 changed files with 67 additions and 75 deletions
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
cloud/user/src/main/java/com/cnlive/strike/user/ui/fragment/FirstLoginFragment.java
cloud/user/src/main/java/com/cnlive/strike/user/ui/fragment/QuickLoginFragment.java
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/ui/activity/ScanZarBarActivity.java
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/ui/fragment/QrPayFragment.java
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/ui/fragment/QrSignInFragment.java
core/base/src/main/java/com/cnlive/core/libs/base/frame/activity/BaseActivity.java
core/base/src/main/java/com/cnlive/core/libs/base/frame/fragment/BaseFragment.java
core/imageload/src/main/java/com/cnlive/core/imageload/preview/PreviewImgFragment.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/StartCollectTraceActivity.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/SelfRecordActivity.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/ShareRecordActivity.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/MyRecordFragment.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RaceRecorFragment.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
@@ -23,8 +23,8 @@ public class FirstLoginActivity extends BaseActivity {
     @Override
-    protected void initParam(Intent params) {
-        super.initParam(params);
+    protected void initParams(Intent params) {
+        super.initParams(params);
         tagMsg = params.getStringExtra(LoginActivity.TAG_MSG);
         boolean clickAd = params.getBooleanExtra(TAG_CLICK_AD, false);
         firstLoginFragment = new FirstLoginFragment();
@@ -6,7 +6,6 @@ import android.content.Intent;
 import android.net.Uri;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
@@ -69,8 +68,8 @@ public class LoginActivity extends BaseActivity  {
     }
     @Override
-    protected void initParam(Intent params) {
-        super.initParam(params);
+    protected void initParams(Intent params) {
+        super.initParams(params);
         fromTokenError = params.getBooleanExtra(FROM_TOKEN_ERROR, false);
         tagMsg = params.getStringExtra(TAG_MSG) == null ? "" : params.getStringExtra(TAG_MSG);
         shareType = params.getStringExtra(TAG_SHARE);
@@ -69,8 +69,8 @@ public class UpdateContentActivity extends BaseActivity implements View.OnClickL
     }
     @Override
-    protected void initParam(Intent params) {
-        super.initParam(params);
+    protected void initParams(Intent params) {
+        super.initParams(params);
         type = getIntent().getStringExtra("type");
     }
@@ -62,12 +62,9 @@ public class FirstLoginFragment extends BaseFragment&lt;FirstLoginView, FirstLoginP
     @Override
-    protected void initParams() {
-        super.initParams();
-        if (getArguments() != null) {
-            tagMsg = getArguments().getString(LoginActivity.TAG_MSG);
-            clickAd = getArguments().getBoolean(FirstLoginActivity.TAG_CLICK_AD);
-        }
+    protected void initParams(Bundle params) {
+        tagMsg = params.getString(LoginActivity.TAG_MSG);
+        clickAd = params.getBoolean(FirstLoginActivity.TAG_CLICK_AD);
     }
     @Override
@@ -80,15 +80,13 @@ public class QuickLoginFragment extends BaseFragment&lt;QuickLoginView, QuickLoginP
         showDefaultWhiteStatusBar();
     }
+
     @Override
-    protected void initParams() {
-        super.initParams();
-        if (getArguments() != null) {
-            fromTokenError = getArguments().getBoolean(LoginActivity.FROM_TOKEN_ERROR, false);
-            tagMsg = getArguments().getString(LoginActivity.TAG_MSG);
-            tagShare = getArguments().getString(LoginActivity.TAG_SHARE);
-            clickAd = getArguments().getBoolean(LoginActivity.TAG_CLICK_AD);
-        }
+    protected void initParams(Bundle params) {
+        fromTokenError = params.getBoolean(LoginActivity.FROM_TOKEN_ERROR, false);
+        tagMsg = params.getString(LoginActivity.TAG_MSG);
+        tagShare = params.getString(LoginActivity.TAG_SHARE);
+        clickAd = params.getBoolean(LoginActivity.TAG_CLICK_AD);
         uri = UserAction.getUri(getActivity());
     }
@@ -110,7 +110,7 @@ public class ScanZarBarActivity extends BaseActivity&lt;ScanNewView, ScanNewPresent
     }
     @Override
-    protected void initParam(Intent params) {
+    protected void initParams(Intent params) {
         type = params.getStringExtra("where");
     }
@@ -58,9 +58,10 @@ public class QrPayFragment extends BaseFragment&lt;QrPayView, QrPayPresenter&gt; imple
         binding = (FragmentQrPayBinding) baseBinding;
     }
+
     @Override
-    protected void initParams() {
-        dareId = getArguments().getString(tag_darenId);
+    protected void initParams(Bundle params) {
+        dareId = params.getString(tag_darenId);
     }
     @Override
@@ -49,9 +49,9 @@ public class QrSignInFragment extends BaseFragment&lt;QrSignInView, QrSignInPresent
     }
     @Override
-    protected void initParams() {
-        message = getArguments() == null ? null : (String) getArguments().getString("msg");
-        type = getArguments() == null ? null : (String) getArguments().getString("type");
+    protected void initParams(Bundle params) {
+        message = params.getString("msg");
+        type = params.getString("type");
         if (TextUtils.isEmpty(message) || TextUtils.isEmpty(type)) {
             AlertUtil.showDeftToast(getActivity(), "加载信息有误.");
             getActivity().finish();
@@ -59,7 +59,6 @@ public class QrSignInFragment extends BaseFragment&lt;QrSignInView, QrSignInPresent
         }
     }
-
     @Override
     protected void initView() {
         binding.tvMessage.setText(message);
@@ -38,7 +38,6 @@ import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ViewDataBinding;
 import androidx.fragment.app.Fragment;
-import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
@@ -165,7 +164,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
             initBindingLayoutData(baseBinding);
         }
         if (null != getIntent()) {
-            initParam(getIntent());
+            initParams(getIntent());
         }
         //初始化控件
         initView();
@@ -280,7 +279,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     protected void init(@Nullable Bundle savedInstanceState) {
     }
-    protected void initParam(Intent params) {
+    protected void initParams(Intent params) {
     }
     /**
@@ -92,7 +92,9 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
         setSwipeBackEnable(me.isOpenSwipBack());
         ARouter.getInstance().inject(this);
         init(savedInstanceState);
-        initParams();
+        if (null!=getArguments()){
+            initParams(getArguments());
+        }
     }
     @Nullable
@@ -279,7 +281,7 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
     /**
      * 在初始化视图之前做的事
      */
-    protected void initParams() {
+    protected void initParams(Bundle params) {
     }
@@ -47,10 +47,11 @@ public class PreviewImgFragment extends BaseFragment&lt;PreviewImgView, PreviewImgP
     }
+
     @Override
-    protected void initParams() {
-        super.initParams();
-        previewData = (ImagePreviewShowInfo) getArguments().getSerializable("data");
+    protected void initParams(Bundle params) {
+        previewData = (ImagePreviewShowInfo) params.getSerializable("data");
+
     }
     @Override
@@ -62,6 +63,6 @@ public class PreviewImgFragment extends BaseFragment&lt;PreviewImgView, PreviewImgP
     public void onDestroy() {
         super.onDestroy();
         Glide.with(this).onDestroy();
-        if (getMvpView()!=null)getMvpView().timerCancel();
+        if (getMvpView() != null) getMvpView().timerCancel();
     }
 }
@@ -36,7 +36,7 @@ public class CollPedometerMainActivity extends BaseActivity {
     private RunRaceDetailInfo runRaceDetailInfo;
     @Override
-    protected void initParam(Intent params) {
+    protected void initParams(Intent params) {
         runRaceDetailInfo = (RunRaceDetailInfo) params.getSerializableExtra("runRaceDetailInfo");
     }
@@ -39,7 +39,7 @@ public class StartCollectTraceActivity extends BaseActivity {
     }
     @Override
-    protected void initParam(Intent params) {
+    protected void initParams(Intent params) {
         runRaceDetailInfo = (RunRaceDetailInfo) params.getSerializableExtra("runRaceDetailInfo");
     }
@@ -30,7 +30,7 @@ public class RunLineActivity extends BaseActivity {
     @Override
-    protected void initParam(Intent params) {
+    protected void initParams(Intent params) {
         if (!TextUtils.isEmpty(params.getStringExtra("userId"))) {
             CommonInfo.setUserId(this, params.getStringExtra("userId"));
             CommonInfo.setUserNickName(this, params.getStringExtra("userName"));
@@ -48,7 +48,7 @@ public class RunRaceDetailActivity extends BaseActivity {
     }
     @Override
-    protected void initParam(Intent params) {
+    protected void initParams(Intent params) {
         if (params.getStringExtra("eventId") != null) {
             eventId = params.getStringExtra("eventId");
         }
@@ -27,7 +27,7 @@ public class SelfRecordActivity extends BaseActivity {
     @Override
-    protected void initParam(Intent params) {
+    protected void initParams(Intent params) {
         if (params.getStringExtra("userId") != null) {
             CommonInfo.setUserId(this, params.getStringExtra("userId"));
             CommonInfo.setUserNickName(this, params.getStringExtra("userName"));
@@ -72,7 +72,7 @@ public class ShareRecordActivity extends BaseActivity {
     @Override
-    protected void initParam(Intent params) {
+    protected void initParams(Intent params) {
         if (params.getStringExtra("idName") != null)
             idName = params.getStringExtra("idName");
     }
@@ -46,10 +46,11 @@ public class MyRecordFragment extends BaseFragment&lt;MyRecordView, MyRecordPresent
     }
+
     @Override
-    protected void initParams() {
-        super.initParams();
-        state = getArguments().getString("state");
+    protected void initParams(Bundle params) {
+        state = params.getString("state");
+
     }
     @Override
@@ -43,10 +43,10 @@ public class RaceRecorFragment extends BaseFragment&lt;RaceRecorView, RaceRecorPres
     }
+
     @Override
-    protected void initParams() {
-        super.initParams();
-        raceTitle = getArguments().getString("raceTitle");
+    protected void initParams(Bundle params) {
+        raceTitle = params.getString("raceTitle");
     }
     @Override
@@ -59,16 +59,14 @@ public class RegistrationInfoFragment extends BaseFragment&lt;RegistrationInfoView,
     @Override
     protected void initBindingLayoutData(ViewDataBinding baseBinding) {
         super.initBindingLayoutData(baseBinding);
-        binding = (FragmentRegistrationInfoBinding)baseBinding;
+        binding = (FragmentRegistrationInfoBinding) baseBinding;
     }
+
     @Override
-    protected void initParams() {
-        super.initParams();
-        if (null != getArguments()) {
-            fenceId = getArguments().getString("fenceId");
-        }
+    protected void initParams(Bundle params) {
+        fenceId = params.getString("fenceId");
     }
     @Override
@@ -68,12 +68,11 @@ public class RunMainFragment extends BaseFragment&lt;RunMainFragmentView, BasePrese
     }
     @Override
-    protected void initParams() {
-        super.initParams();
+    protected void initParams(Bundle params) {
         EventBus.getDefault().register(this);
         if (getArguments() != null) {
             initTipDialog();
-            runRaceDetailInfo = (RunRaceDetailInfo) getArguments().getSerializable("runRaceDetailInfo");
+            runRaceDetailInfo = (RunRaceDetailInfo)params.getSerializable("runRaceDetailInfo");
             UserStepEntity userStepEntity = StepUtil.getUserStepData(getActivity(), CommonInfo.getUserId(getActivity()));
             if (userStepEntity != null) {
                 if (runRaceDetailInfo != null) {
@@ -37,17 +37,15 @@ public class RunningFinishFragment extends BaseFragment&lt;RunningFinishFragmentVie
     @Override
     protected void initBindingLayoutData(ViewDataBinding baseBinding) {
         super.initBindingLayoutData(baseBinding);
-        binding = (FragmentFinishRunMapBinding)baseBinding;
+        binding = (FragmentFinishRunMapBinding) baseBinding;
     }
+
     @Override
-    protected void initParams() {
-        super.initParams();
-        if (getArguments() != null) {
-            runningFinishBean = (RunningFinishBean) getArguments().getSerializable("runningFinishBean");
+    protected void initParams(Bundle params) {
+        runningFinishBean = (RunningFinishBean) params.getSerializable("runningFinishBean");
-        }
     }
     @Override
 package com.cnlive.moudle.pedometer.ui.fragment;
+import android.os.Bundle;
+
 import androidx.databinding.ViewDataBinding;
 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
@@ -32,14 +34,11 @@ public class TakePartFragment extends BaseFragment&lt;TakePartView, TakePartPresent
     }
-    @Override
-    protected void initParams() {
-        super.initParams();
-        eventID = CommonInfo.getStreetId(getActivity());
-    }
+
     @Override
     protected void initView() {
+        eventID = CommonInfo.getStreetId(getActivity());
         getPresenter().setData(getActivity(), eventID, currentPage, itemNum);
         if (getMvpView() != null) getMvpView().initView();
         binding.refreshLayout.setOnRefreshListener(v -> {
@@ -45,7 +45,7 @@ public class ConnBluetoothSuccessActivity extends BaseActivity {
     @Override
-    protected void initParam(Intent params) {
+    protected void initParams(Intent params) {
         networkResultBean = (NetworkResultBean) params.getSerializableExtra("networkResultBean");
     }
@@ -30,7 +30,7 @@ public class ConnFailActivity extends BaseActivity {
     }
     @Override
-    protected void initParam(Intent params) {
+    protected void initParams(Intent params) {
         phone = params.getStringExtra("phone");
         if (!TextUtils.isEmpty(phone)) {
             binding.tvTip.setText("该设备已被" + phone + "绑定");
@@ -30,9 +30,11 @@ public class SelectWifiActivity extends BaseActivity {
     @Override
     protected void initView() {
-        bleDevice = (BleDevice) getIntent().getSerializableExtra("bleDevice");
+        bleDevice = (BleDevice) getIntent().getParcelableExtra("bleDevice");
         wifiUtils = new WifiUtils(this);
-        loadRootFragment(R.id.root_container, SelectWifiFragment.newInstance(bleDevice));
+        if (null != bleDevice) {
+            loadRootFragment(R.id.root_container, SelectWifiFragment.newInstance(bleDevice));
+        }
     }
@@ -60,7 +60,7 @@ public class SelectWifiFragment extends BaseFragment&lt;SelectWifiFragmentView, Sel
         initTopBar();
         if (null != getArguments()) {
-            BleDevice bleDevice = (BleDevice) getArguments().get("bleDevice");
+            BleDevice bleDevice = (BleDevice) getArguments().getParcelable("bleDevice");
             if (null != getMvpView() && null != bleDevice) {
                 getMvpView().initWifiList(bleDevice);
                 registerBroadcast();
@@ -69,7 +69,6 @@ public class SelectWifiFragment extends BaseFragment&lt;SelectWifiFragmentView, Sel
     }
-
     private void initTopBar() {
         if (null != binding) {
             binding.topbar.setTitle("请选择WIFI网络").setTextColor(ContextCompat.getColor(getActivity(), R.color.color_282828));