CNLive Android Team / newModuleStrike · Commits

Commit c3a2c149c43dab605bc5f05bc013d81824db51d0

Authored by YangShuai
1 parent 99b0acb4

1 优化基类

Inline Side-by-side
Showing 100 changed files with 603 additions and 636 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 102 files are displayed.

app/strike/src/main/java/com/cnlive/strike/EmptyFragment.java deleted 100644 → 0
  View file @99b0acb
1   -package com.cnlive.strike;
2   -
3   -import android.os.Bundle;
4   -import android.view.LayoutInflater;
5   -import android.view.View;
6   -import android.view.ViewGroup;
7   -
8   -import androidx.annotation.NonNull;
9   -import androidx.annotation.Nullable;
10   -
11   -import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
12   -
13   -public class EmptyFragment extends BaseFragment {
14   - @Nullable
15   - @Override
16   - public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
17   - return inflater.inflate(R.layout.fragment_main1, container, false);
18   - }
19   -}
app/strike/src/main/java/com/cnlive/strike/LoginSuccessActivity.java
  View file @c3a2c14
1 1 package com.cnlive.strike;
2 2  
3 3 import android.content.Intent;
4   -import android.net.Uri;
5   -import android.text.TextUtils;
  4 +import android.os.Bundle;
6 5 import android.util.Log;
7 6  
  7 +import androidx.annotation.Nullable;
  8 +
