1 优化基类

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