CNLive Android Team / newModuleStrike · Commits

Commit f58d7c439d56658f98c76d64e1ede7f0ce07a145

Authored by YangShuai
1 parent 826d41d7

1 优化基类

Inline Side-by-side
Showing 22 changed files with 111 additions and 83 deletions
app/strike/src/main/java/com/cnlive/strike/demo/activity/DemoMvpActivity.java
  View file @f58d7c4
... ... @@ -2,10 +2,8 @@ package com.cnlive.strike.demo.activity;
2 2  
3 3 import android.Manifest;
4 4 import android.content.Intent;
5   -import android.os.Bundle;
6 5 import android.os.Handler;
7 6 import android.os.Message;
8   -import android.os.PersistableBundle;
9 7 import android.text.TextUtils;
10 8 import android.view.LayoutInflater;
11 9 import android.view.View;
... ... @@ -13,7 +11,7 @@ import android.widget.LinearLayout;
13 11 import android.widget.TextView;
14 12  
15 13 import androidx.annotation.NonNull;
16   -import androidx.annotation.Nullable;
  14 +import androidx.databinding.ViewDataBinding;
17 15  
18 16 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
19 17 import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;
... ... @@ -54,9 +52,9 @@ public class DemoMvpActivity extends BaseActivity<DemoActivityView, DemoActivity
54 52  
55 53  
56 54 @Override
57   - protected void initBindingData() {
58   - super.initBindingData();
59   - binding = (ActivityDemoMvpMainBinding) getBaseBinding();
  55 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  56 + binding = (ActivityDemoMvpMainBinding) baseBinding;
  57 +
60 58 }
61 59  
62 60 @Override
... ...
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/LoginDialogActivity.java
  View file @f58d7c4
... ... @@ -10,6 +10,7 @@ import android.text.TextUtils;
10 10 import android.view.WindowManager;
11 11  
12 12 import androidx.annotation.NonNull;
  13 +import androidx.databinding.ViewDataBinding;
13 14  
14 15 import com.alibaba.android.arouter.facade.annotation.Route;
15 16 import com.cnlive.core.libs.base.application.AppConfig;
... ... @@ -68,9 +69,9 @@ public class LoginDialogActivity extends BaseActivity<LoginDialogView, LoginDial
68 69 }
69 70  
70 71 @Override
71   - protected void initBindingData() {
72   - super.initBindingData();
73   - binding = (ActivityLoginDialogBinding) getBaseBinding();
  72 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  73 + super.initBindingLayoutData(baseBinding);
  74 + binding = (ActivityLoginDialogBinding) baseBinding;
74 75 data = new QuickLoginData();
75 76 binding.setData(data);
76 77 }
... ...
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/PersonalDataActivity.java
  View file @f58d7c4
... ... @@ -3,10 +3,11 @@ package com.cnlive.strike.user.ui.activity;
3 3 import android.app.Dialog;
4 4 import android.content.Context;
5 5 import android.content.Intent;
6   -import android.os.Bundle;
7 6 import android.text.TextUtils;
8 7 import android.view.View;
9 8  
  9 +import androidx.databinding.ViewDataBinding;
  10 +
