CNLive Android Team / newModuleStrike · Commits

Commit 666ed4eefc32917fbd17bbf55d2187299e89186c

Authored by YangShuai
1 parent 066cf961

1 修改之前传值逻辑

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