8 9 import com.alibaba.android.arouter.facade.annotation.Autowired;
9 10 import com.alibaba.android.arouter.facade.annotation.Route;
10   -import com.alibaba.android.arouter.launcher.ARouter;
11 11 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
12   -import com.cnlive.strike.user.auth.UserService;
13 12 import com.cnlive.strike.user.model.LoginSuccessInfo;
14   -import com.cnlive.strike.user.ui.activity.FirstLoginActivity;
15 13 import com.cnlive.strike.user.ui.activity.PersonalDataActivity;
16 14 import com.cnlive.strike.user.util.UserRouterHelper;
17 15  
... ... @@ -31,15 +29,15 @@ public class LoginSuccessActivity extends BaseActivity {
31 29 LoginSuccessInfo successInfo;//登录成功后需要传递的数据
32 30  
33 31 @Override
34   - protected void initCreate() {
35   - super.initCreate();
  32 + protected void init(@Nullable Bundle savedInstanceState) {
  33 + super.init(savedInstanceState);
36 34 //不显示默认空视图
37 35 setEnableCreateDefultEmptyView(false);
38 36 }
39 37  
  38 +
40 39 @Override
41   - protected void initParam() {
42   - super.initParam();
  40 + protected void initView() {
43 41 initAction();
44 42 }
45 43  
... ...
app/strike/src/main/java/com/cnlive/strike/demo/activity/DemoActivity.java
  View file @c3a2c14
... ... @@ -49,7 +49,6 @@ public class DemoActivity extends BaseActivity {
49 49 */
50 50 @Override
51 51 protected void initView() {
52   - super.initView();
53 52 //是指是否可以侧滑返回,默认禁用d
54 53 // setSwipeBackEnable(true);
55 54 //设置状态栏字体颜色
... ...
app/strike/src/main/java/com/cnlive/strike/demo/activity/DemoAnimActivity.java
  View file @c3a2c14
... ... @@ -31,7 +31,6 @@ public class DemoAnimActivity extends BaseActivity {
31 31  
32 32 @Override
33 33 protected void initView() {
34   - super.initView();
35 34 mListView = (ListView) findViewById(R.id.list_items);
36 35 mTarget = findViewById(R.id.hello_world);
37 36  
... ...
app/strike/src/main/java/com/cnlive/strike/demo/activity/DemoMvpActivity.java
  View file @c3a2c14
... ... @@ -2,8 +2,10 @@ package com.cnlive.strike.demo.activity;
2 2  
3 3 import android.Manifest;
4 4 import android.content.Intent;
  5 +import android.os.Bundle;
5 6 import android.os.Handler;
6 7 import android.os.Message;
  8 +import android.os.PersistableBundle;
7 9 import android.text.TextUtils;
8 10 import android.view.LayoutInflater;
9 11 import android.view.View;
... ... @@ -11,10 +13,12 @@ import android.widget.LinearLayout;
11 13 import android.widget.TextView;
12 14  
13 15 import androidx.annotation.NonNull;
  16 +import androidx.annotation.Nullable;
14 17  
15 18 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
16 19 import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;
17 20 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
  21 +import com.cnlive.core.libs.base.util.StatusBarConfig;
18 22 import com.cnlive.core.network.HttpConn;
19 23 import com.cnlive.core.network.NetCallBack;
20 24 import com.cnlive.core.network.model.BaseResult;
... ... @@ -48,6 +52,7 @@ public class DemoMvpActivity extends BaseActivity<DemoActivityView, DemoActivity
48 52 public ActivityDemoMvpMainBinding binding;
49 53 private String[] permission = new String[]{Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE};
50 54  
  55 +
51 56 @Override
52 57 protected void initBindingData() {
53 58 super.initBindingData();
... ... @@ -59,9 +64,11 @@ public class DemoMvpActivity extends BaseActivity<DemoActivityView, DemoActivity
59 64 return R.layout.activity_demo_mvp_main;
60 65 }
61 66  
  67 +
  68 +
62 69 @Override
63 70 protected void initView() {
64   - super.initView();
  71 + setStatusBarColor(R.color.black,0, StatusBarConfig.BLACK);
65 72 // //登录页
66 73 binding.btnLogin.setOnClickListener(new View.OnClickListener() {
67 74 @Override
... ...
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/FirstLoginActivity.java
  View file @c3a2c14
... ... @@ -34,7 +34,6 @@ public class FirstLoginActivity extends BaseActivity {
34 34  
35 35 @Override
36 36 protected void initView() {
37   - super.initView();
38 37 if (null != firstLoginFragment) {
39 38 loadRootFragment(firstLoginFragment);
40 39 }
... ...
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/LoginDialogActivity.java
  View file @c3a2c14
... ... @@ -77,7 +77,6 @@ public class LoginDialogActivity extends BaseActivity<LoginDialogView, LoginDial
77 77  
78 78 @Override
79 79 protected void initView() {
80   - super.initView();
81 80 WindowManager.LayoutParams p = getWindow().getAttributes();
82 81 p.height = WindowManager.LayoutParams.MATCH_PARENT;
83 82 p.width = (ScreenUtils.getScreenWidth(this) - dp2px(88));
... ...
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/PersonalDataActivity.java
  View file @c3a2c14
... ... @@ -67,7 +67,6 @@ public class PersonalDataActivity extends BaseActivity<PersonalDataView, Persona
67 67  
68 68 @Override
69 69 protected void initView() {
70   - super.initView();
71 70 setStatusBarTextColor(StatusBarConfig.BLACK);
72 71 setStatusBarColor(R.color.color_fff,0);
73 72 QMUITopBar toolbar = (QMUITopBar) binding.titleBar;
... ...
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/PersonalImageActivity.java
  View file @c3a2c14
... ... @@ -65,7 +65,6 @@ public class PersonalImageActivity extends BaseActivity<PersonalImageView, Perso
65 65  
66 66 @Override
67 67 protected void initView() {
68   - super.initView();
69 68 setStatusBarTextColor(StatusBarConfig.BLACK);
70 69 setStatusBarColor(R.color.color_fff,0);
71 70 iconPath = UserService.getInstance(this).getAppAccount().getBigFaceUrl();
... ...
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/SelectCountryActivity.java
  View file @c3a2c14
... ... @@ -50,7 +50,6 @@ public class SelectCountryActivity extends BaseActivity<SelectCountryView, Selec
50 50  
51 51 @Override
52 52 protected void initView() {
53   - super.initView();
54 53 setStatusBarTextColor(StatusBarConfig.BLACK);
55 54 setStatusBarColor(R.color.color_fff, 0);
56 55 if (getMvpView() != null) {
... ...
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/SignatureActivity.java
  View file @c3a2c14
... ... @@ -63,7 +63,6 @@ public class SignatureActivity extends BaseActivity implements View.OnClickListe
63 63  
64 64 @Override
65 65 protected void initView() {
66   - super.initView();
67 66 setStatusBarColor(R.color.color_fff, 0);
68 67 setStatusBarTextColor(StatusBarConfig.BLACK);
69 68 userId = UserService.getUid(this);
... ...
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/UpdateContentActivity.java
  View file @c3a2c14
... ... @@ -77,7 +77,6 @@ public class UpdateContentActivity extends BaseActivity implements View.OnClickL
77 77  
78 78 @Override
79 79 protected void initView() {
80   - super.initView();
81 80 setStatusBarTextColor(StatusBarConfig.BLACK);
82 81 setStatusBarColor(R.color.color_fff, 0);
83 82 showSoftInput(binding.edContent);
... ...
cloud/user/src/main/java/com/cnlive/strike/user/ui/fragment/FirstLoginFragment.java
  View file @c3a2c14
1 1 package com.cnlive.strike.user.ui.fragment;
2 2  
3 3 import android.Manifest;
4   -import android.app.Activity;
5 4 import android.app.Dialog;
6 5 import android.app.ProgressDialog;
7 6 import android.content.Intent;
  7 +import android.os.Bundle;
8 8 import android.os.Environment;
9 9 import android.text.Editable;
10 10 import android.text.TextUtils;
11 11 import android.text.TextWatcher;
12 12 import android.view.View;
13 13  
14   -import androidx.annotation.NonNull;
15   -import androidx.appcompat.app.AppCompatActivity;
16   -
17 14 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
18 15 import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;
19 16 import com.cnlive.core.libs.base.util.AlertUtil;
20 17 import com.cnlive.core.libs.base.util.GlideUtil;
21   -import com.cnlive.core.libs.base.util.StatusBarConfig;
22 18 import com.cnlive.media.picker.ImagePicker;
23 19 import com.cnlive.media.picker.PickerConfig;
24 20 import com.cnlive.media.picker.entity.Media;
... ... @@ -52,10 +48,9 @@ public class FirstLoginFragment extends BaseFragment<FirstLoginView, FirstLoginP
52 48 public FirstLoginData data;
53 49  
54 50 @Override
55   - protected void initFragmentStyle() {
56   - super.initFragmentStyle();
57   - setStatusBarTextColor(StatusBarConfig.BLACK);
58   - setStatusBarColor(R.color.color_fff, 0);
  51 + protected void init(Bundle savedInstanceState) {
  52 + super.init(savedInstanceState);
  53 + showDefaultWhiteStatusBar();
59 54 }
60 55  
61 56 @Override
... ... @@ -85,7 +80,6 @@ public class FirstLoginFragment extends BaseFragment<FirstLoginView, FirstLoginP
85 80  
86 81 @Override
87 82 protected void initView() {
88   - super.initView();
89 83 mProgressDialog = new ProgressDialog(getActivity());
90 84 mProgressDialog.setOnCancelListener(dialog -> getMvpView().hideProgress());
91 85 CNLiveUserInfo userInfo = UserService.getInstance(getActivity()).getAppAccount();
... ...
cloud/user/src/main/java/com/cnlive/strike/user/ui/fragment/QuickLoginFragment.java
  View file @c3a2c14
... ... @@ -5,18 +5,12 @@ import android.content.Intent;
5 5 import android.net.Uri;
6 6 import android.os.Bundle;
7 7 import android.text.TextUtils;
8   -import android.view.LayoutInflater;
9   -import android.view.View;
10   -import android.view.ViewGroup;
11 8  
12 9 import androidx.annotation.NonNull;
13   -import androidx.annotation.Nullable;
14   -import androidx.databinding.DataBindingUtil;
15 10  
16 11 import com.cnlive.core.libs.base.application.AppConfig;
17 12 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
18 13 import com.cnlive.core.libs.base.util.DoublePressed;
19   -import com.cnlive.core.libs.base.util.StatusBarConfig;
20 14 import com.cnlive.strike.user.R;
21 15 import com.cnlive.strike.user.databinding.FragmentQuickLoginBinding;
22 16 import com.cnlive.strike.user.frame.data.QuickLoginData;
... ... @@ -52,6 +46,7 @@ public class QuickLoginFragment extends BaseFragment<QuickLoginView, QuickLoginP
52 46 public QuickLoginData data;
53 47 public String tagUrl;
54 48 public static String TAG_URL = "tagurl";
  49 +
55 50 @Override
56 51 protected int getBindLayoutId() {
57 52 return R.layout.fragment_quick_login;
... ... @@ -79,10 +74,9 @@ public class QuickLoginFragment extends BaseFragment<QuickLoginView, QuickLoginP
79 74 }
80 75  
81 76 @Override
82   - protected void initFragmentStyle() {
83   - super.initFragmentStyle();
84   - setStatusBarColor(R.color.color_fff, 0);
85   - setStatusBarTextColor(StatusBarConfig.BLACK);
  77 + protected void init(Bundle savedInstanceState) {
  78 + super.init(savedInstanceState);
  79 + showDefaultWhiteStatusBar();
86 80 }
87 81  
88 82 @Override
... ... @@ -100,14 +94,13 @@ public class QuickLoginFragment extends BaseFragment<QuickLoginView, QuickLoginP
100 94 @Override
101 95 protected void initBindingData() {
102 96 super.initBindingData();
103   - binding= (FragmentQuickLoginBinding) getBaseBinding();
  97 + binding = (FragmentQuickLoginBinding) getBaseBinding();
104 98 data = new QuickLoginData();
105 99 binding.setData(data);
106 100 }
107 101  
108 102 @Override
109 103 protected void initView() {
110   - super.initView();
111 104 adapter = new UserListAdapter(getActivity(), 0);
112 105 adapter.setClickListener((name) -> getMvpView().onUploadLoginUser(name));
113 106 adapter.setDeleteListener((name) -> getMvpView().onDeleteLoginUser(name));
... ...
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/ui/activity/ScanZarBarActivity.java
  View file @c3a2c14
... ... @@ -6,8 +6,10 @@ import android.content.Intent;
6 6 import android.media.SoundPool;
7 7 import android.os.Bundle;
8 8 import android.os.Vibrator;
  9 +
9 10 import androidx.annotation.NonNull;
10 11 import androidx.annotation.Nullable;
  12 +
11 13 import android.text.TextUtils;
12 14 import android.view.MotionEvent;
13 15  
... ... @@ -54,7 +56,7 @@ public class ScanZarBarActivity extends BaseActivity<ScanNewView, ScanNewPresent
54 56 //用户页面的返回码
55 57 public int userResult = 10010;
56 58 //是否支持双指放大
57   - boolean isFinger_zoom=true;
  59 + boolean isFinger_zoom = true;
58 60 public SoundPool soundPool;
59 61  
60 62 private float oldDist = 5f;
... ... @@ -82,7 +84,7 @@ public class ScanZarBarActivity extends BaseActivity<ScanNewView, ScanNewPresent
82 84  
83 85 @Override
84 86 public boolean onTouchEvent(MotionEvent event) {
85   - if(isFinger_zoom){
  87 + if (isFinger_zoom) {
86 88 switch (event.getAction() & MotionEvent.ACTION_MASK) {
87 89 case MotionEvent.ACTION_POINTER_DOWN:
88 90 oldDist = QRUtils.getInstance().getFingerSpacing(event);
... ... @@ -106,13 +108,18 @@ public class ScanZarBarActivity extends BaseActivity<ScanNewView, ScanNewPresent
106 108 }
107 109  
108 110 @Override
109   - protected void onCreate(@Nullable Bundle savedInstanceState) {
110   - super.onCreate(savedInstanceState);
  111 + protected void initParam() {
  112 + super.initParam();
111 113 type = getIntent().getStringExtra("where");
  114 +
  115 + }
  116 +
  117 + @Override
  118 + protected void initView() {
112 119 QRCodeReceiptObservable.getInstance().addObserver(this);
113 120 getMvpView().initView();
114 121  
115   - requestPermission(String.valueOf(R.string.CAMERA),new String[]{Manifest.permission.CAMERA}, new OnPermissionResponseListener() {
  122 + requestPermission(String.valueOf(R.string.CAMERA), new String[]{Manifest.permission.CAMERA}, new OnPermissionResponseListener() {
116 123 @Override
117 124 public void onSuccess(String[] permissions) {
118 125 getMvpView().startScan();
... ... @@ -194,7 +201,8 @@ public class ScanZarBarActivity extends BaseActivity<ScanNewView, ScanNewPresent
194 201 ArrayList<Media> select = data.getParcelableArrayListExtra(PickerConfig.EXTRA_RESULT);
195 202 if (select != null && select.size() > 0) {
196 203 String path = select.get(0).path;
197   - if (!TextUtils.isEmpty(path)&&getPresenter() != null)getPresenter().IdentifyQRCode(this,path);
  204 + if (!TextUtils.isEmpty(path) && getPresenter() != null)
  205 + getPresenter().IdentifyQRCode(this, path);
198 206  
199 207 // if (getPresenter() != null) getPresenter().luBanFile(this, path);
200 208  
... ...
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/ui/fragment/QrPayFragment.java
  View file @c3a2c14
... ... @@ -2,7 +2,9 @@ package com.cnlive.strike.moudle.qr.ui.fragment;
2 2  
3 3 import android.app.Dialog;
4 4 import android.os.Bundle;
  5 +
5 6 import androidx.annotation.Nullable;
  7 +
6 8 import android.text.InputFilter;
7 9 import android.text.TextUtils;
8 10 import android.view.View;
... ... @@ -63,12 +65,6 @@ public class QrPayFragment extends BaseFragment&lt;QrPayView, QrPayPresenter&gt; imple
63 65 protected void initView() {
64 66 QRCodeReceiptObservable.getInstance().addObserver(this);
65 67 binding.includeToolbar.topbar.setTitle("付款");
66   - }
67   -
68   -
69   - @Override
70   - public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
71   - super.onViewCreated(view, savedInstanceState);
72 68 binding.setOnClick(v -> onClick(v.getId()));
73 69  
74 70 getPresenter().getDarenInfo(getActivity(), dareId);
... ... @@ -94,25 +90,26 @@ public class QrPayFragment extends BaseFragment&lt;QrPayView, QrPayPresenter&gt; imple
94 90 });
95 91 }
96 92  
  93 +
97 94 private void onClick(int id) {
98 95  
99   - if (R.id.bt_pay==id){
  96 + if (R.id.bt_pay == id) {
100 97 String money = binding.tvMoney.getText().toString();
101 98  
102 99 if (!TextUtils.isEmpty(money)) {
103 100 double xx = Double.valueOf(money);
104   - if (xx > 0){
  101 + if (xx > 0) {
105 102 getPresenter().getQrOrder(getActivity(), dareId, money, remarkContent);
106   - }else {
  103 + } else {
107 104 getMvpView().showMessage("请输入正确的金额");
108 105 }
109 106  
110 107 } else {
111 108 getMvpView().showMessage("请输入正确的金额");
112 109 }
113   - }else if (R.id.tv_remarks==id){
  110 + } else if (R.id.tv_remarks == id) {
114 111 remarkDialog.show();
115   - }else if (R.id.tv_change==id){
  112 + } else if (R.id.tv_change == id) {
116 113 remarkDialog.show();
117 114 }
118 115 }
... ...
core/base/src/main/AndroidManifest.xml
  View file @c3a2c14
... ... @@ -2,6 +2,7 @@
2 2 package="com.cnlive.strike.base">
3 3  
4 4 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
  5 + <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
5 6 <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
6 7 <uses-permission android:name="android.permission.RECORD_AUDIO" />
7 8 <uses-permission android:name="android.permission.CAMERA" />
... ...
core/base/src/main/java/com/cnlive/core/libs/base/application/BaseApplication.java
  View file @c3a2c14
... ... @@ -18,6 +18,10 @@ import androidx.annotation.Nullable;
18 18  
19 19 import com.cnlive.core.libs.base.util.ScreenUtils;
20 20 import com.cnlive.core.libs.base.util.ViewUtils;
  21 +import com.daimajia.androidanimations.library.Techniques;
  22 +import com.daimajia.androidanimations.library.YoYo;
  23 +import com.daimajia.easing.Glider;
  24 +import com.daimajia.easing.Skill;
21 25 import com.orhanobut.logger.AndroidLogAdapter;
22 26 import com.orhanobut.logger.FormatStrategy;
23 27 import com.orhanobut.logger.Logger;
... ...
core/base/src/main/java/com/cnlive/core/libs/base/frame/activity/BaseActivity.java
  View file @c3a2c14
... ... @@ -10,8 +10,6 @@ import android.content.pm.PackageManager;
10 10 import android.content.res.Configuration;
11 11 import android.content.res.Resources;
12 12 import android.graphics.Bitmap;
13   -import android.graphics.Color;
14   -import android.graphics.Point;
15 13 import android.net.Uri;
16 14 import android.os.Build;
17 15 import android.os.Bundle;
... ... @@ -20,7 +18,6 @@ import android.os.Message;
20 18 import android.provider.Settings;
21 19 import android.text.TextUtils;
22 20 import android.util.DisplayMetrics;
23   -import android.view.Display;
24 21 import android.view.MotionEvent;
25 22 import android.view.View;
26 23 import android.view.Window;
... ... @@ -69,7 +66,6 @@ import com.orhanobut.logger.Logger;
69 66  
70 67 import org.greenrobot.eventbus.EventBus;
71 68  
72   -import java.lang.reflect.Field;
73 69 import java.util.ArrayList;
74 70 import java.util.List;
75 71 import java.util.Observable;
... ... @@ -122,8 +118,9 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
122 118 return baseBinding;
123 119 }
124 120  
  121 +
125 122 @Override
126   - protected void onCreate(@Nullable Bundle savedInstanceState) {
  123 + public final void onCreate(@Nullable Bundle savedInstanceState) {
127 124 super.onCreate(savedInstanceState);
128 125 if (0 != getBindLayoutId()) {
129 126 baseBinding = DataBindingUtil.setContentView(this, getBindLayoutId());
... ... @@ -142,7 +139,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
142 139 //fragment管理
143 140 mDelegate.onCreate(savedInstanceState);
144 141 mSwipeDelegate.onCreate(savedInstanceState);
145   - initCreate();
  142 + init(savedInstanceState);
146 143 //两种视图都没有设置,就加载默认跟视图,用于fragment切换
147 144 if (isCreateDefultEmptyView) {
148 145 if (0 == getBindLayoutId() && 0 == getViewLayoutId()) {
... ... @@ -176,10 +173,11 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
176 173 setSwipeBackEnable(isOpenSwipBack);
177 174 }
178 175  
  176 +
179 177 /**
180 178 * 显示白色通知栏
181 179 */
182   - protected void showDefaultWhiteStatusBar() {
  180 + public final void showDefaultWhiteStatusBar() {
183 181 setStatusBarTextColor(StatusBarConfig.BLACK);
184 182 setStatusBarColor(R.color.white, 0);
185 183 }
... ... @@ -187,7 +185,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
187 185 /**
188 186 * 显示黑色通知栏
189 187 */
190   - protected void showDefaultBlackStatusBar() {
  188 + public final void showDefaultBlackStatusBar() {
191 189 setStatusBarTextColor(StatusBarConfig.WHITE);
192 190 setStatusBarColor(R.color.black, 0);
193 191 }
... ... @@ -197,11 +195,11 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
197 195 *
198 196 * @param enable
199 197 */
200   - public void setEnableCreateDefultEmptyView(boolean enable) {
  198 + public final void setEnableCreateDefultEmptyView(boolean enable) {
201 199 isCreateDefultEmptyView = enable;
202 200 }
203 201  
204   - public Handler getMyActHandler() {
  202 + public final Handler getMyActHandler() {
205 203 if (null == myActHandler) {
206 204 myActHandler = new Handler() {
207 205 @Override
... ... @@ -229,7 +227,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
229 227 }
230 228  
231 229 //添加观察者
232   - public void addObservable(Observable... observable) {
  230 + public final void addObservable(Observable... observable) {
233 231 Observable[] result = observable;
234 232 if (null != observable) {
235 233 if (null != result) {
... ... @@ -266,18 +264,18 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
266 264 /**
267 265 * 显示竖屏
268 266 */
269   - public void showPortraitScreen() {
  267 + public final void showPortraitScreen() {
270 268 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
271 269 }
272 270  
273 271 /**
274 272 * 显示横屏
275 273 */
276   - public void showLandscapeScreen() {
  274 + public final void showLandscapeScreen() {
277 275 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
278 276 }
279 277  
280   - protected void initCreate() {
  278 + protected void init(@Nullable Bundle savedInstanceState) {
281 279 }
282 280  
283 281 protected void initParam() {
... ... @@ -286,9 +284,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
286 284 /**
287 285 * 初始化控件
288 286 */
289   - protected void initView() {
290   -
291   - }
  287 + protected abstract void initView();
292 288  
293 289  
294 290 /**
... ... @@ -301,7 +297,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
301 297  
302 298 }
303 299  
304   - public boolean isOpenSwipBack() {
  300 + public final boolean isOpenSwipBack() {
305 301 return isOpenSwipBack;
306 302 }
307 303  
... ... @@ -310,7 +306,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
310 306 *
311 307 * @param showTitle true or false
312 308 */
313   - public void setShowTitle(boolean showTitle) {
  309 + public final void setShowTitle(boolean showTitle) {
314 310 isShowTitle = showTitle;
315 311 }
316 312  
... ... @@ -319,7 +315,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
319 315 *
320 316 * @param showStatusBar true or false
321 317 */
322   - public void setShowStatusBar(boolean showStatusBar) {
  318 + public final void setShowStatusBar(boolean showStatusBar) {
323 319 isShowStatusBar = showStatusBar;
324 320 }
325 321  
... ... @@ -328,7 +324,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
328 324 *
329 325 * @param allowScreenRoate true or false
330 326 */
331   - public void setAllowScreenRoate(boolean allowScreenRoate) {
  327 + public final void enableAllowScreenRoate(boolean allowScreenRoate) {
332 328 isAllowScreenRoate = allowScreenRoate;
333 329 }
334 330  
... ... @@ -337,7 +333,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
337 333 * 设置屏幕为横屏
338 334 * Set the screen to landscape.
339 335 */
340   - public void setLandscape() {
  336 + public final void setLandscape() {
341 337 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
342 338 }
343 339  
... ... @@ -345,7 +341,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
345 341 * 设置屏幕为竖屏
346 342 * Set the screen to portrait.
347 343 */
348   - public void setPortrait() {
  344 + public final void setPortrait() {
349 345 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
350 346 }
351 347  
... ... @@ -356,7 +352,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
356 352 *
357 353 * @return {@code true}: yes<br>{@code false}: no
358 354 */
359   - public boolean isLandscape() {
  355 + public final boolean isLandscape() {
360 356 return getResources().getConfiguration().orientation
361 357 == Configuration.ORIENTATION_LANDSCAPE;
362 358 }
... ... @@ -367,7 +363,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
367 363 *
368 364 * @return {@code true}: yes<br>{@code false}: no
369 365 */
370   - public boolean isPortrait() {
  366 + public final boolean isPortrait() {
371 367 return getResources().getConfiguration().orientation
372 368 == Configuration.ORIENTATION_PORTRAIT;
373 369 }
... ... @@ -378,11 +374,11 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
378 374 *
379 375 * @return the bitmap of screen
380 376 */
381   - public Bitmap screenShot() {
  377 + public final Bitmap screenShot() {
382 378 return screenShot(this, false);
383 379 }
384 380  
385   - public Bitmap screenShot(boolean isDeleteStatusBar) {
  381 + public final Bitmap screenShot(boolean isDeleteStatusBar) {
386 382 return screenShot(this, isDeleteStatusBar);
387 383 }
388 384  
... ... @@ -443,7 +439,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
443 439 /**
444 440 * 隐藏软键盘
445 441 */
446   - public void hideSoftInput() {
  442 + public final void hideSoftInput() {
447 443 InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
448 444 if (getCurrentFocus() != null && null != imm) {
449 445 imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
... ... @@ -453,7 +449,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
453 449 /**
454 450 * 显示软键盘
455 451 */
456   - public void showSoftInput() {
  452 + public final void showSoftInput() {
457 453 InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
458 454 if (getCurrentFocus() != null && null != imm) {
459 455 imm.showSoftInputFromInputMethod(getCurrentFocus().getWindowToken(), 0);
... ... @@ -463,7 +459,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
463 459 /**
464 460 * 显示软键盘
465 461 */
466   - public void showSoftInput(View view) {
  462 + public final void showSoftInput(View view) {
467 463 InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
468 464 imm.showSoftInput(view, InputMethodManager.SHOW_FORCED);
469 465 }
... ... @@ -489,7 +485,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
489 485 }
490 486 }
491 487  
492   - public void registerEventBus() {
  488 + public final void registerEventBus() {
493 489 //注册eventbus
494 490 if (!EventBus.getDefault().isRegistered(this)) {
495 491 EventBus.getDefault().register(this);
... ... @@ -503,11 +499,11 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
503 499 }
504 500 }
505 501  
506   - public void postEvent(Object object) {
  502 + public final void postEvent(Object object) {
507 503 EventBus.getDefault().post(object);
508 504 }
509 505  
510   - public void postStickyEvent(Object object) {
  506 + public final void postStickyEvent(Object object) {
511 507 EventBus.getDefault().postSticky(object);
512 508 }
513 509  
... ... @@ -541,20 +537,36 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
541 537 * @param color
542 538 * @param statusBarAlpha
543 539 */
544   - public void setStatusBarColor(@ColorRes int color,
545   - @IntRange(from = 0, to = 255) int statusBarAlpha) {
  540 + public final void setStatusBarColor(@ColorRes int color,
  541 + @IntRange(from = 0, to = 255) int statusBarAlpha) {
546 542 StatusBarUtil.setColor(this, ContextCompat.getColor(this, color), statusBarAlpha);
547 543 }
548 544  
549   - public void setTransparentForWindow() {
  545 + /**
  546 + * 设置状态栏颜色,同时设置字体颜色
  547 + *
  548 + * @param color
  549 + * @param statusBarAlpha
  550 + */
  551 + public final void setStatusBarColor(@ColorRes int color,
  552 + @IntRange(from = 0, to = 255) int statusBarAlpha, @StatusBarConfig.Unit final int textColor) {
  553 + StatusBarUtil.setColor(this, ContextCompat.getColor(this, color), statusBarAlpha);
  554 + if (textColor == StatusBarConfig.BLACK) {
  555 + StatusBarUtil.setStatusBarWrite(this);
  556 + } else if (textColor == StatusBarConfig.WHITE) {
  557 + StatusBarUtil.setStatusBarDarkMode(this);
  558 + }
  559 + }
  560 +
  561 + public final void setTransparentForWindow() {
550 562 StatusBarUtil.setTransparentForWindow(this);
551 563 }
552 564  
553   - public void addTranslucentView(@IntRange(from = 0, to = 255) int statusBarAlpha) {
  565 + public final void addTranslucentView(@IntRange(from = 0, to = 255) int statusBarAlpha) {
554 566 StatusBarUtil.addTranslucentView(this, statusBarAlpha);
555 567 }
556 568  
557   - public void setDecorViewBgColor(@ColorInt int color) {
  569 + public final void setDecorViewBgColor(@ColorInt int color) {
558 570 getWindow().getDecorView().setBackgroundColor(color);
559 571 }
560 572  
... ... @@ -562,7 +574,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
562 574 * 设置状态栏字体颜色
563 575 */
564 576 // 定义适用于参数的注解，限定取值范围为{STATUS_OPEN, STATUS_CLOSE}
565   - public void setStatusBarTextColor(@StatusBarConfig.Unit final int type) {
  577 + public final void setStatusBarTextColor(@StatusBarConfig.Unit final int type) {
566 578 if (type == StatusBarConfig.BLACK) {
567 579 StatusBarUtil.setStatusBarWrite(this);
568 580 } else if (type == StatusBarConfig.WHITE) {
... ... @@ -571,18 +583,18 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
571 583 }
572 584  
573 585 @NonNull
574   - public V createView() {
  586 + public final V createView() {
575 587 return ReflectUtil.instanceView(0, this.getClass(), this, BaseView.class);
576 588 }
577 589  
578 590 @Override
579   - public P createPresenter() {
  591 + public final P createPresenter() {
580 592 return ReflectUtil.instancePresenter(1, this.getClass(), BasePresenter.class);
581 593 }
582 594  
583 595 @NonNull
584 596 @Override
585   - public V getMvpView() {
  597 + public final V getMvpView() {
586 598 if (null == view) {
587 599 view = createView();
588 600 }
... ... @@ -600,66 +612,21 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
600 612  
601 613 /********************************************************/
602 614 //用于进行dip和px转换
603   - public int dp2px(float dpValue) {
  615 + public final int dp2px(float dpValue) {
604 616 final float scale = getResources().getDisplayMetrics().density;
605 617 return (int) (dpValue * scale + 0.5f);
606 618 }
607 619  
608 620 //用于进行px和dip转换
609   - public int px2dp(float pxValue) {
  621 + public final int px2dp(float pxValue) {
610 622 final float scale = getResources().getDisplayMetrics().density;
611 623 return (int) (pxValue / scale + 0.5f);
612 624 }
613 625  
614   - //获取状态栏的高度
615   - public int getStatusBarHeight() {
616   - try {
617   - Class<?> c = Class.forName("com.android.internal.R$dimen");
618   - Object obj = c.newInstance();
619   - Field field = c.getField("status_bar_height");
620   - int x = Integer.parseInt(field.get(obj).toString());
621   - return getResources().getDimensionPixelSize(x);
622   - } catch (Exception e) {
623   - e.printStackTrace();
624   - }
625   - return 0;
626   - }
627   -
628   - //获取屏幕宽度
629   - public int getDisplayWidth() {
630   - Display disp = getWindowManager().getDefaultDisplay();
631   - Point outP = new Point();
632   - disp.getSize(outP);
633   - return outP.x;
634   - }
635   -
636   - //获取屏幕可用部分高度（屏幕高度-状态栏高度-屏幕底栏高度）
637   - public int getDisplayHeight() {
638   - Display disp = getWindowManager().getDefaultDisplay();
639   - Point outP = new Point();
640   - disp.getSize(outP);
641   - return outP.y;
642   - }
643   -
644   - //获取真实的屏幕高度，注意判断非0
645   - public int getRootHeight() {
646   - int diaplayHeight = 0;
647   - Display display = getWindowManager().getDefaultDisplay();
648   - Point point = new Point();
649   - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
650   - display.getRealSize(point);
651   - diaplayHeight = point.y;
652   - } else {
653   - DisplayMetrics dm = new DisplayMetrics();
654   - getWindowManager().getDefaultDisplay().getMetrics(dm);
655   - diaplayHeight = dm.heightPixels; //得到高度```
656   - }
657   - return diaplayHeight;
658   - }
659 626  
660 627 //网络传输文本判空规则
661   - public static boolean isNull(String s) {
662   - if (s == null || s.trim().isEmpty() || "null".equals(s) || "(null)".equals(s)) {
  628 + public final boolean isNull(String s) {
  629 + if (TextUtils.isEmpty(s)) {
663 630 return true;
664 631 }
665 632 return false;
... ... @@ -675,11 +642,11 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
675 642 }
676 643 }
677 644  
678   - public void finishActivity() {
  645 + public final void finishActivity() {
679 646 super.finish();
680 647 }
681 648  
682   - public Bundle getSavedInstanceState() {
  649 + public final Bundle getSavedInstanceState() {
683 650 return savedInstanceState;
684 651 }
685 652  
... ... @@ -693,7 +660,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
693 660 * @param permissions 请求的权限
694 661 * @param onPermissionResponseListener 回调监听器
695 662 */
696   - public void requestPermission(String[] permissions, OnPermissionResponseListener
  663 + public final void requestPermission(String[] permissions, OnPermissionResponseListener
697 664 onPermissionResponseListener) {
698 665 this.onPermissionResponseListener = onPermissionResponseListener;
699 666 this.userSetPermission = permissions;
... ... @@ -707,7 +674,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
707 674 }
708 675 }
709 676  
710   - public void requestPermission(String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener
  677 + public final void requestPermission(String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener
711 678 onPermissionResponseListener) {
712 679 this.onPermissionResponseListener = onPermissionResponseListener;
713 680 this.isShowRefuseDialog = isShowRefuseDialog;
... ... @@ -732,7 +699,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
732 699 * @param onPermissionResponseListener 回调监听器
733 700 */
734 701  
735   - public void requestPermission(boolean isDefineActivity, String[] permissions, OnPermissionResponseListener
  702 + public final void requestPermission(boolean isDefineActivity, String[] permissions, OnPermissionResponseListener
736 703 onPermissionResponseListener) {
737 704 this.onPermissionResponseListener = onPermissionResponseListener;
738 705 this.isDefinePermissionCloseActivity = isDefineActivity;
... ... @@ -747,7 +714,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
747 714 }
748 715 }
749 716  
750   - public void requestPermission(boolean isDefineActivity, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener
  717 + public final void requestPermission(boolean isDefineActivity, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener
751 718 onPermissionResponseListener) {
752 719 this.onPermissionResponseListener = onPermissionResponseListener;
753 720 this.isDefinePermissionCloseActivity = isDefineActivity;
... ... @@ -773,7 +740,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
773 740 * @param onPermissionResponseListener 回调监听器
774 741 */
775 742  
776   - public void requestPermission(String defineTip, boolean isDefineActivity, String[] permissions, OnPermissionResponseListener
  743 + public final void requestPermission(String defineTip, boolean isDefineActivity, String[] permissions, OnPermissionResponseListener
777 744 onPermissionResponseListener) {
778 745 this.isDefinePermissionCloseActivity = isDefineActivity;
779 746 this.userSetDefinePermissionTip = defineTip;
... ... @@ -789,7 +756,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
789 756 }
790 757 }
791 758  
792   - public void requestPermission(String defineTip, boolean isDefineActivity, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener
  759 + public final void requestPermission(String defineTip, boolean isDefineActivity, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener
793 760 onPermissionResponseListener) {
794 761 this.isDefinePermissionCloseActivity = isDefineActivity;
795 762 this.userSetDefinePermissionTip = defineTip;
... ... @@ -815,7 +782,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
815 782 * @param permissions 请求的权限
816 783 * @param onPermissionResponseListener 回调监听器
817 784 */
818   - public void requestPermission(String defineTip, String[] permissions, OnPermissionResponseListener
  785 + public final void requestPermission(String defineTip, String[] permissions, OnPermissionResponseListener
819 786 onPermissionResponseListener) {
820 787 this.userSetDefinePermissionTip = defineTip;
821 788 this.onPermissionResponseListener = onPermissionResponseListener;
... ... @@ -830,7 +797,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
830 797 }
831 798 }
832 799  
833   - public void requestPermission(String defineTip, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener
  800 + public final void requestPermission(String defineTip, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener
834 801 onPermissionResponseListener) {
835 802 this.userSetDefinePermissionTip = defineTip;
836 803 this.onPermissionResponseListener = onPermissionResponseListener;
... ... @@ -853,7 +820,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
853 820 * @param permissions
854 821 * @param onPermissionResponseListener
855 822 */
856   - public void requestPermission(int requestCode, boolean isDefineActivity, String[]
  823 + public final void requestPermission(int requestCode, boolean isDefineActivity, String[]
857 824 permissions, OnPermissionResponseListener onPermissionResponseListener) {
858 825 this.onPermissionResponseListener = onPermissionResponseListener;
859 826 this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
... ... @@ -869,7 +836,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
869 836 }
870 837 }
871 838  
872   - public void requestPermission(int requestCode, boolean isDefineActivity, String[]
  839 + public final void requestPermission(int requestCode, boolean isDefineActivity, String[]
873 840 permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
874 841 this.onPermissionResponseListener = onPermissionResponseListener;
875 842 this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
... ... @@ -893,7 +860,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
893 860 * @param permissions
894 861 * @param onPermissionResponseListener
895 862 */
896   - public void requestPermission(int requestCode, String[]
  863 + public final void requestPermission(int requestCode, String[]
897 864 permissions, OnPermissionResponseListener onPermissionResponseListener) {
898 865 this.onPermissionResponseListener = onPermissionResponseListener;
899 866 this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
... ... @@ -908,7 +875,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
908 875 }
909 876 }
910 877  
911   - public void requestPermission(int requestCode, String[]
  878 + public final void requestPermission(int requestCode, String[]
912 879 permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
913 880 this.onPermissionResponseListener = onPermissionResponseListener;
914 881 this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
... ... @@ -931,7 +898,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
931 898 * @param permissions
932 899 * @param onPermissionResponseListener
933 900 */
934   - public void requestPermission(int requestCode, String defineTip, boolean isDefineActivity, String[]
  901 + public final void requestPermission(int requestCode, String defineTip, boolean isDefineActivity, String[]
935 902 permissions, OnPermissionResponseListener onPermissionResponseListener) {
936 903 this.onPermissionResponseListener = onPermissionResponseListener;
937 904 this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
... ... @@ -948,7 +915,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
948 915 }
949 916 }
950 917  
951   - public void requestPermission(int requestCode, String defineTip, boolean isDefineActivity, String[]
  918 + public final void requestPermission(int requestCode, String defineTip, boolean isDefineActivity, String[]
952 919 permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
953 920 this.onPermissionResponseListener = onPermissionResponseListener;
954 921 this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
... ... @@ -973,7 +940,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
973 940 * @param permissions
974 941 * @param onPermissionResponseListener
975 942 */
976   - public void requestPermission(int requestCode, String defineTip, String[]
  943 + public final void requestPermission(int requestCode, String defineTip, String[]
977 944 permissions, OnPermissionResponseListener onPermissionResponseListener) {
978 945 this.onPermissionResponseListener = onPermissionResponseListener;
979 946 this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
... ... @@ -989,7 +956,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
989 956 }
990 957 }
991 958  
992   - public void requestPermission(int requestCode, String defineTip, String[]
  959 + public final void requestPermission(int requestCode, String defineTip, String[]
993 960 permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
994 961 this.onPermissionResponseListener = onPermissionResponseListener;
995 962 this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
... ... @@ -1014,7 +981,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1014 981 * @param permissions
1015 982 * @param onPermissionResponseListener
1016 983 */
1017   - public void requestPermission(int requestCode, @StringRes int defineTip, boolean isDefineActivity, String[]
  984 + public final void requestPermission(int requestCode, @StringRes int defineTip, boolean isDefineActivity, String[]
1018 985 permissions, OnPermissionResponseListener onPermissionResponseListener) {
1019 986 this.onPermissionResponseListener = onPermissionResponseListener;
1020 987 this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
... ... @@ -1031,7 +998,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1031 998 }
1032 999 }
1033 1000  
1034   - public void requestPermission(int requestCode, @StringRes int defineTip, boolean isDefineActivity, String[]
  1001 + public final void requestPermission(int requestCode, @StringRes int defineTip, boolean isDefineActivity, String[]
1035 1002 permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
1036 1003 this.onPermissionResponseListener = onPermissionResponseListener;
1037 1004 this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
... ... @@ -1057,7 +1024,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1057 1024 * @param permissions
1058 1025 * @param onPermissionResponseListener
1059 1026 */
1060   - public void requestPermission(int requestCode, @StringRes int defineTip, String[]
  1027 + public final void requestPermission(int requestCode, @StringRes int defineTip, String[]
1061 1028 permissions, OnPermissionResponseListener onPermissionResponseListener) {
1062 1029 this.onPermissionResponseListener = onPermissionResponseListener;
1063 1030 this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
... ... @@ -1073,7 +1040,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1073 1040 }
1074 1041 }
1075 1042  
1076   - public void requestPermission(int requestCode, @StringRes int defineTip, String[]
  1043 + public final void requestPermission(int requestCode, @StringRes int defineTip, String[]
1077 1044 permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
1078 1045 this.onPermissionResponseListener = onPermissionResponseListener;
1079 1046 this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
... ... @@ -1191,7 +1158,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1191 1158 * @param permissions
1192 1159 * @return
1193 1160 */
1194   - public boolean checkPermissions(String[] permissions) {
  1161 + public final boolean checkPermissions(String[] permissions) {
1195 1162 boolean isAllow = true;
1196 1163 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
1197 1164 isAllow = true;
... ... @@ -1208,7 +1175,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1208 1175 }
1209 1176  
1210 1177 //单权限检查
1211   - public boolean checkPermissions(String permission) {
  1178 + public final boolean checkPermissions(String permission) {
1212 1179 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
1213 1180 return true;
1214 1181 }
... ... @@ -1272,7 +1239,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1272 1239  
1273 1240  
1274 1241 //启动当前应用设置页面
1275   - public void startAppSettings() {
  1242 + public final void startAppSettings() {
1276 1243 Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
1277 1244 intent.setData(Uri.parse("package:" + getPackageName()));
1278 1245 startActivity(intent);
... ... @@ -1313,31 +1280,31 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1313 1280 // }
1314 1281  
1315 1282  
1316   - public void logError(String info) {
  1283 + public final void logError(String info) {
1317 1284 Logger.e(info);
1318 1285 }
1319 1286  
1320   - public void logDebug(String info) {
  1287 + public final void logDebug(String info) {
1321 1288 Logger.d(info);
1322 1289 }
1323 1290  
1324   - public void logWarn(String info) {
  1291 + public final void logWarn(String info) {
1325 1292 Logger.w(info);
1326 1293 }
1327 1294  
1328   - public void logInfo(String info) {
  1295 + public final void logInfo(String info) {
1329 1296 Logger.i(info);
1330 1297 }
1331 1298  
1332   - public void logVerbose(String info) {
  1299 + public final void logVerbose(String info) {
1333 1300 Logger.v(info);
1334 1301 }
1335 1302  
1336   - public void logJson(String json) {
  1303 + public final void logJson(String json) {
1337 1304 Logger.json(json);
1338 1305 }
1339 1306  
1340   - public void logXml(String xml) {
  1307 + public final void logXml(String xml) {
1341 1308 Logger.xml(xml);
1342 1309 }
1343 1310  
... ... @@ -1415,7 +1382,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1415 1382 }
1416 1383  
1417 1384 @Override
1418   - public void post(Runnable runnable) {
  1385 + public final void post(Runnable runnable) {
1419 1386 mDelegate.post(runnable);
1420 1387 }
1421 1388  
... ... @@ -1427,11 +1394,11 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1427 1394 *
1428 1395 * @param toFragment 目标Fragment
1429 1396 */
1430   - public void loadRootFragment(@NonNull ISupportFragment toFragment) {
  1397 + public final void loadRootFragment(@NonNull ISupportFragment toFragment) {
1431 1398 mDelegate.loadRootFragment(R.id.root_container, toFragment);
1432 1399 }
1433 1400  
1434   - public void loadRootFragment(@NonNull ISupportFragment toFragment, boolean allowAnimation) {
  1401 + public final void loadRootFragment(@NonNull ISupportFragment toFragment, boolean allowAnimation) {
1435 1402 mDelegate.loadRootFragment(R.id.root_container, toFragment, allowAnimation);
1436 1403 }
1437 1404  
... ... @@ -1441,7 +1408,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1441 1408 * @param containerId 容器id
1442 1409 * @param toFragment 目标Fragment
1443 1410 */
1444   - public void loadRootFragment(int containerId, @NonNull ISupportFragment toFragment) {
  1411 + public final void loadRootFragment(int containerId, @NonNull ISupportFragment toFragment) {
1445 1412 mDelegate.loadRootFragment(containerId, toFragment);
1446 1413 }
1447 1414  
... ... @@ -1451,25 +1418,25 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1451 1418 * @param containerId 容器id
1452 1419 * @param toFragment 目标Fragment
1453 1420 */
1454   - public void loadRootFragment(int containerId, @NonNull ISupportFragment toFragment, boolean allowAnimation) {
  1421 + public final void loadRootFragment(int containerId, @NonNull ISupportFragment toFragment, boolean allowAnimation) {
1455 1422 mDelegate.loadRootFragment(containerId, toFragment, allowAnimation);
1456 1423 }
1457 1424  
1458   - public void loadRootFragment(int containerId, ISupportFragment toFragment, boolean addToBackStack, boolean allowAnimation) {
  1425 + public final void loadRootFragment(int containerId, ISupportFragment toFragment, boolean addToBackStack, boolean allowAnimation) {
1459 1426 mDelegate.loadRootFragment(containerId, toFragment, addToBackStack, allowAnimation);
1460 1427 }
1461 1428  
1462 1429 /**
1463 1430 * 加载多个同级根Fragment,类似Wechat, QQ主页的场景
1464 1431 */
1465   - public void loadMultipleRootFragment(int containerId, int showPosition, ISupportFragment... toFragments) {
  1432 + public final void loadMultipleRootFragment(int containerId, int showPosition, ISupportFragment... toFragments) {
1466 1433 mDelegate.loadMultipleRootFragment(containerId, showPosition, toFragments);
1467 1434 }
1468 1435  
1469 1436 /**
1470 1437 * 加载多个同级根Fragment,类似Wechat, QQ主页的场景
1471 1438 */
1472   - public void loadMultipleRootFragment(int showPosition, ISupportFragment... toFragments) {
  1439 + public final void loadMultipleRootFragment(int showPosition, ISupportFragment... toFragments) {
1473 1440 mDelegate.loadMultipleRootFragment(R.id.root_container, showPosition, toFragments);
1474 1441 }
1475 1442  
... ... @@ -1481,21 +1448,21 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1481 1448 *
1482 1449 * @param showFragment 需要show的Fragment
1483 1450 */
1484   - public void showHideFragment(ISupportFragment showFragment) {
  1451 + public final void showHideFragment(ISupportFragment showFragment) {
1485 1452 mDelegate.showHideFragment(showFragment);
1486 1453 }
1487 1454  
1488 1455 /**
1489 1456 * show一个Fragment,hide一个Fragment ; 主要用于类似微信主页那种 切换tab的情况
1490 1457 */
1491   - public void showHideFragment(ISupportFragment showFragment, ISupportFragment hideFragment) {
  1458 + public final void showHideFragment(ISupportFragment showFragment, ISupportFragment hideFragment) {
1492 1459 mDelegate.showHideFragment(showFragment, hideFragment);
1493 1460 }
1494 1461  
1495 1462 /**
1496 1463 * It is recommended to use {@link SupportFragment#start(ISupportFragment)}.
1497 1464 */
1498   - public void start(ISupportFragment toFragment) {
  1465 + public final void start(ISupportFragment toFragment) {
1499 1466 mDelegate.start(toFragment);
1500 1467 }
1501 1468  
... ... @@ -1504,7 +1471,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1504 1471 *
1505 1472 * @param launchMode Similar to Activity's LaunchMode.
1506 1473 */
1507   - public void start(ISupportFragment toFragment, @ISupportFragment.LaunchMode int launchMode) {
  1474 + public final void start(ISupportFragment toFragment, @ISupportFragment.LaunchMode int launchMode) {
1508 1475 mDelegate.start(toFragment, launchMode);
1509 1476 }
1510 1477  
... ... @@ -1512,7 +1479,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1512 1479 * It is recommended to use {@link SupportFragment#startForResult(ISupportFragment, int)}.
1513 1480 * Launch an fragment for which you would like a result when it poped.
1514 1481 */
1515   - public void startForResult(ISupportFragment toFragment, int requestCode) {
  1482 + public final void startForResult(ISupportFragment toFragment, int requestCode) {
1516 1483 mDelegate.startForResult(toFragment, requestCode);
1517 1484 }
1518 1485  
... ... @@ -1520,7 +1487,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1520 1487 * It is recommended to use {@link SupportFragment#startWithPop(ISupportFragment)}.
1521 1488 * Start the target Fragment and pop itself
1522 1489 */
1523   - public void startWithPop(ISupportFragment toFragment) {
  1490 + public final void startWithPop(ISupportFragment toFragment) {
1524 1491 mDelegate.startWithPop(toFragment);
1525 1492 }
1526 1493  
... ... @@ -1531,21 +1498,21 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1531 1498 * +
1532 1499 * @see #start(ISupportFragment)
1533 1500 */
1534   - public void startWithPopTo(ISupportFragment toFragment, Class<?> targetFragmentClass, boolean includeTargetFragment) {
  1501 + public final void startWithPopTo(ISupportFragment toFragment, Class<?> targetFragmentClass, boolean includeTargetFragment) {
1535 1502 mDelegate.startWithPopTo(toFragment, targetFragmentClass, includeTargetFragment);
1536 1503 }
1537 1504  
1538 1505 /**
1539 1506 * It is recommended to use {@link SupportFragment#replaceFragment(ISupportFragment, boolean)}.
1540 1507 */
1541   - public void replaceFragment(ISupportFragment toFragment, boolean addToBackStack) {
  1508 + public final void replaceFragment(ISupportFragment toFragment, boolean addToBackStack) {
1542 1509 mDelegate.replaceFragment(toFragment, addToBackStack);
1543 1510 }
1544 1511  
1545 1512 /**
1546 1513 * Pop the fragment.
1547 1514 */
1548   - public void pop() {
  1515 + public final void pop() {
1549 1516 mDelegate.pop();
1550 1517 }
1551 1518  
... ... @@ -1558,7 +1525,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1558 1525 * @param targetFragmentClass 目标fragment
1559 1526 * @param includeTargetFragment 是否包含该fragment
1560 1527 */
1561   - public void popTo(Class<?> targetFragmentClass, boolean includeTargetFragment) {
  1528 + public final void popTo(Class<?> targetFragmentClass, boolean includeTargetFragment) {
1562 1529 mDelegate.popTo(targetFragmentClass, includeTargetFragment);
1563 1530 }
1564 1531  
... ... @@ -1566,11 +1533,11 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1566 1533 * If you want to begin another FragmentTransaction immediately after popTo(), use this method.
1567 1534 * 如果你想在出栈后, 立刻进行FragmentTransaction操作，请使用该方法
1568 1535 */
1569   - public void popTo(Class<?> targetFragmentClass, boolean includeTargetFragment, Runnable afterPopTransactionRunnable) {
  1536 + public final void popTo(Class<?> targetFragmentClass, boolean includeTargetFragment, Runnable afterPopTransactionRunnable) {
1570 1537 mDelegate.popTo(targetFragmentClass, includeTargetFragment, afterPopTransactionRunnable);
1571 1538 }
1572 1539  
1573   - public void popTo(Class<?> targetFragmentClass, boolean includeTargetFragment, Runnable afterPopTransactionRunnable, int popAnim) {
  1540 + public final void popTo(Class<?> targetFragmentClass, boolean includeTargetFragment, Runnable afterPopTransactionRunnable, int popAnim) {
1574 1541 mDelegate.popTo(targetFragmentClass, includeTargetFragment, afterPopTransactionRunnable, popAnim);
1575 1542 }
1576 1543  
... ... @@ -1579,21 +1546,21 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1579 1546 * Fragmentation默认使用Theme的android:windowbackground作为Fragment的背景,
1580 1547 * 可以通过该方法改变其内所有Fragment的默认背景。
1581 1548 */
1582   - public void setDefaultFragmentBackground(@DrawableRes int backgroundRes) {
  1549 + public final void setDefaultFragmentBackground(@DrawableRes int backgroundRes) {
1583 1550 mDelegate.setDefaultFragmentBackground(backgroundRes);
1584 1551 }
1585 1552  
1586 1553 /**
1587 1554 * 得到位于栈顶Fragment
1588 1555 */
1589   - public ISupportFragment getTopFragment() {
  1556 + public final ISupportFragment getTopFragment() {
1590 1557 return SupportHelper.getTopFragment(getSupportFragmentManager());
1591 1558 }
1592 1559  
1593 1560 /**
1594 1561 * 获取栈内的fragment对象
1595 1562 */
1596   - public <T extends ISupportFragment> T findFragment(Class<T> fragmentClass) {
  1563 + public final <T extends ISupportFragment> T findFragment(Class<T> fragmentClass) {
1597 1564 return SupportHelper.findFragment(getSupportFragmentManager(), fragmentClass);
1598 1565 }
1599 1566  
... ... @@ -1601,7 +1568,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1601 1568 /**
1602 1569 * 显示fragment栈视图
1603 1570 */
1604   - public void showFragmetStackView() {
  1571 + public final void showFragmetStackView() {
1605 1572 Fragmentation.builder()
1606 1573 // show stack view. Mode: BUBBLE, SHAKE, NONE
1607 1574 .stackViewMode(Fragmentation.BUBBLE)
... ... @@ -1615,7 +1582,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
1615 1582 * @param enable
1616 1583 */
1617 1584 @Override
1618   - public void setSwipeBackEnable(boolean enable) {
  1585 + public final void setSwipeBackEnable(boolean enable) {
1619 1586 isOpenSwipBack = enable;
1620 1587 mSwipeDelegate.setSwipeBackEnable(enable);
1621 1588 }
... ...
core/base/src/main/java/com/cnlive/core/libs/base/frame/fragment/BaseFragment.java
  View file @c3a2c14
... ... @@ -2,7 +2,6 @@ package com.cnlive.core.libs.base.frame.fragment;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.graphics.Bitmap;
6 5 import android.os.Bundle;
7 6 import android.os.Handler;
8 7 import android.os.Message;
... ... @@ -78,7 +77,7 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
78 77 }
79 78  
80 79 @Override
81   - public void onCreate(Bundle savedInstanceState) {
  80 + public final void onCreate(Bundle savedInstanceState) {
82 81 super.onCreate(savedInstanceState);
83 82 if (getActivity() == null) return;
84 83 me = (BaseActivity) getActivity();
... ... @@ -92,13 +91,13 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
92 91 mSwipeDelegate.onCreate(savedInstanceState);
93 92 setSwipeBackEnable(me.isOpenSwipBack());
94 93 ARouter.getInstance().inject(this);
95   - initFragmentStyle();
  94 + init(savedInstanceState);
96 95 initParams();
97 96 }
98 97  
99 98 @Nullable
100 99 @Override
101   - public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
  100 + public final View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
102 101 if (0 != getBindLayoutId()) {
103 102 baseBinding = DataBindingUtil.inflate(inflater, getBindLayoutId(), container, false);
104 103 if (me.isOpenSwipBack()) {
... ... @@ -131,17 +130,15 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
131 130 /**
132 131 * 显示白色通知栏
133 132 */
134   - public void showDefaultWhiteStatusBar() {
135   - setStatusBarTextColor(StatusBarConfig.BLACK);
136   - setStatusBarColor(R.color.white, 0);
  133 + public final void showDefaultWhiteStatusBar() {
  134 + me.showDefaultWhiteStatusBar();
137 135 }
138 136  
139 137 /**
140 138 * 显示黑色通知栏
141 139 */
142   - public void showDefaultBlackStatusBar() {
143   - setStatusBarTextColor(StatusBarConfig.WHITE);
144   - setStatusBarColor(R.color.black, 0);
  140 + public final void showDefaultBlackStatusBar() {
  141 + me.showDefaultBlackStatusBar();
145 142 }
146 143  
147 144 /**
... ... @@ -149,12 +146,12 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
149 146 *
150 147 * @param enable
151 148 */
152   - public void setEnableCreateDefultEmptyView(boolean enable) {
  149 + public final void setEnableCreateDefultEmptyView(boolean enable) {
153 150 isCreateDefultEmptyView = enable;
154 151 }
155 152  
156 153 @Override
157   - public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
  154 + public final void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
158 155 super.onViewCreated(view, savedInstanceState);
159 156 mSwipeDelegate.onViewCreated(view, savedInstanceState);
160 157 if (null != getMvpView() && null != getPresenter()) {
... ... @@ -165,30 +162,30 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
165 162 }
166 163  
167 164 @NonNull
168   - public V createView() {
  165 + public final V createView() {
169 166 return ReflectUtil.instanceView(0, this.getClass(), this, BaseView.class);
170 167 }
171 168  
172 169 @Override
173   - public P createPresenter() {
  170 + public final P createPresenter() {
174 171 return ReflectUtil.instancePresenter(1, this.getClass(), BasePresenter.class);
175 172 }
176 173  
177 174 @NonNull
178 175 @Override
179   - public V getMvpView() {
  176 + public final V getMvpView() {
180 177 if (null == view) {
181 178 view = createView();
182 179 }
183 180 return view;
184 181 }
185 182  
186   - public Bundle getSavedInstanceState() {
  183 + public final Bundle getSavedInstanceState() {
187 184 return savedInstanceState;
188 185 }
189 186  
190 187 //添加观察者
191   - public void addObservable(Observable... observable) {
  188 + public final void addObservable(Observable... observable) {
192 189 Observable[] result = observable;
193 190 if (null != observable) {
194 191 if (null != result) {
... ... @@ -220,7 +217,7 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
220 217 }
221 218 }
222 219  
223   - public void registerEventBus() {
  220 + public final void registerEventBus() {
224 221 //注册eventbus
225 222 if (!EventBus.getDefault().isRegistered(this)) {
226 223 EventBus.getDefault().register(this);
... ... @@ -234,15 +231,15 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
234 231 }
235 232 }
236 233  
237   - public void postEvent(Object object) {
  234 + public final void postEvent(Object object) {
238 235 EventBus.getDefault().post(object);
239 236 }
240 237  
241   - public void postStickyEvent(Object object) {
  238 + public final void postStickyEvent(Object object) {
242 239 EventBus.getDefault().postSticky(object);
243 240 }
244 241  
245   - public Handler getMyFragHandler() {
  242 + public final Handler getMyFragHandler() {
246 243 if (null == myFragHandler) {
247 244 myFragHandler = new Handler() {
248 245 @Override
... ... @@ -270,7 +267,7 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
270 267 /**
271 268 * 初始化fragment样式
272 269 */
273   - protected void initFragmentStyle() {
  270 + protected void init(Bundle savedInstanceState) {
274 271  
275 272 }
276 273  
... ... @@ -284,8 +281,7 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
284 281 /**
285 282 * 初始化视图
286 283 */
287   - protected void initView() {
288   - }
  284 + protected abstract void initView();
289 285  
290 286  
291 287 /**
... ... @@ -319,16 +315,24 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
319 315 }
320 316  
321 317 /**
  318 + * 隐藏软键盘
  319 + */
  320 + public final void hideSoftInput() {
  321 + me.hideSoftInput();
  322 + }
  323 +
  324 +
  325 + /**
322 326 * 显示竖屏
323 327 */
324   - public void showPortraitScreen() {
  328 + public final void showPortraitScreen() {
325 329 me.showPortraitScreen();
326 330 }
327 331  
328 332 /**
329 333 * 显示横屏
330 334 */
331   - public void showLandscapeScreen() {
  335 + public final void showLandscapeScreen() {
332 336 me.showLandscapeScreen();
333 337 }
334 338  
... ... @@ -338,20 +342,31 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
338 342 * @param color
339 343 * @param statusBarAlpha
340 344 */
341   - public void setStatusBarColor(@ColorRes int color,
342   - @IntRange(from = 0, to = 255) int statusBarAlpha) {
  345 + public final void setStatusBarColor(@ColorRes int color,
  346 + @IntRange(from = 0, to = 255) int statusBarAlpha) {
343 347 me.setStatusBarColor(color, statusBarAlpha);
344 348 }
345 349  
346   - public void setTransparentForWindow() {
  350 + /**
  351 + * 设置状态栏颜色,同时设置字体颜色
  352 + *
  353 + * @param color
  354 + * @param statusBarAlpha
  355 + */
  356 + public final void setStatusBarColor(@ColorRes int color,
  357 + @IntRange(from = 0, to = 255) int statusBarAlpha, @StatusBarConfig.Unit final int textColor) {
  358 + me.setStatusBarColor(color, statusBarAlpha, textColor);
  359 + }
  360 +
  361 + public final void setTransparentForWindow() {
347 362 me.setTransparentForWindow();
348 363 }
349 364  
350   - public void addTranslucentView(@IntRange(from = 0, to = 255) int statusBarAlpha) {
  365 + public final void addTranslucentView(@IntRange(from = 0, to = 255) int statusBarAlpha) {
351 366 me.addTranslucentView(statusBarAlpha);
352 367 }
353 368  
354   - public void setDecorViewBgColor(@ColorInt int color) {
  369 + public final void setDecorViewBgColor(@ColorInt int color) {
355 370 me.setDecorViewBgColor(color);
356 371 }
357 372  
... ... @@ -375,7 +390,7 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
375 390 /**
376 391 * 设置状态栏字体颜色
377 392 */
378   - public void setStatusBarTextColor(@StatusBarConfig.Unit int type) {
  393 + public final void setStatusBarTextColor(@StatusBarConfig.Unit int type) {
379 394 me.setStatusBarTextColor(type);
380 395 }
381 396  
... ... @@ -383,15 +398,22 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
383 398 /**
384 399 * 显示软键盘
385 400 */
386   - public void showSoftInput() {
  401 + public final void showSoftInput() {
387 402 me.showSoftInput();
388 403 }
389 404  
390 405 /**
  406 + * 显示软键盘
  407 + */
  408 + public final void showSoftInput(View view) {
  409 + me.showSoftInput(view);
  410 + }
  411 +
  412 + /**
391 413 * 设置屏幕为横屏
392 414 * Set the screen to landscape.
393 415 */
394   - public void setLandscape() {
  416 + public final void setLandscape() {
395 417 me.setLandscape();
396 418 }
397 419  
... ... @@ -399,7 +421,7 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
399 421 * 设置屏幕为竖屏
400 422 * Set the screen to portrait.
401 423 */
402   - public void setPortrait() {
  424 + public final void setPortrait() {
403 425 me.setPortrait();
404 426 }
405 427  
... ... @@ -410,7 +432,7 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
410 432 *
411 433 * @return {@code true}: yes<br>{@code false}: no
412 434 */
413   - public boolean isLandscape() {
  435 + public final boolean isLandscape() {
414 436 return me.isLandscape();
415 437 }
416 438  
... ... @@ -420,142 +442,129 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
420 442 *
421 443 * @return {@code true}: yes<br>{@code false}: no
422 444 */
423   - public boolean isPortrait() {
  445 + public final boolean isPortrait() {
424 446 return me.isPortrait();
425 447 }
426 448  
427   - /**
428   - * 截屏
429   - * Return the bitmap of screen.
430   - *
431   - * @return the bitmap of screen
432   - */
433   - public Bitmap screenShot() {
434   - return me.screenShot();
435   - }
436   -
437   - public Bitmap screenShot(boolean isDeleteStatusBar) {
438   - return me.screenShot(isDeleteStatusBar);
439   - }
440 449  
441 450 /*********************************************************/
442 451 //用于进行dip和px转换
443   - public int dp2px(float dpValue) {
  452 + public final int dp2px(float dpValue) {
444 453 return me.dp2px(dpValue);
445 454 }
446 455  
447 456 //用于进行px和dip转换
448   - public int px2dp(float pxValue) {
  457 + public final int px2dp(float pxValue) {
449 458 return me.px2dp(pxValue);
450 459 }
451 460  
452 461 //权限申请
453   - public void requestPermission(String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
  462 + public final void requestPermission(String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
454 463 me.requestPermission(permissions, onPermissionResponseListener);
455 464 }
456 465  
457   - public void requestPermission(String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
  466 + public final void requestPermission(String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
458 467 me.requestPermission(permissions, isShowRefuseDialog, onPermissionResponseListener);
459 468 }
460 469  
461 470 //权限申请
462   - public void requestPermission(boolean isDefineActivity, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
  471 + public final void requestPermission(boolean isDefineActivity, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
463 472 me.requestPermission(isDefineActivity, permissions, onPermissionResponseListener);
464 473 }
465 474  
466   - public void requestPermission(boolean isDefineActivity, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
  475 + public final void requestPermission(boolean isDefineActivity, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
467 476 me.requestPermission(isDefineActivity, permissions, isShowRefuseDialog, onPermissionResponseListener);
468 477 }
469 478  
470 479 //权限申请
471   - public void requestPermission(int requestCode, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
  480 + public final void requestPermission(int requestCode, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
472 481 me.requestPermission(requestCode, permissions, onPermissionResponseListener);
473 482 }
474 483  
475   - public void requestPermission(int requestCode, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
  484 + public final void requestPermission(int requestCode, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
476 485 me.requestPermission(requestCode, permissions, isShowRefuseDialog, onPermissionResponseListener);
477 486 }
478 487  
479 488 //权限申请
480   - public void requestPermission(int requestCode, boolean isDefineActivity, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
  489 + public final void requestPermission(int requestCode, boolean isDefineActivity, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
481 490 me.requestPermission(requestCode, isDefineActivity, permissions, onPermissionResponseListener);
482 491 }
483 492  
484   - public void requestPermission(int requestCode, boolean isDefineActivity, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
  493 + public final void requestPermission(int requestCode, boolean isDefineActivity, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
485 494 me.requestPermission(requestCode, isDefineActivity, permissions, isShowRefuseDialog, onPermissionResponseListener);
486 495 }
487 496  
488 497 //权限申请
489   - public void requestPermission(int requestCode, String defineTip, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
  498 + public final void requestPermission(int requestCode, String defineTip, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
490 499 me.requestPermission(requestCode, defineTip, permissions, onPermissionResponseListener);
491 500 }
492 501  
493   - public void requestPermission(int requestCode, String defineTip, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
  502 + public final void requestPermission(int requestCode, String defineTip, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
494 503 me.requestPermission(requestCode, defineTip, permissions, isShowRefuseDialog, onPermissionResponseListener);
495 504 }
496 505  
497 506 //权限申请
498   - public void requestPermission(int requestCode, String defineTip, boolean isDefineActivity, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
  507 + public final void requestPermission(int requestCode, String defineTip, boolean isDefineActivity, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
499 508 me.requestPermission(requestCode, defineTip, isDefineActivity, permissions, onPermissionResponseListener);
500 509 }
501 510  
502   - public void requestPermission(int requestCode, String defineTip, boolean isDefineActivity, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
  511 + public final void requestPermission(int requestCode, String defineTip, boolean isDefineActivity, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
503 512 me.requestPermission(requestCode, defineTip, isDefineActivity, permissions, isShowRefuseDialog, onPermissionResponseListener);
504 513 }
505 514  
506   - public void requestPermission(String defineTip, String[] permissions, OnPermissionResponseListener
  515 + public final void requestPermission(String defineTip, String[] permissions, OnPermissionResponseListener
507 516 onPermissionResponseListener) {
508 517 me.requestPermission(defineTip, permissions, onPermissionResponseListener);
509 518 }
510 519  
511   - public void requestPermission(String defineTip, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener
  520 + public final void requestPermission(String defineTip, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener
512 521 onPermissionResponseListener) {
513 522 me.requestPermission(defineTip, permissions, isShowRefuseDialog, onPermissionResponseListener);
514 523 }
515 524  
516   - public void requestPermission(String defineTip, boolean isDefineActivity, String[] permissions, OnPermissionResponseListener
  525 + public final void requestPermission(String defineTip, boolean isDefineActivity, String[] permissions, OnPermissionResponseListener
517 526 onPermissionResponseListener) {
518 527 me.requestPermission(defineTip, isDefineActivity, permissions, onPermissionResponseListener);
519 528 }
520 529  
521   - public void requestPermission(String defineTip, boolean isDefineActivity, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener
  530 + public final void requestPermission(String defineTip, boolean isDefineActivity, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener
522 531 onPermissionResponseListener) {
523 532 me.requestPermission(defineTip, isDefineActivity, permissions, isShowRefuseDialog, onPermissionResponseListener);
524 533 }
525 534  
526   - public void requestPermission(int requestCode, @StringRes int defineTip, String[]
  535 + public final void requestPermission(int requestCode, @StringRes int defineTip, String[]
527 536 permissions, OnPermissionResponseListener onPermissionResponseListener) {
528 537 me.requestPermission(requestCode, defineTip, permissions, onPermissionResponseListener);
529 538 }
530 539  
531   - public void requestPermission(int requestCode, @StringRes int defineTip, String[]
  540 + public final void requestPermission(int requestCode, @StringRes int defineTip, String[]
532 541 permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
533 542 me.requestPermission(requestCode, defineTip, permissions, isShowRefuseDialog, onPermissionResponseListener);
534 543 }
535 544  
536   - public void requestPermission(int requestCode, @StringRes int defineTip, boolean isDefineActivity, String[]
  545 + public final void requestPermission(int requestCode, @StringRes int defineTip, boolean isDefineActivity, String[]
537 546 permissions, OnPermissionResponseListener onPermissionResponseListener) {
538 547 me.requestPermission(requestCode, defineTip, isDefineActivity, permissions, onPermissionResponseListener);
539 548 }
540 549  
541   - public void requestPermission(int requestCode, @StringRes int defineTip, boolean isDefineActivity, String[]
  550 + public final void requestPermission(int requestCode, @StringRes int defineTip, boolean isDefineActivity, String[]
542 551 permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
543 552 me.requestPermission(requestCode, defineTip, isDefineActivity, permissions, isShowRefuseDialog, onPermissionResponseListener);
544 553 }
545 554  
546 555 //多权限检查
547   - public boolean checkPermissions(String[] permissions) {
  556 + public final boolean checkPermissions(String[] permissions) {
548 557 return me.checkPermissions(permissions);
549 558 }
550 559  
551 560 //单权限检查
552   - public boolean checkPermissions(String permission) {
  561 + public final boolean checkPermissions(String permission) {
553 562 return me.checkPermissions(permission);
554 563 }
555 564  
556 565 /************************************fragment管理********************************************/
557 566 @Override
558   - public SupportFragmentDelegate getSupportDelegate() {
  567 + public final SupportFragmentDelegate getSupportDelegate() {
559 568 return mDelegate;
560 569 }
561 570  
... ... @@ -637,31 +646,31 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
637 646 }
638 647  
639 648 /*************************************log******************************************/
640   - public void logError(String info) {
  649 + public final void logError(String info) {
641 650 Logger.e(info);
642 651 }
643 652  
644   - public void logDebug(String info) {
  653 + public final void logDebug(String info) {
645 654 Logger.d(info);
646 655 }
647 656  
648   - public void logWarn(String info) {
  657 + public final void logWarn(String info) {
649 658 Logger.w(info);
650 659 }
651 660  
652   - public void logInfo(String info) {
  661 + public final void logInfo(String info) {
653 662 Logger.i(info);
654 663 }
655 664  
656   - public void logVerbose(String info) {
  665 + public final void logVerbose(String info) {
657 666 Logger.v(info);
658 667 }
659 668  
660   - public void logJson(String json) {
  669 + public final void logJson(String json) {
661 670 Logger.json(json);
662 671 }
663 672  
664   - public void logXml(String xml) {
  673 + public final void logXml(String xml) {
665 674 Logger.xml(xml);
666 675 }
667 676 /*********************************fragment 管理******************************************/
... ... @@ -828,48 +837,48 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
828 837  
829 838  
830 839 /****************************************以下为可选方法(Optional methods)******************************************************/
831   -
832   - /**
833   - * 隐藏软键盘
834   - */
835   - protected void hideSoftInput() {
836   - mDelegate.hideSoftInput();
837   - }
838   -
839   - /**
840   - * 显示软键盘,调用该方法后,会在onPause时自动隐藏软键盘
841   - */
842   - protected void showSoftInput(final View view) {
843   - mDelegate.showSoftInput(view);
844   - }
845   -
846 840 /**
847 841 * 加载根Fragment, 即Activity内的第一个Fragment 或 Fragment内的第一个子Fragment
848 842 *
849 843 * @param toFragment 目标Fragment
850 844 */
851   - public void loadRootFragment(ISupportFragment toFragment) {
  845 + public final void loadRootFragment(ISupportFragment toFragment) {
852 846 mDelegate.loadRootFragment(R.id.root_container, toFragment);
853 847 }
854 848  
  849 + public final void loadRootFragment(ISupportFragment toFragment, boolean allowAnim) {
  850 + mDelegate.loadRootFragment(R.id.root_container, toFragment, true, allowAnim);
  851 + }
  852 +
855 853 /**
856 854 * 加载根Fragment, 即Activity内的第一个Fragment 或 Fragment内的第一个子Fragment
857 855 *
858 856 * @param containerId 容器id
859 857 * @param toFragment 目标Fragment
860 858 */
861   - public void loadRootFragment(int containerId, ISupportFragment toFragment) {
  859 + public final void loadRootFragment(int containerId, ISupportFragment toFragment) {
862 860 mDelegate.loadRootFragment(containerId, toFragment);
863 861 }
864 862  
865   - public void loadRootFragment(int containerId, ISupportFragment toFragment, boolean addToBackStack, boolean allowAnim) {
  863 + public final void loadRootFragment(int containerId, ISupportFragment toFragment, boolean allowAnim) {
  864 + mDelegate.loadRootFragment(containerId, toFragment, true, allowAnim);
  865 + }
  866 +
  867 + public final void loadRootFragment(int containerId, ISupportFragment toFragment, boolean addToBackStack, boolean allowAnim) {
866 868 mDelegate.loadRootFragment(containerId, toFragment, addToBackStack, allowAnim);
867 869 }
868 870  
869 871 /**
870 872 * 加载多个同级根Fragment,类似Wechat, QQ主页的场景
871 873 */
872   - public void loadMultipleRootFragment(int containerId, int showPosition, ISupportFragment... toFragments) {
  874 + public final void loadMultipleRootFragment(int showPosition, ISupportFragment... toFragments) {
  875 + mDelegate.loadMultipleRootFragment(R.id.root_container, showPosition, toFragments);
  876 + }
  877 +
  878 + /**
  879 + * 加载多个同级根Fragment,类似Wechat, QQ主页的场景
  880 + */
  881 + public final void loadMultipleRootFragment(int containerId, int showPosition, ISupportFragment... toFragments) {
873 882 mDelegate.loadMultipleRootFragment(containerId, showPosition, toFragments);
874 883 }
875 884  
... ...
core/base/src/main/java/com/cnlive/core/libs/base/frame/view/BaseView.java
  View file @c3a2c14
1 1 package com.cnlive.core.libs.base.frame.view;
2 2  
3 3 import android.os.Message;
  4 +import android.text.TextUtils;
  5 +
4 6 import androidx.annotation.NonNull;
5 7  
6 8 import com.hannesdorfmann.mosby3.mvp.MvpView;
... ... @@ -15,13 +17,14 @@ import org.greenrobot.eventbus.EventBus;
15 17 public class BaseView implements MvpView {
16 18 protected final String TAG = this.getClass().getSimpleName();
17 19  
18   - public void postEvent(Object object) {
  20 + public final void postEvent(Object object) {
19 21 EventBus.getDefault().post(object);
20 22 }
21 23  
22   - public void postStickyEvent(Object object) {
  24 + public final void postStickyEvent(Object object) {
23 25 EventBus.getDefault().postSticky(object);
24 26 }
  27 +
25 28 public void initView() {
26 29 }
27 30  
... ... @@ -29,8 +32,8 @@ public class BaseView implements MvpView {
29 32 }
30 33  
31 34 //网络传输文本判空规则
32   - public static boolean isNull(String s) {
33   - if (s == null || s.trim().isEmpty() || "null".equals(s) || "(null)".equals(s)) {
  35 + public final boolean isNull(String s) {
  36 + if (TextUtils.isEmpty(s)) {
34 37 return true;
35 38 }
36 39 return false;
... ... @@ -39,35 +42,36 @@ public class BaseView implements MvpView {
39 42 public void onReceiveActHandleMessage(@NonNull Message msg) {
40 43  
41 44 }
  45 +
42 46 public void onReceiveFragHandleMessage(@NonNull Message msg) {
43 47  
44 48 }
45 49  
46   - public void logError(String info) {
  50 + public final void logError(String info) {
47 51 Logger.e(info);
48 52 }
49 53  
50   - public void logDebug(String info) {
  54 + public final void logDebug(String info) {
51 55 Logger.d(info);
52 56 }
53 57  
54   - public void logWarn(String info) {
  58 + public final void logWarn(String info) {
55 59 Logger.w(info);
56 60 }
57 61  
58   - public void logInfo(String info) {
  62 + public final void logInfo(String info) {
59 63 Logger.i(info);
60 64 }
61 65  
62   - public void logVerbose(String info) {
  66 + public final void logVerbose(String info) {
63 67 Logger.v(info);
64 68 }
65 69  
66   - public void logJson(String json) {
  70 + public final void logJson(String json) {
67 71 Logger.json(json);
68 72 }
69 73  
70   - public void logXml(String xml) {
  74 + public final void logXml(String xml) {
71 75 Logger.xml(xml);
72 76 }
73 77 }
... ...
core/base/src/main/java/com/cnlive/core/libs/base/util/ColorUtils.java
  View file @c3a2c14
... ... @@ -34,6 +34,28 @@ public final class ColorUtils {
34 34 }
35 35  
36 36 /**
  37 + * 判断是否是亮色
  38 + * http://www.it1352.com/533196.html
  39 + * First convert the RGB color value to compute luminance by the following formula
  40 + * <p>
  41 + * Y = 0.2126*R + 0.7152*G + 0.0722*B
  42 + * Then check if the value is nearer to 0 or to 255 and choose black or white accordingly
  43 + * <p>
  44 + * color c = Y < 128 ? black : white
  45 + *
  46 + * @param color
  47 + * @return
  48 + */
  49 + public boolean isLightColor(Context context, @ColorRes int color) {
  50 + int rgb = ContextCompat.getColor(context, color);
  51 + int red = Color.red(rgb);
  52 + int green = Color.green(rgb);
  53 + int blue = Color.blue(rgb);
  54 + double Y = (0.2126 * red) + (0.7152 * green) + (0.0722 * blue);
  55 + return Y < 128 ? false : true;
  56 + }
  57 +
  58 + /**
37 59 * 获取颜色
38 60 * Returns a color associated with a particular resource ID.
39 61 *
... ...
core/base/src/main/java/com/cnlive/core/libs/base/util/NetworkUtil.java
  View file @c3a2c14
... ... @@ -4,74 +4,83 @@ import android.content.Context;
4 4 import android.content.Intent;
5 5 import android.net.ConnectivityManager;
6 6 import android.net.NetworkInfo;
  7 +import android.net.wifi.WifiManager;
7 8 import android.telephony.TelephonyManager;
8 9  
  10 +import java.lang.reflect.Method;
  11 +import java.net.InetAddress;
  12 +import java.net.NetworkInterface;
  13 +import java.net.SocketException;
  14 +import java.net.UnknownHostException;
9 15 import java.util.ArrayList;
  16 +import java.util.Enumeration;
10 17 import java.util.List;
  18 +import java.util.concurrent.Callable;
  19 +import java.util.concurrent.ExecutionException;
  20 +import java.util.concurrent.ExecutorService;
  21 +import java.util.concurrent.Executors;
  22 +import java.util.concurrent.Future;
11 23  
12 24 public class NetworkUtil {
13   -
14 25 private NetworkUtil() {
15   - throw new UnsupportedOperationException("u can't instance me...");
  26 + throw new UnsupportedOperationException("u can't instantiate me...");
16 27 }
17 28  
18   - public static final int NETWORK_WIFI = 1; // wifi network
19   - public static final int NETWORK_4G = 4; // "4G" networks
20   - public static final int NETWORK_3G = 3; // "3G" networks
21   - public static final int NETWORK_2G = 2; // "2G" networks
22   - public static final int NETWORK_UNKNOWN = 5; // unknown network
23   - public static final int NETWORK_NO = -1; // no network
24   -
25   - private static final int NETWORK_TYPE_GSM = 16;
26   - private static final int NETWORK_TYPE_TD_SCDMA = 17;
27   - private static final int NETWORK_TYPE_IWLAN = 18;
28   -
29   - public static List<String> typeList = new ArrayList<>();
30   -
31   - static {
32   - typeList.add("打开网络设置界面");
33   - typeList.add("获取活动网络信息");
34   - typeList.add("判断网络是否可用");
35   - typeList.add("判断网络是否是4G");
36   - typeList.add("判断wifi是否连接状态");
37   - typeList.add("获取移动网络运营商名称");
38   - typeList.add("获取当前的网络类型");
39   - typeList.add("获取当前的网络类型(WIFI,2G,3G,4G)");
40 29  
  30 + public enum NetworkType {
  31 + NETWORK_WIFI,
  32 + NETWORK_4G,
  33 + NETWORK_3G,
  34 + NETWORK_2G,
  35 + NETWORK_UNKNOWN,
  36 + NETWORK_NO
  37 + }
41 38  
  39 + /**
  40 + * 判断网络是否连接
  41 + * <p>需添加权限 {@code <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>}</p>
  42 + *
  43 + * @param context 上下文
  44 + * @return {@code true}: 是<br>{@code false}: 否
  45 + */
  46 + public static boolean isConnectInternet(Context context) {
  47 + if (context == null) return false;
  48 + ConnectivityManager connectManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
  49 + if (connectManager != null) {
  50 + NetworkInfo networkinfo = connectManager.getActiveNetworkInfo();
  51 + return networkinfo != null && networkinfo.isAvailable();
  52 + }
  53 + return false;
42 54 }
43 55  
  56 +
44 57 /**
45 58 * 打开网络设置界面
46 59 * <p>3.0以下打开设置界面</p>
47   - *
48   - * @param context 上下文
49 60 */
50 61 public static void openWirelessSettings(Context context) {
51 62 if (android.os.Build.VERSION.SDK_INT > 10) {
52   - context.startActivity(new Intent(android.provider.Settings.ACTION_SETTINGS));
  63 + context.startActivity(new Intent(android.provider.Settings.ACTION_WIRELESS_SETTINGS).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
53 64 } else {
54   - context.startActivity(new Intent(android.provider.Settings.ACTION_WIRELESS_SETTINGS));
  65 + context.startActivity(new Intent(android.provider.Settings.ACTION_SETTINGS).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
55 66 }
56 67 }
57 68  
58 69 /**
59 70 * 获取活动网络信息
  71 + * <p>需添加权限 {@code <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>}</p>
60 72 *
61   - * @param context 上下文
62 73 * @return NetworkInfo
63 74 */
64   - public static NetworkInfo getActiveNetworkInfo(Context context) {
65   - ConnectivityManager cm = (ConnectivityManager) context
66   - .getSystemService(Context.CONNECTIVITY_SERVICE);
67   - return cm.getActiveNetworkInfo();
  75 + private static NetworkInfo getActiveNetworkInfo(Context context) {
  76 + return ((ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE)).getActiveNetworkInfo();
68 77 }
69 78  
  79 +
70 80 /**
71 81 * 判断网络是否可用
72 82 * <p>需添加权限 {@code <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>}</p>
73 83 *
74   - * @param context 上下文
75 84 * @return {@code true}: 可用<br>{@code false}: 不可用
76 85 */
77 86 public static boolean isAvailable(Context context) {
... ... @@ -80,28 +89,65 @@ public class NetworkUtil {
80 89 }
81 90  
82 91 /**
83   - * 判断网络是否连接
84   - * <p>需添加权限 {@code <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>}</p>
  92 + * Android 判断是否能真正上网(避免连入wifi无网的状态)
  93 + *
  94 + * @return
  95 + */
  96 + public static final boolean ping() {
  97 + try {
  98 + String ip = "www.baidu.com";// ping 的地址，可以换成任何一种可靠的外网
  99 + Process p = Runtime.getRuntime().exec("ping -c 3 -w 100 " + ip);// ping网址3次
  100 + // ping的状态
  101 + int status = p.waitFor();
  102 + if (status == 0) {
  103 + return true;
  104 + }
  105 + } catch (Exception e) {
  106 + }
  107 + return false;
  108 + }
  109 +
  110 + /**
  111 + * 判断移动数据是否打开
85 112 *
86   - * @param context 上下文
87 113 * @return {@code true}: 是<br>{@code false}: 否
88 114 */
89   - public static boolean isConnectInternet(Context context) {
90   - if (context == null) return false;
91   - ConnectivityManager connectManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
92   - if (connectManager != null) {
93   - NetworkInfo networkinfo = connectManager.getActiveNetworkInfo();
94   - return networkinfo != null && networkinfo.isAvailable();
  115 + public static boolean getDataEnabled(Context context) {
  116 + try {
  117 + TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
  118 + Method getMobileDataEnabledMethod = tm.getClass().getDeclaredMethod("getDataEnabled");
  119 + if (null != getMobileDataEnabledMethod) {
  120 + return (boolean) getMobileDataEnabledMethod.invoke(tm);
  121 + }
  122 + } catch (Exception e) {
  123 + e.printStackTrace();
95 124 }
96 125 return false;
97 126 }
98 127  
  128 +// /**
  129 +// * 打开或关闭移动数据(仅限系统应用)
  130 +// * <p>需系统应用 需添加权限{@code <uses-permission android:name="android.permission.MODIFY_PHONE_STATE"/>}</p>
  131 +// *
  132 +// * @param enabled {@code true}: 打开<br>{@code false}: 关闭
  133 +// */
  134 +// public static void setDataEnabled(boolean enabled) {
  135 +// try {
  136 +// TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
  137 +// Method setMobileDataEnabledMethod = tm.getClass().getDeclaredMethod("setDataEnabled", boolean.class);
  138 +// if (null != setMobileDataEnabledMethod) {
  139 +// setMobileDataEnabledMethod.invoke(tm, enabled);
  140 +// }
  141 +// } catch (Exception e) {
  142 +// e.printStackTrace();
  143 +// }
  144 +// }
  145 +
99 146 /**
100 147 * 判断网络是否是4G
101 148 * <p>需添加权限 {@code <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>}</p>
102 149 *
103   - * @param context 上下文
104   - * @return {@code true}: 是<br>{@code false}: 不是
  150 + * @return {@code true}: 是<br>{@code false}: 否
105 151 */
106 152 public static boolean is4G(Context context) {
107 153 NetworkInfo info = getActiveNetworkInfo(context);
... ... @@ -109,72 +155,95 @@ public class NetworkUtil {
109 155 }
110 156  
111 157 /**
  158 + * 判断wifi是否打开
  159 + * <p>需添加权限 {@code <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>}</p>
  160 + *
  161 + * @return {@code true}: 是<br>{@code false}: 否
  162 + */
  163 + public static boolean getWifiEnabled(Context context) {
  164 + WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
  165 + return wifiManager.isWifiEnabled();
  166 + }
  167 +
  168 + /**
  169 + * 打开或关闭wifi
  170 + * <p>需添加权限 {@code <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>}</p>
  171 + *
  172 + * @param enabled {@code true}: 打开<br>{@code false}: 关闭
  173 + */
  174 + public static void setWifiEnabled(Context context, boolean enabled) {
  175 + WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
  176 + if (enabled) {
  177 + if (!wifiManager.isWifiEnabled()) {
  178 + wifiManager.setWifiEnabled(true);
  179 + }
  180 + } else {
  181 + if (wifiManager.isWifiEnabled()) {
  182 + wifiManager.setWifiEnabled(false);
  183 + }
  184 + }
  185 + }
  186 +
  187 + /**
112 188 * 判断wifi是否连接状态
113 189 * <p>需添加权限 {@code <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>}</p>
114 190 *
115   - * @param context 上下文
116 191 * @return {@code true}: 连接<br>{@code false}: 未连接
117 192 */
118 193 public static boolean isWifiConnected(Context context) {
119 194 ConnectivityManager cm = (ConnectivityManager) context
120 195 .getSystemService(Context.CONNECTIVITY_SERVICE);
121   - return cm != null && cm.getActiveNetworkInfo().getType() == ConnectivityManager.TYPE_WIFI;
  196 + return cm != null && cm.getActiveNetworkInfo() != null
  197 + && cm.getActiveNetworkInfo().getType() == ConnectivityManager.TYPE_WIFI;
122 198 }
123 199  
124 200 /**
125   - * 获取移动网络运营商名称
126   - * <p>如中国联通、中国移动、中国电信</p>
  201 + * 判断wifi数据是否可用
  202 + * <p>需添加权限 {@code <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>}</p>
  203 + * <p>需添加权限 {@code <uses-permission android:name="android.permission.INTERNET"/>}</p>
127 204 *
128   - * @param context 上下文
129   - * @return 移动网络运营商名称
  205 + * @return {@code true}: 是<br>{@code false}: 否
130 206 */
131   - public static String getNetworkOperatorName(Context context) {
132   - TelephonyManager tm = (TelephonyManager) context
133   - .getSystemService(Context.TELEPHONY_SERVICE);
134   - return tm != null ? tm.getNetworkOperatorName() : null;
  207 + public static boolean isWifiAvailable(Context context) {
  208 + return getWifiEnabled(context) && isAvailable(context);
135 209 }
136 210  
137 211 /**
138   - * 获取移动终端类型
  212 + * 获取网络运营商名称
  213 + * <p>中国移动、如中国联通、中国电信</p>
139 214 *
140   - * @param context 上下文
141   - * @return 手机制式
142   - * <ul>
143   - * <li>{@link TelephonyManager#PHONE_TYPE_NONE } : 0 手机制式未知</li>
144   - * <li>{@link TelephonyManager#PHONE_TYPE_GSM } : 1 手机制式为GSM，移动和联通</li>
145   - * <li>{@link TelephonyManager#PHONE_TYPE_CDMA } : 2 手机制式为CDMA，电信</li>
146   - * <li>{@link TelephonyManager#PHONE_TYPE_SIP } : 3</li>
147   - * </ul>
  215 + * @return 运营商名称
148 216 */
149   - public static int getPhoneType(Context context) {
150   - TelephonyManager tm = (TelephonyManager) context
151   - .getSystemService(Context.TELEPHONY_SERVICE);
152   - return tm != null ? tm.getPhoneType() : -1;
  217 + public static String getNetworkOperatorName(Context context) {
  218 + TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
  219 + return tm != null ? tm.getNetworkOperatorName() : null;
153 220 }
154 221  
  222 + private static final int NETWORK_TYPE_GSM = 16;
  223 + private static final int NETWORK_TYPE_TD_SCDMA = 17;
  224 + private static final int NETWORK_TYPE_IWLAN = 18;
155 225  
156 226 /**
157   - * 获取当前的网络类型(WIFI,2G,3G,4G)
  227 + * 获取当前网络类型
158 228 * <p>需添加权限 {@code <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>}</p>
159 229 *
160   - * @param context 上下文
161 230 * @return 网络类型
162 231 * <ul>
163   - * <li>{@link #NETWORK_WIFI } = 1;</li>
164   - * <li>{@link #NETWORK_4G } = 4;</li>
165   - * <li>{@link #NETWORK_3G } = 3;</li>
166   - * <li>{@link #NETWORK_2G } = 2;</li>
167   - * <li>{@link #NETWORK_UNKNOWN} = 5;</li>
168   - * <li>{@link #NETWORK_NO } = -1;</li>
  232 + * <li>{@link NetworkUtil.NetworkType#NETWORK_WIFI } </li>
  233 + * <li>{@link NetworkUtil.NetworkType#NETWORK_4G } </li>
  234 + * <li>{@link NetworkUtil.NetworkType#NETWORK_3G } </li>
  235 + * <li>{@link NetworkUtil.NetworkType#NETWORK_2G } </li>
  236 + * <li>{@link NetworkUtil.NetworkType#NETWORK_UNKNOWN} </li>
  237 + * <li>{@link NetworkUtil.NetworkType#NETWORK_NO } </li>
169 238 * </ul>
170 239 */
171   - public static int getNetWorkType(Context context) {
172   - int netType = NETWORK_NO;
  240 + public static NetworkType getNetworkType(Context context) {
  241 + NetworkType netType = NetworkType.NETWORK_NO;
173 242 NetworkInfo info = getActiveNetworkInfo(context);
174 243 if (info != null && info.isAvailable()) {
175 244  
176 245 if (info.getType() == ConnectivityManager.TYPE_WIFI) {
177   - netType = NETWORK_WIFI;
  246 + netType = NetworkType.NETWORK_WIFI;
178 247 } else if (info.getType() == ConnectivityManager.TYPE_MOBILE) {
179 248 switch (info.getSubtype()) {
180 249  
... ... @@ -184,7 +253,7 @@ public class NetworkUtil {
184 253 case TelephonyManager.NETWORK_TYPE_EDGE:
185 254 case TelephonyManager.NETWORK_TYPE_1xRTT:
186 255 case TelephonyManager.NETWORK_TYPE_IDEN:
187   - netType = NETWORK_2G;
  256 + netType = NetworkType.NETWORK_2G;
188 257 break;
189 258  
190 259 case NETWORK_TYPE_TD_SCDMA:
... ... @@ -197,12 +266,12 @@ public class NetworkUtil {
197 266 case TelephonyManager.NETWORK_TYPE_EVDO_B:
198 267 case TelephonyManager.NETWORK_TYPE_EHRPD:
199 268 case TelephonyManager.NETWORK_TYPE_HSPAP:
200   - netType = NETWORK_3G;
  269 + netType = NetworkType.NETWORK_3G;
201 270 break;
202 271  
203 272 case NETWORK_TYPE_IWLAN:
204 273 case TelephonyManager.NETWORK_TYPE_LTE:
205   - netType = NETWORK_4G;
  274 + netType = NetworkType.NETWORK_4G;
206 275 break;
207 276 default:
208 277  
... ... @@ -210,48 +279,82 @@ public class NetworkUtil {
210 279 if (subtypeName.equalsIgnoreCase("TD-SCDMA")
211 280 || subtypeName.equalsIgnoreCase("WCDMA")
212 281 || subtypeName.equalsIgnoreCase("CDMA2000")) {
213   - netType = NETWORK_3G;
  282 + netType = NetworkType.NETWORK_3G;
214 283 } else {
215   - netType = NETWORK_UNKNOWN;
  284 + netType = NetworkType.NETWORK_UNKNOWN;
216 285 }
217 286 break;
218 287 }
219 288 } else {
220   - netType = NETWORK_UNKNOWN;
  289 + netType = NetworkType.NETWORK_UNKNOWN;
221 290 }
222 291 }
223 292 return netType;
224 293 }
225 294  
226 295 /**
227   - * 获取当前的网络类型(WIFI,2G,3G,4G)
228   - * <p>依赖上面的方法</p>
  296 + * 获取IP地址
  297 + * <p>需添加权限 {@code <uses-permission android:name="android.permission.INTERNET"/>}</p>
229 298 *
230   - * @param context 上下文
231   - * @return 网络类型名称
232   - * <ul>
233   - * <li>NETWORK_WIFI </li>
234   - * <li>NETWORK_4G </li>
235   - * <li>NETWORK_3G </li>
236   - * <li>NETWORK_2G </li>
237   - * <li>NETWORK_UNKNOWN</li>
238   - * <li>NETWORK_NO </li>
239   - * </ul>
  299 + * @param useIPv4 是否用IPv4
  300 + * @return IP地址
240 301 */
241   - public static String getNetWorkTypeName(Context context) {
242   - switch (getNetWorkType(context)) {
243   - case NETWORK_WIFI:
244   - return "NETWORK_WIFI";
245   - case NETWORK_4G:
246   - return "NETWORK_4G";
247   - case NETWORK_3G:
248   - return "NETWORK_3G";
249   - case NETWORK_2G:
250   - return "NETWORK_2G";
251   - case NETWORK_NO:
252   - return "NETWORK_NO";
253   - default:
254   - return "NETWORK_UNKNOWN";
  302 + public static String getIPAddress(boolean useIPv4) {
  303 + try {
  304 + for (Enumeration<NetworkInterface> nis = NetworkInterface.getNetworkInterfaces(); nis.hasMoreElements(); ) {
  305 + NetworkInterface ni = nis.nextElement();
  306 + // 防止小米手机返回10.0.2.15
  307 + if (!ni.isUp()) continue;
  308 + for (Enumeration<InetAddress> addresses = ni.getInetAddresses(); addresses.hasMoreElements(); ) {
  309 + InetAddress inetAddress = addresses.nextElement();
  310 + if (!inetAddress.isLoopbackAddress()) {
  311 + String hostAddress = inetAddress.getHostAddress();
  312 + boolean isIPv4 = hostAddress.indexOf(':') < 0;
  313 + if (useIPv4) {
  314 + if (isIPv4) return hostAddress;
  315 + } else {
  316 + if (!isIPv4) {
  317 + int index = hostAddress.indexOf('%');
  318 + return index < 0 ? hostAddress.toUpperCase() : hostAddress.substring(0, index).toUpperCase();
  319 + }
  320 + }
  321 + }
  322 + }
  323 + }
  324 + } catch (SocketException e) {
  325 + e.printStackTrace();
  326 + }
  327 + return null;
  328 + }
  329 +
  330 + /**
  331 + * 获取域名ip地址
  332 + * <p>需添加权限 {@code <uses-permission android:name="android.permission.INTERNET"/>}</p>
  333 + *
  334 + * @param domain 域名
  335 + * @return ip地址
  336 + */
  337 + public static String getDomainAddress(final String domain) {
  338 + try {
  339 + ExecutorService exec = Executors.newCachedThreadPool();
  340 + Future<String> fs = exec.submit(new Callable<String>() {
  341 + @Override
  342 + public String call() throws Exception {
  343 + InetAddress inetAddress;
  344 + try {
  345 + inetAddress = InetAddress.getByName(domain);
  346 + return inetAddress.getHostAddress();
  347 + } catch (UnknownHostException e) {
  348 + e.printStackTrace();
  349 + }
  350 + return null;
  351 + }
  352 + });
  353 + return fs.get();
  354 + } catch (InterruptedException | ExecutionException e) {
  355 + e.printStackTrace();
255 356 }
  357 + return null;
256 358 }
  359 +
257 360 }
258 361 \ No newline at end of file
... ...
core/imageload/src/main/java/com/cnlive/core/imageload/preview/PreviewImgFragment.java
  View file @c3a2c14
... ... @@ -44,15 +44,15 @@ public class PreviewImgFragment extends BaseFragment&lt;PreviewImgView, PreviewImgP
44 44 binding = (FragmentPreviewImgBinding) getBaseBinding();
45 45 }
46 46  
  47 +
47 48 @Override
48   - public void onCreate(Bundle savedInstanceState) {
49   - super.onCreate(savedInstanceState);
  49 + protected void initParams() {
  50 + super.initParams();
50 51 previewData = (ImagePreviewShowInfo) getArguments().getSerializable("data");
51 52 }
52 53  
53 54 @Override
54   - public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
55   - super.onViewCreated(view, savedInstanceState);
  55 + protected void initView() {
56 56 if (getMvpView() != null) getMvpView().initView(previewData);
57 57 }
58 58  
... ...
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollPedometerMainActivity.java
  View file @c3a2c14
... ... @@ -45,7 +45,6 @@ public class CollPedometerMainActivity extends BaseActivity {
45 45  
46 46 @Override
47 47 protected void initView() {
48   - super.initView();
49 48 setStatusBarColor(R.color.run_main_bg, 0);
50 49 }
51 50  
... ...
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollRunRaceDetailActivity.java
  View file @c3a2c14
... ... @@ -31,7 +31,6 @@ public class CollRunRaceDetailActivity extends BaseActivity {
31 31  
32 32 @Override
33 33 protected void initView() {
34   - super.initView();
35 34 setStatusBarTextColor(StatusBarConfig.BLACK);
36 35 setStatusBarColor(R.color.white,0);
37 36 loadRootFragment(new CollRunRaceDetailFragment());
... ...
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollRunningFinishActivity.java
  View file @c3a2c14
... ... @@ -20,7 +20,6 @@ public class CollRunningFinishActivity extends BaseActivity {
20 20  
21 21 @Override
22 22 protected void initView() {
23   - super.initView();
24 23 setStatusBarColor(R.color.run_main_bg,0);
25 24 loadRootFragment(new CollRunningFinishFragment());
26 25 }
... ...
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollRunningMapActivity.java
  View file @c3a2c14
... ... @@ -15,7 +15,6 @@ public class CollRunningMapActivity extends BaseActivity {
15 15  
16 16 @Override
17 17 protected void initView() {
18   - super.initView();
19 18 setStatusBarColor(R.color.run_main_bg,0);
20 19 if (null != getIntent().getExtras()) {
21 20 RunRaceDetailInfo runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().getSerializable("runRaceDetailInfo");
... ...
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollTraceListDetailActivity.java
  View file @c3a2c14
... ... @@ -19,7 +19,6 @@ public class CollTraceListDetailActivity extends BaseActivity {
19 19  
20 20 @Override
21 21 protected void initView() {
22   - super.initView();
23 22 if (null != getIntent().getExtras()) {
24 23 eventShoeLinesBean = (RaceNameListInfo.EventShoeLinesBean) getIntent().getExtras().get("eventShoeLinesBean");
25 24 String fenceEntityName = getIntent().getExtras().getString("fenceEntityName");
... ...
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/RaceListActivity.java
  View file @c3a2c14
... ... @@ -28,7 +28,6 @@ public class RaceListActivity extends BaseActivity {
28 28  
29 29 @Override
30 30 protected void initView() {
31   - super.initView();
32 31 setStatusBarColor(R.color.white,0);
33 32 setStatusBarTextColor(StatusBarConfig.BLACK);
34 33 if(getIntent().getStringExtra("userId") != null){
... ...
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/RaceNameListActivity.java
  View file @c3a2c14
... ... @@ -26,7 +26,6 @@ public class RaceNameListActivity extends BaseActivity {
26 26  
27 27 @Override
28 28 protected void initView() {
29   - super.initView();
30 29 setStatusBarTextColor(StatusBarConfig.BLACK);
31 30 setStatusBarColor(R.color.white,0);
32 31 if (null != getIntent().getExtras()) {
... ...
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/StartCollectTraceActivity.java
  View file @c3a2c14
... ... @@ -48,7 +48,6 @@ public class StartCollectTraceActivity extends BaseActivity {
48 48  
49 49 @Override
50 50 protected void initView() {
51   - super.initView();
52 51 setStatusBarColor(R.color.white, 0);
53 52 setStatusBarTextColor(StatusBarConfig.BLACK);
54 53 initPermissionDefineTip();
... ...
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunMainFragment.java
  View file @c3a2c14
... ... @@ -42,14 +42,14 @@ public class CollRunMainFragment extends BaseFragment&lt;CollRunMainFragmentView, B
42 42 }
43 43  
44 44 @Override
45   - protected void initFragmentStyle() {
46   - super.initFragmentStyle();
  45 + protected void init(Bundle savedInstanceState) {
  46 + super.init(savedInstanceState);
47 47 setStatusBarColor(R.color.run_main_bg, 0);
  48 +
48 49 }
49 50  
50 51 @Override
51 52 protected void initView() {
52   - super.initView();
53 53 EventBus.getDefault().register(this);
54 54 if (getArguments() != null) {
55 55 runRaceDetailInfo = (RunRaceDetailInfo) getArguments().getSerializable("runRaceDetailInfo");
... ...
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunRaceDetailFragment.java
  View file @c3a2c14
... ... @@ -66,7 +66,6 @@ public class CollRunRaceDetailFragment extends BaseFragment&lt;CollRunRaceDetailFra
66 66  
67 67 @Override
68 68 protected void initView() {
69   - super.initView();
70 69 if (!EventBus.getDefault().isRegistered(this)) {
71 70 EventBus.getDefault().register(this);
72 71 }
... ...
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunningFinishFragment.java
  View file @c3a2c14
... ... @@ -38,7 +38,6 @@ public class CollRunningFinishFragment extends BaseFragment&lt;CollRunningFinishFra
38 38  
39 39 @Override
40 40 protected void initView() {
41   - super.initView();
42 41 if (null != getMvpView()) {
43 42 getMvpView().initMap();
44 43 }
... ...
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunningMapFragment.java
  View file @c3a2c14
... ... @@ -60,14 +60,13 @@ public class CollRunningMapFragment extends BaseFragment&lt;CollRunningMapFragmentV
60 60 }
61 61  
62 62 @Override
63   - protected void initFragmentStyle() {
64   - super.initFragmentStyle();
  63 + protected void init(Bundle savedInstanceState) {
  64 + super.init(savedInstanceState);
65 65 setStatusBarColor(R.color.run_main_bg, 0);
66 66 }
67 67  
68 68 @Override
69 69 protected void initView() {
70   - super.initView();
71 70 EventBus.getDefault().register(this);
72 71 //获取传感器管理服务
73 72 mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);
... ...
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollTraceListDetailFragment.java
  View file @c3a2c14
1 1 package com.cnlive.moudle.collectionTrace.ui.fragment;
2 2  
3 3 import android.os.Bundle;
4   -import android.view.View;
5 4  
6 5 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
7 6 import com.cnlive.moudle.collectionTrace.frame.presenter.CollTraceListDetailFragmentPresenter;
8 7 import com.cnlive.moudle.collectionTrace.frame.view.CollTraceListDetailFragmentView;
9 8 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
10 9 import com.example.moudle_pedometer.R;
11   -import com.example.moudle_pedometer.databinding.FragmentCollFinishRunMapBinding;
12 10 import com.example.moudle_pedometer.databinding.FragmentCollRaceDetailBinding;
13 11  
14 12 /**
... ... @@ -42,14 +40,13 @@ public class CollTraceListDetailFragment extends BaseFragment&lt;CollTraceListDetai
42 40 }
43 41  
44 42 @Override
45   - protected void initFragmentStyle() {
46   - super.initFragmentStyle();
  43 + protected void init(Bundle savedInstanceState) {
  44 + super.init(savedInstanceState);
47 45 setStatusBarColor(R.color.run_main_bg, 0);
48 46 }
49 47  
50 48 @Override
51 49 protected void initView() {
52   - super.initView();
53 50 if (null != getArguments()) {
54 51 eventShoeLinesBean = (RaceNameListInfo.EventShoeLinesBean) getArguments().get("eventShoeLinesBean");
55 52 String fenceEntityName = getArguments().getString("fenceEntityName");
... ...
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/RaceListFragment.java
  View file @c3a2c14
... ... @@ -39,7 +39,6 @@ public class RaceListFragment extends BaseFragment&lt;RaceListView, RaceListPresent
39 39  
40 40 @Override
41 41 protected void initView() {
42   - super.initView();
43 42 if (!EventBus.getDefault().isRegistered(this)) {
44 43 EventBus.getDefault().register(this);
45 44 }
... ...
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/RaceNameListFragment.java
  View file @c3a2c14
... ... @@ -52,7 +52,6 @@ public class RaceNameListFragment extends BaseFragment&lt;RaceNameListView, RaceNam
52 52  
53 53 @Override
54 54 protected void initView() {
55   - super.initView();
56 55 if (!EventBus.getDefault().isRegistered(this)) EventBus.getDefault().register(this);
57 56 if (null != getArguments()) {
58 57 eventId = getArguments().getString("eventId");
... ...
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/StartTraceFragment.java
  View file @c3a2c14
... ... @@ -7,7 +7,6 @@ import android.os.Bundle;
7 7 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
8 8 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
9 9 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
10   -import com.cnlive.core.libs.base.util.StatusBarConfig;
11 10 import com.cnlive.moudle.collectionTrace.frame.view.StartTraceFragmentView;
12 11 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity;
13 12 import com.cnlive.moudle.pedometer.model.Constant;
... ... @@ -46,16 +45,13 @@ public class StartTraceFragment extends BaseFragment&lt;StartTraceFragmentView, Bas
46 45 }
47 46  
48 47 @Override
49   - protected void initFragmentStyle() {
50   - super.initFragmentStyle();
51   - setStatusBarColor(R.color.white, 0);
52   - setStatusBarTextColor(StatusBarConfig.BLACK);
53   -
  48 + protected void init(Bundle savedInstanceState) {
  49 + super.init(savedInstanceState);
  50 + showDefaultWhiteStatusBar();
54 51 }
55 52  
56 53 @Override
57 54 protected void initView() {
58   - super.initView();
59 55 EventBus.getDefault().register(this);
60 56 binding.topbar.setTitle("路径工具");
61 57 mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);//获取传感器管理服务
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/ALLScoreDetailActivity.java
  View file @c3a2c14
... ... @@ -18,7 +18,6 @@ public class ALLScoreDetailActivity extends BaseActivity {
18 18  
19 19 @Override
20 20 protected void initView() {
21   - super.initView();
22 21 if (null != getIntent().getExtras()) {
23 22 RunningFinishBean runningFinishBean = (RunningFinishBean) getIntent().getExtras().getSerializable("runningFinishBean");
24 23 if (runningFinishBean != null) {
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/LineUpAgainActivity.java
  View file @c3a2c14
... ... @@ -24,7 +24,6 @@ public class LineUpAgainActivity extends BaseActivity {
24 24  
25 25 @Override
26 26 protected void initView() {
27   - super.initView();
28 27 setStatusBarTextColor(StatusBarConfig.BLACK);
29 28 setStatusBarColor(R.color.color_fff,0);
30 29 loadRootFragment(new LineUpAgainFragment());
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/MyRecordActivity.java
  View file @c3a2c14
... ... @@ -50,7 +50,6 @@ public class MyRecordActivity extends BaseActivity {
50 50  
51 51 @Override
52 52 protected void initView() {
53   - super.initView();
54 53 setStatusBarTextColor(StatusBarConfig.BLACK);
55 54 setStatusBarColor(R.color.color_fff,0);
56 55 if(getIntent().getStringExtra("userId") != null){
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/OnGoingActivity.java
  View file @c3a2c14
... ... @@ -15,7 +15,6 @@ import com.example.moudle_pedometer.R;
15 15 public class OnGoingActivity extends BaseActivity {
16 16 @Override
17 17 protected void initView() {
18   - super.initView();
19 18 if (null != getIntent().getExtras()) {
20 19 String eventId = getIntent().getExtras().getString("eventId");
21 20 if (null != eventId) {
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/PedometerMainActivity.java
  View file @c3a2c14
... ... @@ -39,7 +39,6 @@ public class PedometerMainActivity extends BaseActivity {
39 39  
40 40 @Override
41 41 protected void initView() {
42   - super.initView();
43 42 if (null != getIntent().getExtras()) {
44 43 if (null != getIntent().getExtras().get("runRaceDetailInfo")) {
45 44 runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().get("runRaceDetailInfo");
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RaceRecordActivity.java
  View file @c3a2c14
... ... @@ -23,7 +23,6 @@ public class RaceRecordActivity extends BaseActivity {
23 23  
24 24 @Override
25 25 protected void initView() {
26   - super.initView();
27 26 setStatusBarTextColor(StatusBarConfig.BLACK);
28 27 setStatusBarColor(R.color.color_fff,0);
29 28 loadRootFragment(RaceRecorFragment.newInstance(getIntent().getStringExtra("raceTitle")));
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RegistrationInfoActivity.java
  View file @c3a2c14
... ... @@ -23,7 +23,6 @@ public class RegistrationInfoActivity extends BaseActivity {
23 23  
24 24 @Override
25 25 protected void initView() {
26   - super.initView();
27 26 setStatusBarColor(R.color.color_fff,0);
28 27 setStatusBarTextColor(StatusBarConfig.BLACK);
29 28 String fenceId = getIntent().getExtras().getString("fenceId");
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunLineActivity.java
  View file @c3a2c14
... ... @@ -41,7 +41,6 @@ public class RunLineActivity extends BaseActivity {
41 41  
42 42 @Override
43 43 protected void initView() {
44   - super.initView();
45 44 setStatusBarTextColor(StatusBarConfig.BLACK);
46 45 setStatusBarColor(R.color.color_fff, 0);
47 46 loadRootFragment(new RunLineFragment());
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
  View file @c3a2c14
... ... @@ -65,7 +65,6 @@ public class RunRaceDetailActivity extends BaseActivity {
65 65  
66 66 @Override
67 67 protected void initView() {
68   - super.initView();
69 68 initPermissionDefineTip();
70 69  
71 70 }
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunningFinishActivity.java
  View file @c3a2c14
... ... @@ -24,7 +24,6 @@ public class RunningFinishActivity extends BaseActivity {
24 24  
25 25 @Override
26 26 protected void initView() {
27   - super.initView();
28 27 setStatusBarColor(R.color.run_main_bg, 0);
29 28 setStatusBarTextColor(StatusBarConfig.WHITE);
30 29 if (null != getIntent().getExtras()) {
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunningMapActivity.java
  View file @c3a2c14
... ... @@ -21,7 +21,6 @@ import com.example.moudle_pedometer.R;
21 21 public class RunningMapActivity extends BaseActivity {
22 22 @Override
23 23 protected void initView() {
24   - super.initView();
25 24 setStatusBarColor(R.color.run_main_bg, 0);
26 25 setStatusBarTextColor(StatusBarConfig.WHITE);
27 26 if (null != getIntent().getExtras()) {
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/SelfRecordActivity.java
  View file @c3a2c14
... ... @@ -38,7 +38,6 @@ public class SelfRecordActivity extends BaseActivity {
38 38  
39 39 @Override
40 40 protected void initView() {
41   - super.initView();
42 41 setStatusBarTextColor(StatusBarConfig.BLACK);
43 42 setStatusBarColor(R.color.color_fff, 0);
44 43 loadRootFragment(new SelfRecordFragment());
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/ShareRecordActivity.java
  View file @c3a2c14
... ... @@ -79,7 +79,6 @@ public class ShareRecordActivity extends BaseActivity {
79 79  
80 80 @Override
81 81 protected void initView() {
82   - super.initView();
83 82 setStatusBarTextColor(StatusBarConfig.WHITE);
84 83 setStatusBarColor(R.color.bg, 0);
85 84 cord_name = findViewById(R.id.cord_name);
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/TakePartActivity.java
  View file @c3a2c14
... ... @@ -23,7 +23,6 @@ public class TakePartActivity extends BaseActivity {
23 23  
24 24 @Override
25 25 protected void initView() {
26   - super.initView();
27 26 setStatusBarTextColor(StatusBarConfig.BLACK);
28 27 setStatusBarColor(R.color.color_fff, 0);
29 28 loadRootFragment(new TakePartFragment());
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/UploadFailDetailActivity.java
  View file @c3a2c14
... ... @@ -14,7 +14,6 @@ import java.io.Serializable;
14 14 public class UploadFailDetailActivity extends BaseActivity {
15 15 @Override
16 16 protected void initView() {
17   - super.initView();
18 17 if (null != getIntent().getExtras()) {
19 18 FailedEntity failedEntity = (FailedEntity) getIntent().getExtras().getSerializable("failedEntity");
20 19 if (failedEntity != null) {
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/ALLScoreDetailFragment.java
  View file @c3a2c14
1 1 package com.cnlive.moudle.pedometer.ui.fragment;
2 2  
3 3 import android.os.Bundle;
4   -import android.view.View;
5 4  
6 5 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
7 6 import com.cnlive.moudle.pedometer.frame.presenter.ALLScoreDetailFragmentPresenter;
... ... @@ -31,9 +30,10 @@ public class ALLScoreDetailFragment extends BaseFragment&lt;ALLScoreDetailFragmentV
31 30 }
32 31  
33 32 @Override
34   - protected void initFragmentStyle() {
35   - super.initFragmentStyle();
  33 + protected void init(Bundle savedInstanceState) {
  34 + super.init(savedInstanceState);
36 35 setStatusBarColor(R.color.run_main_bg, 0);
  36 +
37 37 }
38 38  
39 39 public static ALLScoreDetailFragment newInstance(RunningFinishBean runningFinishBean) {
... ... @@ -46,7 +46,6 @@ public class ALLScoreDetailFragment extends BaseFragment&lt;ALLScoreDetailFragmentV
46 46  
47 47 @Override
48 48 protected void initView() {
49   - super.initView();
50 49 if (getArguments() != null) {
51 50 runningFinishBean = (RunningFinishBean) getArguments().getSerializable("runningFinishBean");
52 51 if (runningFinishBean != null) {
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/LineUpAgainFragment.java
  View file @c3a2c14
... ... @@ -36,7 +36,6 @@ public class LineUpAgainFragment extends BaseFragment&lt;LineUpAgainView, LineUpAga
36 36  
37 37 @Override
38 38 protected void initView() {
39   - super.initView();
40 39 List<FailedEntity> failedEntities = StepUtil.getFailListData(getActivity(), CommonInfo.getUserId(getActivity()));
41 40 if (getMvpView() != null) {
42 41 getMvpView().initView();
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/MyRecordFragment.java
  View file @c3a2c14
... ... @@ -53,7 +53,6 @@ public class MyRecordFragment extends BaseFragment&lt;MyRecordView, MyRecordPresent
53 53  
54 54 @Override
55 55 protected void initView() {
56   - super.initView();
57 56 if (getMvpView() != null) getMvpView().initView();
58 57 getPresenter().setData(getActivity(), CommonInfo.getUserId(getActivity()), state, currentPage, pageSize);
59 58 binding.refreshLayout.setOnRefreshListener(new OnRefreshListener() {
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/OnGoingFragment.java
  View file @c3a2c14
... ... @@ -2,16 +2,13 @@ package com.cnlive.moudle.pedometer.ui.fragment;
2 2  
3 3 import android.os.Bundle;
4 4 import android.text.TextUtils;
5   -import android.view.View;
6 5  
7 6 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
8   -import com.cnlive.core.libs.base.util.StatusBarConfig;
9 7 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
10 8 import com.cnlive.moudle.pedometer.frame.presenter.OnGoingFragmentPresenter;
11 9 import com.cnlive.moudle.pedometer.frame.view.OnGoingFragmentView;
12 10 import com.example.moudle_pedometer.R;
13 11 import com.example.moudle_pedometer.databinding.FragmentRunRaceDetailBinding;
14   -import com.qmuiteam.qmui.util.QMUIStatusBarHelper;
15 12  
16 13 public class OnGoingFragment extends BaseFragment<OnGoingFragmentView, OnGoingFragmentPresenter> {
17 14 public String eventId;
... ... @@ -36,17 +33,15 @@ public class OnGoingFragment extends BaseFragment&lt;OnGoingFragmentView, OnGoingFr
36 33 binding= (FragmentRunRaceDetailBinding) getBaseBinding();
37 34 }
38 35  
  36 +
39 37 @Override
40   - protected void initFragmentStyle() {
41   - super.initFragmentStyle();
42   -// QMUIStatusBarHelper.setStatusBarLightMode(getActivity());
43   - setStatusBarTextColor(StatusBarConfig.BLACK);
44   - setStatusBarColor(R.color.white,0);
  38 + protected void init(Bundle savedInstanceState) {
  39 + super.init(savedInstanceState);
  40 + showDefaultWhiteStatusBar();
45 41 }
46 42  
47 43 @Override
48 44 protected void initView() {
49   - super.initView();
50 45 if (getMvpView() != null) {
51 46 getMvpView().initMap();
52 47 }
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RaceRecorFragment.java
  View file @c3a2c14
... ... @@ -49,7 +49,6 @@ public class RaceRecorFragment extends BaseFragment&lt;RaceRecorView, RaceRecorPres
49 49  
50 50 @Override
51 51 protected void initView() {
52   - super.initView();
53 52 if (getMvpView() != null) getMvpView().initView();
54 53 getPresenter().getData(getActivity(), CommonInfo.getStreetId(getActivity()), CommonInfo.getUserId(getActivity()), currentPage, pageSize);
55 54  
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
  View file @c3a2c14
... ... @@ -71,7 +71,6 @@ public class RegistrationInfoFragment extends BaseFragment&lt;RegistrationInfoView,
71 71  
72 72 @Override
73 73 protected void initView() {
74   - super.initView();
75 74 if (getMvpView() != null) getMvpView().initView();
76 75 }
77 76  
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunLineFragment.java
  View file @c3a2c14
... ... @@ -38,7 +38,6 @@ public class RunLineFragment extends BaseFragment&lt;RunLineView, RunLinePresenter&gt;
38 38  
39 39 @Override
40 40 protected void initView() {
41   - super.initView();
42 41 if (getMvpView() != null) getMvpView().initView();
43 42 EventBus.getDefault().register(this);
44 43 getPresenter().setData(getActivity(), CommonInfo.getUserId(getActivity()), currentPage, pageSize);
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunMainFragment.java
  View file @c3a2c14
... ... @@ -48,20 +48,20 @@ public class RunMainFragment extends BaseFragment&lt;RunMainFragmentView, BasePrese
48 48  
49 49 @Override
50 50 protected int getBindLayoutId() {
51   - return R.layout.fragment_run_main;
  51 + return R.layout.fragment_run_main;
52 52 }
53 53  
54 54 @Override
55 55 protected void initBindingData() {
56 56 super.initBindingData();
57   - binding= (FragmentRunMainBinding) getBaseBinding();
  57 + binding = (FragmentRunMainBinding) getBaseBinding();
58 58 }
59 59  
60 60 @Override
61   - protected void initFragmentStyle() {
62   - super.initFragmentStyle();
  61 + protected void init(Bundle savedInstanceState) {
  62 + super.init(savedInstanceState);
63 63 setStatusBarTextColor(StatusBarConfig.WHITE);
64   - setStatusBarColor(R.color.run_main_bg,0);
  64 + setStatusBarColor(R.color.run_main_bg, 0);
65 65 }
66 66  
67 67 @Override
... ... @@ -107,7 +107,6 @@ public class RunMainFragment extends BaseFragment&lt;RunMainFragmentView, BasePrese
107 107  
108 108 @Override
109 109 protected void initView() {
110   - super.initView();
111 110 if (getMvpView() != null) {
112 111 new Handler().postDelayed(new Runnable() {
113 112 @Override
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunRaceDetailFragment.java
  View file @c3a2c14
1 1 package com.cnlive.moudle.pedometer.ui.fragment;
2 2  
3   -import android.content.Intent;
4 3 import android.hardware.Sensor;
5 4 import android.hardware.SensorManager;
6 5 import android.os.Bundle;
7 6 import android.text.TextUtils;
8 7 import android.util.Log;
9   -import android.view.View;
10 8  
11 9 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
12 10 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
13   -import com.cnlive.core.libs.base.util.StatusBarConfig;
14 11 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
15 12 import com.cnlive.moudle.pedometer.frame.presenter.RunRaceDetailFragmentPresenter;
16 13 import com.cnlive.moudle.pedometer.frame.view.RunRaceDetailFragmentView;
... ... @@ -20,7 +17,6 @@ import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
20 17 import com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity;
21 18 import com.example.moudle_pedometer.R;
22 19 import com.example.moudle_pedometer.databinding.FragmentRunRaceDetailBinding;
23   -import com.qmuiteam.qmui.util.QMUIStatusBarHelper;
24 20  
25 21 import org.greenrobot.eventbus.EventBus;
26 22 import org.greenrobot.eventbus.Subscribe;
... ... @@ -50,15 +46,13 @@ public class RunRaceDetailFragment extends BaseFragment&lt;RunRaceDetailFragmentVie
50 46 }
51 47  
52 48 @Override
53   - protected void initFragmentStyle() {
54   - super.initFragmentStyle();
55   - setStatusBarTextColor(StatusBarConfig.BLACK);
56   - setStatusBarColor(R.color.white, 0);
  49 + protected void init(Bundle savedInstanceState) {
  50 + super.init(savedInstanceState);
  51 + showDefaultWhiteStatusBar();
57 52 }
58 53  
59 54 @Override
60 55 protected void initView() {
61   - super.initView();
62 56 EventBus.getDefault().register(this);
63 57 mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);//获取传感器管理服务
64 58 if (getMvpView() != null) {
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunningFinishFragment.java
  View file @c3a2c14
... ... @@ -50,7 +50,6 @@ public class RunningFinishFragment extends BaseFragment&lt;RunningFinishFragmentVie
50 50  
51 51 @Override
52 52 protected void initView() {
53   - super.initView();
54 53 if (runningFinishBean != null) {
55 54 if (getMvpView() != null) {
56 55 getMvpView().initView(runningFinishBean);
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunningMapFragment.java
  View file @c3a2c14
... ... @@ -52,8 +52,8 @@ public class RunningMapFragment extends BaseFragment&lt;RunningMapFragmentView, Run
52 52 }
53 53  
54 54 @Override
55   - protected void initFragmentStyle() {
56   - super.initFragmentStyle();
  55 + protected void init(Bundle savedInstanceState) {
  56 + super.init(savedInstanceState);
57 57 setStatusBarColor(R.color.run_main_bg, 0);
58 58 }
59 59  
... ... @@ -69,7 +69,6 @@ public class RunningMapFragment extends BaseFragment&lt;RunningMapFragmentView, Run
69 69  
70 70 @Override
71 71 protected void initView() {
72   - super.initView();
73 72 EventBus.getDefault().register(this);
74 73 //获取传感器管理服务
75 74 mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/SelfRecordFragment.java
  View file @c3a2c14
... ... @@ -55,7 +55,6 @@ public class SelfRecordFragment extends BaseFragment&lt;SelfRecordView, SelfRecordP
55 55  
56 56 @Override
57 57 protected void initView() {
58   - super.initView();
59 58 if (!EventBus.getDefault().isRegistered(this)) {
60 59 EventBus.getDefault().register(this);
61 60 }
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/TakePartFragment.java
  View file @c3a2c14
... ... @@ -40,7 +40,6 @@ public class TakePartFragment extends BaseFragment&lt;TakePartView, TakePartPresent
40 40  
41 41 @Override
42 42 protected void initView() {
43   - super.initView();
44 43 getPresenter().setData(getActivity(), eventID, currentPage, itemNum);
45 44 if (getMvpView() != null) getMvpView().initView();
46 45 binding.refreshLayout.setOnRefreshListener(v -> {
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/UploadFailDetailFragment.java
  View file @c3a2c14
1 1 package com.cnlive.moudle.pedometer.ui.fragment;
2 2  
3 3 import android.os.Bundle;
4   -import android.view.View;
5 4  
6 5 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
7 6 import com.cnlive.moudle.pedometer.frame.presenter.UploadFailDetailFragmentPresenter;
... ... @@ -41,14 +40,13 @@ public class UploadFailDetailFragment extends BaseFragment&lt;UploadFailDetailFragm
41 40 }
42 41  
43 42 @Override
44   - protected void initFragmentStyle() {
45   - super.initFragmentStyle();
  43 + protected void init(Bundle savedInstanceState) {
  44 + super.init(savedInstanceState);
46 45 setStatusBarColor(R.color.run_main_bg, 0);
47 46 }
48 47  
49 48 @Override
50 49 protected void initView() {
51   - super.initView();
52 50 if (getArguments() != null) {
53 51 failedEntity = (FailedEntity) getArguments().getSerializable("failedEntity");
54 52 if (failedEntity != null) {
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/AllDeviceActivity.java
  View file @c3a2c14
... ... @@ -25,7 +25,6 @@ public class AllDeviceActivity extends BaseActivity {
25 25  
26 26 @Override
27 27 protected void initView() {
28   - super.initView();
29 28 if (!TextUtils.isEmpty(XiaoJIaCommInfo.getUserId(this)) && !TextUtils.isEmpty(XiaoJIaCommInfo.getUserIcon(this)) && !TextUtils.isEmpty(XiaoJIaCommInfo.getUserPhone(this)) && !TextUtils.isEmpty(XiaoJIaCommInfo.getUserNickName(this))) {
30 29 // getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, AllDeviceFragment.newInstance()).commitAllowingStateLoss();
31 30 loadRootFragment(AllDeviceFragment.newInstance());
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothHelpActivity.java
  View file @c3a2c14
... ... @@ -30,7 +30,6 @@ public class BlueToothHelpActivity extends BaseActivity {
30 30  
31 31 @Override
32 32 protected void initView() {
33   - super.initView();
34 33 setStatusBarTextColor(StatusBarConfig.BLACK);
35 34 setStatusBarColor(R.color.white,0);
36 35 initTopBar();
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothStep1Activity.java
  View file @c3a2c14
... ... @@ -37,7 +37,6 @@ public class BlueToothStep1Activity extends BaseActivity {
37 37  
38 38 @Override
39 39 protected void initView() {
40   - super.initView();
41 40 EventBusUtil.register(this);
42 41 initTopBar();
43 42 //下一步
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothStep2Activity.java
  View file @c3a2c14
... ... @@ -59,7 +59,6 @@ public class BlueToothStep2Activity extends BaseActivity {
59 59  
60 60 @Override
61 61 protected void initView() {
62   - super.initView();
63 62 EventBusUtil.register(this);
64 63  
65 64 initTopBar();
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ChangeDeviceNameActivity.java
  View file @c3a2c14
... ... @@ -15,7 +15,6 @@ import com.cnlive.strike.xiaojiaspeaker.ui.fragment.ChangeDeviceNameFragment;
15 15 public class ChangeDeviceNameActivity extends BaseActivity {
16 16 @Override
17 17 protected void initView() {
18   - super.initView();
19 18 if (null != getIntent().getExtras()) {
20 19 String deviceId = getIntent().getExtras().getString("deviceId");
21 20 String oldName = getIntent().getExtras().getString("oldName");
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ChangeWifiActivity.java
  View file @c3a2c14
... ... @@ -32,16 +32,14 @@ public class ChangeWifiActivity extends BaseActivity {
32 32 private String sn;
33 33  
34 34 @Override
35   - protected void onCreate(Bundle savedInstanceState) {
36   - super.onCreate(savedInstanceState);
37   - setContentView(R.layout.activity_select_wifi);
  35 + protected void initView() {
38 36 if (null != getIntent().getExtras()) {
39 37 currentUser = (FamilyListBean.UsersBeanX) getIntent().getExtras().getSerializable("currentUser");
40 38 sn = getIntent().getExtras().getString("sn");
41 39 }
42 40 wifiUtils = new WifiUtils(this);
43 41 if (null != currentUser && !TextUtils.isEmpty(sn)) {
44   - getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, ChangeWifiFragment.newInstance(sn, currentUser)).commitAllowingStateLoss();
  42 + loadRootFragment(ChangeWifiFragment.newInstance(sn, currentUser));
45 43 }
46 44 }
47 45  
... ... @@ -82,7 +80,7 @@ public class ChangeWifiActivity extends BaseActivity {
82 80 String[] permissions = new String[]{Manifest.permission.INTERNET
83 81 , Manifest.permission.ACCESS_FINE_LOCATION
84 82 , Manifest.permission.ACCESS_COARSE_LOCATION};
85   - requestPermission("您尚未授予程序运行所需权限\n是否设置?",permissions, new OnPermissionResponseListener() {
  83 + requestPermission("您尚未授予程序运行所需权限\n是否设置?", permissions, new OnPermissionResponseListener() {
86 84 @Override
87 85 public void onSuccess(String[] permissions) {
88 86 //判断蓝牙是否打开
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ConnBluetoothSuccessActivity.java
  View file @c3a2c14
... ... @@ -54,7 +54,6 @@ public class ConnBluetoothSuccessActivity extends BaseActivity {
54 54  
55 55 @Override
56 56 protected void initView() {
57   - super.initView();
58 57 EventBusUtil.register(this);
59 58 initTopBar();
60 59 //判断是否显示礼物弹窗
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ConnFailActivity.java
  View file @c3a2c14
... ... @@ -41,7 +41,6 @@ public class ConnFailActivity extends BaseActivity {
41 41  
42 42 @Override
43 43 protected void initView() {
44   - super.initView();
45 44 if (phone.indexOf("X") != -1 || phone.indexOf("x") != -1 || phone.indexOf("*") != -1) {
46 45 binding.llCallView.setVisibility(View.GONE);
47 46 } else {
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceDetailActivity.java
  View file @c3a2c14
... ... @@ -18,7 +18,6 @@ public class DeviceDetailActivity extends BaseActivity {
18 18  
19 19 @Override
20 20 protected void initView() {
21   - super.initView();
22 21 if (null != getIntent().getExtras()) {
23 22 FamilyListBean.UsersBeanX.DeviceListBean allDeviceInfo = (FamilyListBean.UsersBeanX.DeviceListBean) getIntent().getExtras().getSerializable("allDeviceInfo");
24 23 FamilyListBean.UsersBeanX currentUser = (FamilyListBean.UsersBeanX) getIntent().getExtras().getSerializable("currentUser");
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceInfoActivity.java
  View file @c3a2c14
... ... @@ -32,7 +32,6 @@ public class DeviceInfoActivity extends BaseActivity {
32 32  
33 33 @Override
34 34 protected void initView() {
35   - super.initView();
36 35 initTopBar();
37 36 if (null != getIntent().getExtras()) {
38 37 DeviceDetail deviceDetail = (DeviceDetail) getIntent().getExtras().getSerializable("deviceDetail");
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceInstructionActivity.java
  View file @c3a2c14
... ... @@ -30,7 +30,6 @@ public class DeviceInstructionActivity extends BaseActivity {
30 30  
31 31 @Override
32 32 protected void initView() {
33   - super.initView();
34 33 initTopBar();
35 34 }
36 35  
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceManagerActivity.java
  View file @c3a2c14
... ... @@ -23,7 +23,6 @@ public class DeviceManagerActivity extends BaseActivity {
23 23  
24 24 @Override
25 25 protected void initView() {
26   - super.initView();
27 26 if (null != getIntent().getExtras()) {
28 27 FamilyListBean.UsersBeanX.DeviceListBean currentDeviceInfo = (FamilyListBean.UsersBeanX.DeviceListBean) getIntent().getExtras().getSerializable("currentDeviceInfo");
29 28 FamilyListBean.UsersBeanX currentUser = (FamilyListBean.UsersBeanX) getIntent().getExtras().getSerializable("currentUser");
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/FirmwareUpdateActivity.java
  View file @c3a2c14
... ... @@ -16,7 +16,6 @@ public class FirmwareUpdateActivity extends BaseActivity {
16 16  
17 17 @Override
18 18 protected void initView() {
19   - super.initView();
20 19 if (null!=getIntent().getExtras()){
21 20 DeviceDetail deviceDetail= (DeviceDetail) getIntent().getExtras().getSerializable("deviceDetail");
22 21 loadRootFragment(FirmwareUpdateFragment.newInstance(deviceDetail));
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/InvitFriendActivity.java
  View file @c3a2c14
... ... @@ -16,7 +16,6 @@ public class InvitFriendActivity extends BaseActivity {
16 16  
17 17 @Override
18 18 protected void initView() {
19   - super.initView();
20 19 if (null != getIntent().getExtras()) {
21 20 String currentSelectFamilyId = getIntent().getExtras().getString("currentSelectFamilyId");
22 21 if (!TextUtils.isEmpty(currentSelectFamilyId)) {
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/RemoteControlActivity.java
  View file @c3a2c14
... ... @@ -41,7 +41,6 @@ public class RemoteControlActivity extends BaseActivity {
41 41  
42 42 @Override
43 43 protected void initView() {
44   - super.initView();
45 44 initTopBar();
46 45 binding.sbSwitch.setOnClickListener(new View.OnClickListener() {
47 46 @Override
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/SearchDeviceActivity.java
  View file @c3a2c14
... ... @@ -12,7 +12,6 @@ public class SearchDeviceActivity extends BaseActivity {
12 12  
13 13 @Override
14 14 protected void initView() {
15   - super.initView();
16 15 // getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,new SearchDevicefragment()).commit();
17 16 loadRootFragment(R.id.root_container,new SearchDevicefragment());
18 17 }
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/SelectIMFriendActivity.java
  View file @c3a2c14
... ... @@ -12,7 +12,6 @@ import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectIMFriendFragment;
12 12 public class SelectIMFriendActivity extends BaseActivity {
13 13 @Override
14 14 protected void initView() {
15   - super.initView();
16 15 if (null != getIntent().getExtras()) {
17 16 String currentSelectFamilyId = getIntent().getExtras().getString("currentSelectFamilyId");
18 17 if (!TextUtils.isEmpty(currentSelectFamilyId)) {
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/SelectWifiActivity.java
  View file @c3a2c14
... ... @@ -30,7 +30,6 @@ public class SelectWifiActivity extends BaseActivity {
30 30  
31 31 @Override
32 32 protected void initView() {
33   - super.initView();
34 33 if (null != getIntent().getExtras()) {
35 34 bleDevice = (BleDevice) getIntent().getExtras().get("bleDevice");
36 35 }
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/SetFriendsRoleActivity.java
  View file @c3a2c14
... ... @@ -16,7 +16,6 @@ import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SetFriendsRoleFragment;
16 16 public class SetFriendsRoleActivity extends BaseActivity {
17 17 @Override
18 18 protected void initView() {
19   - super.initView();
20 19 if (null != getIntent().getExtras()) {
21 20 String selectUid = getIntent().getExtras().getString("selectUid");
22 21 String currentSelectFamilyId = getIntent().getExtras().getString("currentSelectFamilyId");
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ShareFriendActivity.java
  View file @c3a2c14
... ... @@ -53,7 +53,6 @@
53 53  
54 54 @Override
55 55 protected void initView() {
56   - super.initView();
57 56 setStatusBarTextColor(StatusBarConfig.BLACK);
58 57 setStatusBarColor( R.color.white,0);
59 58 topBar = findViewById(R.id.topbar);
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/UserManagerActivity.java
  View file @c3a2c14
... ... @@ -14,7 +14,6 @@ import com.cnlive.strike.xiaojiaspeaker.ui.fragment.UserManagerFragment;
14 14 public class UserManagerActivity extends BaseActivity {
15 15 @Override
16 16 protected void initView() {
17   - super.initView();
18 17 if (null != getIntent().getExtras()) {
19 18 String currentSelectFamilyId = getIntent().getExtras().getString("currentSelectFamilyId");
20 19 if (!TextUtils.isEmpty(currentSelectFamilyId)) {
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/AllDeviceFragment.java
  View file @c3a2c14
... ... @@ -4,7 +4,6 @@ import android.os.Bundle;
4 4 import android.view.View;
5 5  
6 6 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
7   -import com.cnlive.core.libs.base.util.StatusBarConfig;
8 7 import com.cnlive.strike.xiaojiaspeaker.R;
9 8 import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
10 9 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentAllDeviceBinding;
... ... @@ -27,6 +26,7 @@ public class AllDeviceFragment extends BaseFragment&lt;AllDeviceFragmentView, AllDe
27 26 return fragment;
28 27 }
29 28  
  29 +
30 30 @Override
31 31 protected int getBindLayoutId() {
32 32 return R.layout.fragment_all_device;
... ... @@ -38,16 +38,15 @@ public class AllDeviceFragment extends BaseFragment&lt;AllDeviceFragmentView, AllDe
38 38 binding = (FragmentAllDeviceBinding) getBaseBinding();
39 39 }
40 40  
  41 +
41 42 @Override
42   - protected void initFragmentStyle() {
43   - super.initFragmentStyle();
44   - setStatusBarTextColor(StatusBarConfig.BLACK);
45   - setStatusBarColor(R.color.white, 0);
  43 + protected void init(Bundle savedInstanceState) {
  44 + super.init(savedInstanceState);
  45 + showDefaultWhiteStatusBar();
46 46 }
47 47  
48 48 @Override
49 49 protected void initView() {
50   - super.initView();
51 50 EventBusUtil.register(this);
52 51 initTopBar();
53 52 if (null != getMvpView()) {
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/ChangeDeviceNameFragment.java
  View file @c3a2c14
... ... @@ -5,7 +5,6 @@ import android.text.TextUtils;
5 5 import android.view.View;
6 6  
7 7 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
8   -import com.cnlive.core.libs.base.util.StatusBarConfig;
9 8 import com.cnlive.strike.xiaojiaspeaker.R;
10 9 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentChangeDeviceNameBinding;
11 10 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.ChangeDeviceNamePresenter;
... ... @@ -33,16 +32,15 @@ public class ChangeDeviceNameFragment extends BaseFragment&lt;ChangeDeviceNameView,
33 32 return R.layout.fragment_change_device_name;
34 33 }
35 34  
  35 +
36 36 @Override
37   - protected void initFragmentStyle() {
38   - super.initFragmentStyle();
39   - setStatusBarTextColor(StatusBarConfig.BLACK);
40   - setStatusBarColor(R.color.white,0);
  37 + protected void init(Bundle savedInstanceState) {
  38 + super.init(savedInstanceState);
  39 + showDefaultWhiteStatusBar();
41 40 }
42 41  
43 42 @Override
44 43 protected void initView() {
45   - super.initView();
46 44 initTopBar();
47 45 if (null != getMvpView()) {
48 46 if (null != getArguments()) {
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/ChangeWifiFragment.java
  View file @c3a2c14
... ... @@ -11,7 +11,6 @@ import android.text.TextUtils;
11 11 import android.util.Log;
12 12 import android.view.View;
13 13  
14   -import androidx.annotation.Nullable;
15 14 import androidx.core.content.ContextCompat;
16 15  
17 16 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
... ... @@ -41,15 +40,14 @@ public class ChangeWifiFragment extends BaseFragment&lt;ChangeWifiFragmentView, Cha
41 40 }
42 41  
43 42 @Override
44   - protected void initFragmentStyle() {
45   - super.initFragmentStyle();
  43 + protected void init(Bundle savedInstanceState) {
  44 + super.init(savedInstanceState);
46 45 setStatusBarTextColor(StatusBarConfig.BLACK);
47   - setStatusBarColor(R.color.white,0);
  46 + setStatusBarColor(R.color.white, 0);
48 47 }
49 48  
50 49 @Override
51 50 protected void initView() {
52   - super.initView();
53 51 initTopBar();
54 52 registerBroadcast();
55 53 if (null != getArguments()) {
... ... @@ -61,15 +59,6 @@ public class ChangeWifiFragment extends BaseFragment&lt;ChangeWifiFragmentView, Cha
61 59 }
62 60 }
63 61  
64   - @Override
65   - public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
66   - super.onViewCreated(view, savedInstanceState);
67   -
68   -
69   -
70   -
71   - }
72   -
73 62  
74 63 private void initTopBar() {
75 64 if (null != binding) {
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/DeviceDetailFragment.java
  View file @c3a2c14
... ... @@ -6,7 +6,6 @@ import android.view.View;
6 6  
7 7 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
8 8 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
9   -import com.cnlive.core.libs.base.util.StatusBarConfig;
10 9 import com.cnlive.strike.xiaojiaspeaker.R;
11 10 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentDeviceDetailBinding;
12 11 import com.cnlive.strike.xiaojiaspeaker.frame.view.DeviceDetailView;
... ... @@ -40,16 +39,15 @@ public class DeviceDetailFragment extends BaseFragment&lt;DeviceDetailView, BasePre
40 39 return fragment;
41 40 }
42 41  
  42 +
43 43 @Override
44   - protected void initFragmentStyle() {
45   - super.initFragmentStyle();
46   - setStatusBarTextColor(StatusBarConfig.BLACK);
47   - setStatusBarColor(R.color.white, 0);
  44 + protected void init(Bundle savedInstanceState) {
  45 + super.init(savedInstanceState);
  46 + showDefaultWhiteStatusBar();
48 47 }
49 48  
50 49 @Override
51 50 protected void initView() {
52   - super.initView();
53 51 EventBusUtil.register(this);
54 52 if (null != getArguments()) {
55 53 FamilyListBean.UsersBeanX.DeviceListBean allDeviceInfo = (FamilyListBean.UsersBeanX.DeviceListBean) getArguments().getSerializable("allDeviceInfo");
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/DeviceManagerFragment.java
  View file @c3a2c14
... ... @@ -7,7 +7,6 @@ import android.view.View;
7 7 import androidx.annotation.NonNull;
8 8  
9 9 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
10   -import com.cnlive.core.libs.base.util.StatusBarConfig;
11 10 import com.cnlive.strike.xiaojiaspeaker.R;
12 11 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentDeviceManagerBinding;
13 12 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.DeviceManagerFragmentPresenter;
... ... @@ -48,16 +47,15 @@ public FragmentDeviceManagerBinding binding;
48 47 return fragment;
49 48 }
50 49  
  50 +
51 51 @Override
52   - protected void initFragmentStyle() {
53   - super.initFragmentStyle();
54   - setStatusBarTextColor(StatusBarConfig.BLACK);
55   - setStatusBarColor(R.color.white,0);
  52 + protected void init(Bundle savedInstanceState) {
  53 + super.init(savedInstanceState);
  54 + showDefaultWhiteStatusBar();
56 55 }
57 56  
58 57 @Override
59 58 protected void initView() {
60   - super.initView();
61 59 EventBusUtil.register(this);
62 60 initTopBar();
63 61 if (null != getMvpView()) {
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/FirmwareUpdateFragment.java
  View file @c3a2c14
... ... @@ -5,10 +5,8 @@ import android.view.View;
5 5  
6 6 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
7 7 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
8   -import com.cnlive.core.libs.base.util.StatusBarConfig;
9 8 import com.cnlive.strike.xiaojiaspeaker.R;
10 9 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentFirmwareUpdateBinding;
11   -import com.cnlive.strike.xiaojiaspeaker.frame.presenter.FirmwareUpdateFragmentPresenter;
12 10 import com.cnlive.strike.xiaojiaspeaker.frame.view.FirmwareUpdateFragmentView;
13 11 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.DeviceDetail;
14 12  
... ... @@ -32,16 +30,15 @@ public class FirmwareUpdateFragment extends BaseFragment&lt;FirmwareUpdateFragmentV
32 30 return R.layout.fragment_firmware_update;
33 31 }
34 32  
  33 +
35 34 @Override
36   - protected void initFragmentStyle() {
37   - super.initFragmentStyle();
38   - setStatusBarTextColor(StatusBarConfig.BLACK);
39   - setStatusBarColor(R.color.white, 0);
  35 + protected void init(Bundle savedInstanceState) {
  36 + super.init(savedInstanceState);
  37 + showDefaultWhiteStatusBar();
40 38 }
41 39  
42 40 @Override
43 41 protected void initView() {
44   - super.initView();
45 42 initTopBar();
46 43 if (null != getMvpView()) {
47 44 if (null != getArguments()) {
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/InvitFriendFragment.java
  View file @c3a2c14
... ... @@ -5,7 +5,6 @@ import android.text.TextUtils;
5 5 import android.view.View;
6 6  
7 7 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
8   -import com.cnlive.core.libs.base.util.StatusBarConfig;
9 8 import com.cnlive.strike.xiaojiaspeaker.R;
10 9 import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
11 10 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentInvitFriendBinding;
... ... @@ -30,16 +29,15 @@ public class InvitFriendFragment extends BaseFragment&lt;InvitFriendView, InvitFrie
30 29 return R.layout.fragment_invit_friend;
31 30 }
32 31  
  32 +
33 33 @Override
34   - protected void initFragmentStyle() {
35   - super.initFragmentStyle();
36   - setStatusBarTextColor(StatusBarConfig.WHITE);
37   - setStatusBarColor(R.color.white,0);
  34 + protected void init(Bundle savedInstanceState) {
  35 + super.init(savedInstanceState);
  36 + showDefaultWhiteStatusBar();
38 37 }
39 38  
40 39 @Override
41 40 protected void initView() {
42   - super.initView();
43 41 initTopBar();
44 42 if (getMvpView() != null) {
45 43 if (null != getArguments()) {
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SearchDevicefragment.java
  View file @c3a2c14
... ... @@ -4,17 +4,14 @@ import android.os.Bundle;
4 4 import android.os.Handler;
5 5 import android.view.View;
6 6  
7   -import androidx.annotation.Nullable;
8 7 import androidx.core.content.ContextCompat;
9 8  
10 9 import com.clj.fastble.BleManager;
11 10 import com.clj.fastble.scan.BleScanRuleConfig;
12 11 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
13 12 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
14   -import com.cnlive.core.libs.base.util.StatusBarConfig;
15 13 import com.cnlive.strike.xiaojiaspeaker.R;
16 14 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentSearchDeviceBinding;
17   -import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SearchDevicefragmentPresenter;
18 15 import com.cnlive.strike.xiaojiaspeaker.frame.view.SearchDevicefragmentView;
19 16 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
20 17 import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
... ... @@ -41,16 +38,15 @@ public class SearchDevicefragment extends BaseFragment&lt;SearchDevicefragmentView,
41 38 binding = (FragmentSearchDeviceBinding) getBaseBinding();
42 39 }
43 40  
  41 +
44 42 @Override
45   - protected void initFragmentStyle() {
46   - super.initFragmentStyle();
47   - setStatusBarTextColor(StatusBarConfig.BLACK);
48   - setStatusBarColor(R.color.white, 0);
  43 + protected void init(Bundle savedInstanceState) {
  44 + super.init(savedInstanceState);
  45 + showDefaultWhiteStatusBar();
49 46 }
50 47  
51 48 @Override
52 49 protected void initView() {
53   - super.initView();
54 50 EventBusUtil.register(this);
55 51 initTopBar();
56 52 if (BleManager.getInstance().isBlueEnable()) {
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SelectIMFriendFragment.java
  View file @c3a2c14
... ... @@ -7,7 +7,6 @@ import android.view.View;
7 7 import androidx.core.content.ContextCompat;
8 8  
9 9 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
10   -import com.cnlive.core.libs.base.util.StatusBarConfig;
11 10 import com.cnlive.strike.xiaojiaspeaker.R;
12 11 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentSelectImFriendBinding;
13 12 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SelectIMFriendPresenter;
... ... @@ -41,16 +40,15 @@ public class SelectIMFriendFragment extends BaseFragment&lt;SelectIMFriendView, Sel
41 40 binding = (FragmentSelectImFriendBinding) getBaseBinding();
42 41 }
43 42  
  43 +
44 44 @Override
45   - protected void initFragmentStyle() {
46   - super.initFragmentStyle();
47   - setStatusBarTextColor(StatusBarConfig.WHITE);
48   - setStatusBarColor(R.color.white, 0);
  45 + protected void init(Bundle savedInstanceState) {
  46 + super.init(savedInstanceState);
  47 + showDefaultWhiteStatusBar();
49 48 }
50 49  
51 50 @Override
52 51 protected void initView() {
53   - super.initView();
54 52 EventBusUtil.register(this);
55 53 initTopBar();
56 54 if (null != getMvpView()) {
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SelectWifiFragment.java
  View file @c3a2c14
... ... @@ -14,7 +14,6 @@ import androidx.core.content.ContextCompat;
14 14  
15 15 import com.clj.fastble.data.BleDevice;
16 16 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
17   -import com.cnlive.core.libs.base.util.StatusBarConfig;
18 17 import com.cnlive.strike.xiaojiaspeaker.R;
19 18 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentSelectWifiBinding;
20 19 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SelectWifiFragmentPresenter;
... ... @@ -47,16 +46,15 @@ public class SelectWifiFragment extends BaseFragment&lt;SelectWifiFragmentView, Sel
47 46 binding = (FragmentSelectWifiBinding) getBaseBinding();
48 47 }
49 48  
  49 +
50 50 @Override
51   - protected void initFragmentStyle() {
52   - super.initFragmentStyle();
53   - setStatusBarTextColor(StatusBarConfig.BLACK);
54   - setStatusBarColor(R.color.white,0);
  51 + protected void init(Bundle savedInstanceState) {
  52 + super.init(savedInstanceState);
  53 + showDefaultWhiteStatusBar();
55 54 }
56 55  
57 56 @Override
58 57 protected void initView() {
59   - super.initView();
60 58 EventBusUtil.register(this);
61 59  
62 60 initTopBar();
... ...