10 11 import com.alibaba.android.arouter.facade.annotation.Route;
11 12 import com.alibaba.android.arouter.launcher.ARouter;
12 13 import com.bumptech.glide.load.engine.DiskCacheStrategy;
... ... @@ -20,7 +21,6 @@ import com.cnlive.strike.user.auth.UserService;
20 21 import com.cnlive.strike.user.databinding.ActivityPersonalDataBinding;
21 22 import com.cnlive.strike.user.frame.presenter.PersonalDataPresenter;
22 23 import com.cnlive.strike.user.frame.view.PersonalDataView;
23   -import com.cnlive.strike.user.model.LaunchPage;
24 24 import com.qmuiteam.qmui.widget.QMUITopBar;
25 25  
26 26 import java.util.ArrayList;
... ... @@ -47,9 +47,10 @@ public class PersonalDataActivity extends BaseActivity<PersonalDataView, Persona
47 47 }
48 48  
49 49 @Override
50   - protected void initBindingData() {
51   - super.initBindingData();
52   - binding= (ActivityPersonalDataBinding) getBaseBinding();
  50 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  51 + super.initBindingLayoutData(baseBinding);
  52 + binding= (ActivityPersonalDataBinding) baseBinding;
  53 +
53 54 }
54 55  
55 56 public static void startActivity(Context context) {
... ...
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/PersonalImageActivity.java
  View file @f58d7c4
... ... @@ -2,11 +2,12 @@ package com.cnlive.strike.user.ui.activity;
2 2  
3 3 import android.app.Dialog;
4 4 import android.content.Intent;
5   -import android.os.Bundle;
6 5 import android.os.Environment;
7 6 import android.text.TextUtils;
8 7 import android.view.View;
9 8  
  9 +import androidx.databinding.ViewDataBinding;
  10 +
10 11 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
11 12 import com.cnlive.core.libs.base.util.AlertUtil;
12 13 import com.cnlive.core.libs.base.util.GlideUtil;
... ... @@ -55,14 +56,12 @@ public class PersonalImageActivity extends BaseActivity<PersonalImageView, Perso
55 56 return R.layout.activity_personal_image;
56 57 }
57 58  
  59 +
58 60 @Override
59   - protected void initBindingData() {
60   - super.initBindingData();
  61 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
61 62 binding = (ActivityPersonalImageBinding) getBaseBinding();
62 63 }
63 64  
64   -
65   -
66 65 @Override
67 66 protected void initView() {
68 67 setStatusBarTextColor(StatusBarConfig.BLACK);
... ...
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/SelectCountryActivity.java
  View file @f58d7c4
... ... @@ -4,6 +4,8 @@ package com.cnlive.strike.user.ui.activity;
4 4 import android.app.Activity;
5 5 import android.content.Intent;
6 6  
  7 +import androidx.databinding.ViewDataBinding;
  8 +
7 9 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
8 10 import com.cnlive.core.libs.base.util.StatusBarConfig;
9 11 import com.cnlive.strike.user.R;
... ... @@ -43,9 +45,8 @@ public class SelectCountryActivity extends BaseActivity<SelectCountryView, Selec
43 45 }
44 46  
45 47 @Override
46   - protected void initBindingData() {
47   - super.initBindingData();
48   - this.binding = (ActivitySelectCountryBinding) getBaseBinding();
  48 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  49 + this.binding = (ActivitySelectCountryBinding) baseBinding;
49 50 }
50 51  
51 52 @Override
... ...
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/SignatureActivity.java
  View file @f58d7c4
... ... @@ -9,7 +9,8 @@ import android.text.TextUtils;
9 9 import android.text.TextWatcher;
10 10 import android.view.View;
11 11 import android.widget.Button;
12   -import android.widget.Toast;
  12 +
  13 +import androidx.databinding.ViewDataBinding;
13 14  
14 15 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
15 16 import com.cnlive.core.libs.base.util.AlertUtil;
... ... @@ -56,9 +57,8 @@ public class SignatureActivity extends BaseActivity implements View.OnClickListe
56 57 }
57 58  
58 59 @Override
59   - protected void initBindingData() {
60   - super.initBindingData();
61   - binding = (ActivitySignatureBinding) getBaseBinding();
  60 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  61 + binding = (ActivitySignatureBinding) baseBinding;
62 62 }
63 63  
64 64 @Override
... ...
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/UpdateContentActivity.java
  View file @f58d7c4
... ... @@ -2,7 +2,6 @@ package com.cnlive.strike.user.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.app.Dialog;
5   -import android.content.Context;
6 5 import android.content.Intent;
7 6 import android.content.SharedPreferences;
8 7 import android.text.Editable;
... ... @@ -11,9 +10,10 @@ import android.text.TextUtils;
11 10 import android.text.TextWatcher;
12 11 import android.util.Log;
13 12 import android.view.View;
14   -import android.view.inputmethod.InputMethodManager;
15 13 import android.widget.Button;
16 14  
  15 +import androidx.databinding.ViewDataBinding;
  16 +
17 17 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
18 18 import com.cnlive.core.libs.base.util.AlertUtil;
19 19 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
... ... @@ -64,9 +64,8 @@ public class UpdateContentActivity extends BaseActivity implements View.OnClickL
64 64 }
65 65  
66 66 @Override
67   - protected void initBindingData() {
68   - super.initBindingData();
69   - binding = (ActivityUpdateContentBinding) getBaseBinding();
  67 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  68 + binding = (ActivityUpdateContentBinding) baseBinding;
70 69 }
71 70  
72 71 @Override
... ...
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/ui/activity/GenerateQRActivity.java
  View file @f58d7c4
... ... @@ -5,6 +5,8 @@ import android.content.Context;
5 5 import android.content.Intent;
6 6 import android.view.View;
7 7  
  8 +import androidx.databinding.ViewDataBinding;
  9 +
8 10 import com.alibaba.android.arouter.facade.annotation.Route;
9 11 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
10 12 import com.cnlive.core.libs.base.ui.widget.BottomSheet;
... ... @@ -67,10 +69,11 @@ public class GenerateQRActivity extends BaseActivity<GenerateQRView, GenerateQRP
67 69  
68 70  
69 71 @Override
70   - protected void initBindingData() {
71   - binding = (ActivityGenerateQrBinding) getBaseBinding();
72   - }
  72 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  73 + super.initBindingLayoutData(baseBinding);
  74 + binding = (ActivityGenerateQrBinding) baseBinding;
73 75  
  76 + }
74 77  
75 78 @Override
76 79 protected void initView() {
... ...
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/ui/activity/OtherQrActivity.java
  View file @f58d7c4
... ... @@ -6,6 +6,7 @@ import android.os.Bundle;
6 6 import androidx.annotation.Nullable;
7 7 import androidx.appcompat.app.AppCompatActivity;
8 8 import androidx.databinding.DataBindingUtil;
  9 +import androidx.databinding.ViewDataBinding;
9 10  
10 11 import android.text.TextUtils;
11 12 import android.view.View;
... ... @@ -41,8 +42,9 @@ public class OtherQrActivity extends BaseActivity {
41 42 }
42 43  
43 44 @Override
44   - protected void initBindingData() {
45   - binding = (ActivityOtherQrBinding) getBaseBinding();
  45 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  46 + super.initBindingLayoutData(baseBinding);
  47 + binding = (ActivityOtherQrBinding) baseBinding;
46 48 }
47 49  
48 50 @Override
... ...
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/ui/activity/ScanZarBarActivity.java
  View file @f58d7c4
... ... @@ -9,6 +9,7 @@ import android.os.Vibrator;
9 9  
10 10 import androidx.annotation.NonNull;
11 11 import androidx.annotation.Nullable;
  12 +import androidx.databinding.ViewDataBinding;
12 13  
13 14 import android.text.TextUtils;
14 15 import android.view.MotionEvent;
... ... @@ -78,8 +79,9 @@ public class ScanZarBarActivity extends BaseActivity<ScanNewView, ScanNewPresent
78 79 }
79 80  
80 81 @Override
81   - protected void initBindingData() {
82   - binding = (ActivityScaZbarBinding) getBaseBinding();
  82 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  83 + super.initBindingLayoutData(baseBinding);
  84 + binding = (ActivityScaZbarBinding) baseBinding;
83 85 }
84 86  
85 87 @Override
... ...
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/ui/activity/SpeakerBindStateActivity.java
  View file @f58d7c4
... ... @@ -3,6 +3,8 @@ package com.cnlive.strike.moudle.qr.ui.activity;
3 3 import android.content.Context;
4 4 import android.content.Intent;
5 5  
  6 +import androidx.databinding.ViewDataBinding;
  7 +
6 8 import com.alibaba.android.arouter.facade.annotation.Route;
7 9 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
8 10 import com.cnlive.strike.moudle.qr.R;
... ... @@ -35,8 +37,10 @@ public class SpeakerBindStateActivity extends BaseActivity<SpeakerBindStateView,
35 37 }
36 38  
37 39 @Override
38   - protected void initBindingData() {
39   - binding = (ActivitySpeakerBindStateBinding) getBaseBinding();
  40 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  41 + super.initBindingLayoutData(baseBinding);
  42 + binding = (ActivitySpeakerBindStateBinding) baseBinding;
  43 +
40 44 }
41 45  
42 46 @Override
... ...
core/base/src/main/java/com/cnlive/core/libs/base/frame/activity/BaseActivity.java
  View file @f58d7c4
... ... @@ -114,7 +114,7 @@ public abstract class BaseActivity<V extends BaseView, P extends BasePresenter<V
114 114 @Autowired(name = "isNewUser")
115 115 boolean isNewUser;
116 116  
117   - public ViewDataBinding getBaseBinding() {
  117 + public final ViewDataBinding getBaseBinding() {
118 118 return baseBinding;
119 119 }
120 120  
... ... @@ -163,7 +163,9 @@ public abstract class BaseActivity<V extends BaseView, P extends BasePresenter<V
163 163 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
164 164 }
165 165 //设置binding数据
166   - initBindingData();
  166 + if (null != baseBinding) {
  167 + initBindingLayoutData(baseBinding);
  168 + }
167 169 initParam();
168 170 //初始化控件
169 171 initView();
... ... @@ -293,7 +295,7 @@ public abstract class BaseActivity<V extends BaseView, P extends BasePresenter<V
293 295 protected void initData() {
294 296 }
295 297  
296   - protected void initBindingData() {
  298 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
297 299  
298 300 }
299 301  
... ...
core/imageload/src/main/java/com/cnlive/core/imageload/preview/DataProcessingActivity.java
  View file @f58d7c4
... ... @@ -9,6 +9,8 @@ import android.text.TextUtils;
9 9 import android.view.View;
10 10 import android.view.ViewGroup;
11 11  
  12 +import androidx.databinding.ViewDataBinding;
  13 +
12 14 import com.cnlive.core.imageload.R;
13 15 import com.cnlive.core.imageload.databinding.ActivityDataProcessingBinding;
14 16 import com.cnlive.core.imageload.preview.model.PreviewData;
... ... @@ -53,10 +55,11 @@ public class DataProcessingActivity extends BaseActivity<ProcessHtmlView, Proces
53 55 }
54 56  
55 57 @Override
56   - protected void initBindingData() {
57   - binding = (ActivityDataProcessingBinding) getBaseBinding();
58   - }
  58 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  59 + super.initBindingLayoutData(baseBinding);
  60 + binding = (ActivityDataProcessingBinding) baseBinding;
59 61  
  62 + }
60 63  
61 64 @Override
62 65 protected void initView() {
... ...
core/imageload/src/main/java/com/cnlive/core/imageload/preview/PreviewImageViewActivity.java
  View file @f58d7c4
... ... @@ -23,6 +23,7 @@ import java.util.List;
23 23  
24 24 import androidx.core.app.ActivityCompat;
25 25 import androidx.core.app.ActivityOptionsCompat;
  26 +import androidx.databinding.ViewDataBinding;
26 27 import androidx.fragment.app.Fragment;
27 28  
28 29 /**
... ... @@ -76,10 +77,11 @@ public class PreviewImageViewActivity extends BaseActivity<PreviewImageView, Pre
76 77  
77 78  
78 79 @Override
79   - protected void initBindingData() {
80   - binding = (ActivityPreviewImageViewBinding) getBaseBinding();
81   - }
  80 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  81 + super.initBindingLayoutData(baseBinding);
  82 + binding = (ActivityPreviewImageViewBinding) baseBinding;
82 83  
  84 + }
83 85  
84 86 @Override
85 87 public void onBackPressed() {
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothHelpActivity.java
  View file @f58d7c4
... ... @@ -2,12 +2,10 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.os.Bundle;
6 5 import android.view.View;
7 6  
8   -import androidx.appcompat.app.AppCompatActivity;
9 7 import androidx.core.content.ContextCompat;
10   -import androidx.databinding.DataBindingUtil;
  8 +import androidx.databinding.ViewDataBinding;
11 9  
12 10 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
13 11 import com.cnlive.core.libs.base.util.StatusBarConfig;
... ... @@ -23,9 +21,10 @@ public class BlueToothHelpActivity extends BaseActivity {
23 21 }
24 22  
25 23 @Override
26   - protected void initBindingData() {
27   - super.initBindingData();
28   - binding= (ActivityBlueToothHelpBinding) getBaseBinding();
  24 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  25 + super.initBindingLayoutData(baseBinding);
  26 + binding= (ActivityBlueToothHelpBinding)baseBinding;
  27 +
29 28 }
30 29  
31 30 @Override
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothStep1Activity.java
  View file @f58d7c4
... ... @@ -2,9 +2,10 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.os.Bundle;
6 5 import android.view.View;
7 6  
  7 +import androidx.databinding.ViewDataBinding;
  8 +
8 9 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
9 10 import com.cnlive.core.libs.base.util.StatusBarConfig;
10 11 import com.cnlive.strike.xiaojiaspeaker.R;
... ... @@ -24,9 +25,10 @@ public class BlueToothStep1Activity extends BaseActivity {
24 25 }
25 26  
26 27 @Override
27   - protected void initBindingData() {
28   - super.initBindingData();
29   - binding= (ActivityBlueToothStep1Binding) getBaseBinding();
  28 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  29 + super.initBindingLayoutData(baseBinding);
  30 + binding= (ActivityBlueToothStep1Binding) baseBinding;
  31 +
30 32 }
31 33  
32 34 @Override
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothStep2Activity.java
  View file @f58d7c4
... ... @@ -12,6 +12,8 @@ import android.provider.Settings;
12 12 import android.util.Log;
13 13 import android.view.View;
14 14  
  15 +import androidx.databinding.ViewDataBinding;
  16 +
15 17 import com.clj.fastble.BleManager;
16 18 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
17 19 import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;
... ... @@ -37,9 +39,10 @@ public class BlueToothStep2Activity extends BaseActivity {
37 39 }
38 40  
39 41 @Override
40   - protected void initBindingData() {
41   - super.initBindingData();
42   - binding = (ActivityBlueToothStep2Binding) getBaseBinding();
  42 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  43 + super.initBindingLayoutData(baseBinding);
  44 + binding = (ActivityBlueToothStep2Binding) baseBinding;
  45 +
43 46 }
44 47  
45 48 @Override
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ConnBluetoothSuccessActivity.java
  View file @f58d7c4
... ... @@ -2,11 +2,10 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.os.Bundle;
6 5 import android.text.TextUtils;
7 6 import android.view.View;
8 7  
9   -import androidx.databinding.DataBindingUtil;
  8 +import androidx.databinding.ViewDataBinding;
10 9  
11 10 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
12 11 import com.cnlive.core.libs.base.util.StatusBarConfig;
... ... @@ -38,11 +37,11 @@ public class ConnBluetoothSuccessActivity extends BaseActivity {
38 37 }
39 38  
40 39 @Override
41   - protected void initBindingData() {
42   - super.initBindingData();
43   - binding= (ActivityConnBluetoothSuccessBinding) getBaseBinding();
44   - }
  40 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  41 + super.initBindingLayoutData(baseBinding);
  42 + binding= (ActivityConnBluetoothSuccessBinding) baseBinding;
45 43  
  44 + }
46 45  
47 46 @Override
48 47 protected void initParam() {
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ConnFailActivity.java
  View file @f58d7c4
... ... @@ -3,10 +3,11 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5 5 import android.net.Uri;
6   -import android.os.Bundle;
7 6 import android.text.TextUtils;
8 7 import android.view.View;
9 8  
  9 +import androidx.databinding.ViewDataBinding;
  10 +
10 11 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
11 12 import com.cnlive.core.libs.base.util.StatusBarConfig;
12 13 import com.cnlive.strike.xiaojiaspeaker.R;
... ... @@ -22,9 +23,10 @@ public class ConnFailActivity extends BaseActivity {
22 23 }
23 24  
24 25 @Override
25   - protected void initBindingData() {
26   - super.initBindingData();
27   - binding= (ActivityConnFailBinding) getBaseBinding();
  26 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  27 + super.initBindingLayoutData(baseBinding);
  28 + binding= (ActivityConnFailBinding) baseBinding;
  29 +
28 30 }
29 31  
30 32 @Override
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceInfoActivity.java
  View file @f58d7c4
... ... @@ -2,10 +2,9 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.os.Bundle;
6 5 import android.view.View;
7 6  
8   -import androidx.databinding.DataBindingUtil;
  7 +import androidx.databinding.ViewDataBinding;
9 8  
10 9 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
11 10 import com.cnlive.core.libs.base.util.StatusBarConfig;
... ... @@ -25,9 +24,10 @@ public class DeviceInfoActivity extends BaseActivity {
25 24 }
26 25  
27 26 @Override
28   - protected void initBindingData() {
29   - super.initBindingData();
30   - binding= (ActivityDeviceInfoBinding) getBaseBinding();
  27 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  28 + super.initBindingLayoutData(baseBinding);
  29 + binding= (ActivityDeviceInfoBinding) baseBinding;
  30 +
31 31 }
32 32  
33 33 @Override
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceInstructionActivity.java
  View file @f58d7c4
... ... @@ -4,6 +4,8 @@ import android.app.Activity;
4 4 import android.content.Intent;
5 5 import android.view.View;
6 6  
  7 +import androidx.databinding.ViewDataBinding;
  8 +
7 9 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
8 10 import com.cnlive.core.libs.base.util.StatusBarConfig;
9 11 import com.cnlive.strike.xiaojiaspeaker.R;
... ... @@ -23,9 +25,10 @@ public class DeviceInstructionActivity extends BaseActivity {
23 25 }
24 26  
25 27 @Override
26   - protected void initBindingData() {
27   - super.initBindingData();
28   - binding= (ActivityDeviceInstructionBinding) getBaseBinding();
  28 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  29 + super.initBindingLayoutData(baseBinding);
  30 + binding= (ActivityDeviceInstructionBinding) baseBinding;
  31 +
29 32 }
30 33  
31 34 @Override
... ...
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/RemoteControlActivity.java
  View file @f58d7c4
... ... @@ -5,6 +5,8 @@ import android.content.Context;
5 5 import android.content.Intent;
6 6 import android.view.View;
7 7  
  8 +import androidx.databinding.ViewDataBinding;
  9 +
8 10 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
9 11 import com.cnlive.core.libs.base.util.AlertUtil;
10 12 import com.cnlive.core.libs.base.util.StatusBarConfig;
... ... @@ -34,9 +36,10 @@ public class RemoteControlActivity extends BaseActivity {
34 36 }
35 37  
36 38 @Override
37   - protected void initBindingData() {
38   - super.initBindingData();
39   - binding= (ActivityRemoteControlBinding) getBaseBinding();
  39 + protected void initBindingLayoutData(ViewDataBinding baseBinding) {
  40 + super.initBindingLayoutData(baseBinding);
  41 + binding= (ActivityRemoteControlBinding) baseBinding;
  42 +
40 43 }
41 44  
42 45 @Override
... ...