1 优化基类

YangShuai
1 parent 1c7d1018
Showing 69 changed files with 190 additions and 91 deletions
app/strike/src/main/AndroidManifest.xml
app/strike/src/main/java/com/cnlive/strike/LoginSuccessActivity.java
app/strike/src/main/java/com/cnlive/strike/MainActivity.java
app/strike/src/main/java/com/cnlive/strike/MyFragment.java
app/strike/src/main/java/com/cnlive/strike/MyFragment1.java
app/strike/src/main/java/com/cnlive/strike/demo/activity/DemoMvpActivity.java
cloud/user/src/main/java/com/cnlive/strike/user/frame/view/QuickLoginView.java
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/LoginActivity.java
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/SelectCountryActivity.java
cloud/user/src/main/java/com/cnlive/strike/user/ui/fragment/FirstLoginFragment.java
cloud/user/src/main/java/com/cnlive/strike/user/ui/fragment/QuickLoginFragment.java
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/ui/activity/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/app_qr/src/main/java/com/cnlive/strike/moudle/qr/ui/fragment/QrPayFragment.java
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/ui/fragment/QrSignInFragment.java
core/base/src/main/java/com/cnlive/core/libs/base/frame/activity/BaseActivity.java
core/base/src/main/java/com/cnlive/core/libs/base/frame/fragment/BaseFragment.java
core/base/src/main/res/layout/base_activity_main.xml
@@ -17,7 +17,11 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
+        <activity
+            android:name=".LoginSuccessActivity"
+            android:label="UserAPI"
+            android:theme="@style/AppTheme.NoTitleTranslucentTheme" />
+        />
         <activity android:name=".demo.activity.DemoActivity" />
         <activity android:name=".MyActivity"></activity>
         <activity android:name=".imgutil.ImgActivity" />
+package com.cnlive.strike;
+
+import com.alibaba.android.arouter.facade.annotation.Autowired;
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.cnlive.core.libs.base.frame.activity.BaseActivity;
+
+@Route(path = "/cloud/user/LoginSuccessActivity")
+public class LoginSuccessActivity extends BaseActivity {
+    @Autowired(name = "isNewUser")
+     boolean isNewUser;
+    @Override
+    protected void initCreate() {
+        super.initCreate();
+    }
+
+    @Override
+    protected void initView() {
+        super.initView();
+        logError("是否新用户"+isNewUser);
+    }
+}
@@ -33,12 +33,12 @@ public class MainActivity extends AppCompatActivity {
         findViewById(R.id.go_to).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (TextUtils.isEmpty(UserService.getUid(MainActivity.this))) {
+//                if (TextUtils.isEmpty(UserService.getUid(MainActivity.this))) {
                     startActivity(new Intent(MainActivity.this, LoginActivity.class));
 //                    finish();
-                } else {
-                    startActivity(new Intent(MainActivity.this, DemoMvpActivity.class));
-                }
+//                } else {
+//                    startActivity(new Intent(MainActivity.this, LoginSuccessActivity.class));
+//                }
             }
         });
         findViewById(R.id.to_img).setOnClickListener(view -> startActivity(new Intent(this, ImgActivity.class)));
@@ -45,8 +45,8 @@ public class MyFragment extends BaseFragment&lt;MyFragmentView, MyPresenter&gt; {
         setSwipeBackEnable(true);
         setStatusBarColor(R.color.green, 0);
         setStatusBarTextColor(StatusBarConfig.BLACK);
-        textView = baseView.findViewById(R.id.tv1);
-        baseView.findViewById(R.id.btn_test2).setOnClickListener(new View.OnClickListener() {
+        textView = getBaseView().findViewById(R.id.tv1);
+        getBaseView().findViewById(R.id.btn_test2).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 requestPermission(010001, "测试", new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION}, new OnPermissionResponseListener() {
@@ -62,7 +62,7 @@ public class MyFragment extends BaseFragment&lt;MyFragmentView, MyPresenter&gt; {
                 });
             }
         });
-        baseView.findViewById(R.id.btn_test1).setOnClickListener(new View.OnClickListener() {
+        getBaseView().findViewById(R.id.btn_test1).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
 //                requestPermission(new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION}, new OnPermissionResponseListener() {
@@ -79,7 +79,7 @@ public class MyFragment extends BaseFragment&lt;MyFragmentView, MyPresenter&gt; {
                 startForResult(new MyFragment1(), 1001);
             }
         });
-        baseView.findViewById(R.id.btn_test).setOnClickListener(new View.OnClickListener() {
+        getBaseView().findViewById(R.id.btn_test).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 //单个请求
@@ -32,7 +32,7 @@ public class MyFragment1 extends BaseFragment {
         setStatusBarColor(R.color.qmui_config_color_red, 0);
         setStatusBarTextColor(StatusBarConfig.BLACK);
-        baseView.findViewById(R.id.btn_test).setOnClickListener(new View.OnClickListener() {
+        getBaseView().findViewById(R.id.btn_test).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 //单个请求
 package com.cnlive.strike.demo.activity;
+import android.graphics.Color;
 import android.os.Handler;
 import android.os.Message;
@@ -27,6 +28,7 @@ public class DemoMvpActivity extends BaseActivity&lt;DemoActivityView, DemoActivity
     protected void initView() {
         super.initView();
         loadRootFragment(new DemoFragment());
+
     }
@@ -208,7 +208,8 @@ public class QuickLoginView extends BaseView {
         successInfo.setClickAd(fragment.clickAd);
         successInfo.setTagShare(fragment.tagShare);
         successInfo.setTagMsg(fragment.tagMsg);
-        ARouter.getInstance().build("/strick/MyActivity")
+        ARouter.getInstance().build(LoginActivity.LOGIN_SUCCESS_PATH)
+                .withBoolean("isNewUser", true)
                 .navigation(getContext());
         if (isNewUser) {
 //            HelperUtil.isNewUser(fragment.getActivity(), successInfo, isHasOtherUserInfo);
@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.net.Uri;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
@@ -18,8 +19,10 @@ import com.cnlive.strike.user.ui.fragment.QuickLoginFragment;
  */
 //@Route(path = "/cnmain/LoginActivity")
 @Route(path = LoginActivity.PATH)
-public class LoginActivity extends BaseActivity {
+public class LoginActivity extends BaseActivity  {
+
     public static final String PATH = "/cloud/user/ui/activity/login";
+    public static final String LOGIN_SUCCESS_PATH = "/cloud/user/LoginSuccessActivity";
     public static String FROM_TOKEN_ERROR = "from_token_error";
     public static String TAG_MSG = "tagMsg";
     public static String TAG_SHARE = "tagValue";
@@ -45,7 +45,7 @@ public class SelectCountryActivity extends BaseActivity&lt;SelectCountryView, Selec
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        this.binding = (ActivitySelectCountryBinding) baseBinding;
+        this.binding = (ActivitySelectCountryBinding) getBaseBinding();
     }
     @Override
@@ -76,7 +76,7 @@ public class FirstLoginFragment extends BaseFragment&lt;FirstLoginView, FirstLoginP
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentFirstLoginBinding) baseBinding;
+        binding = (FragmentFirstLoginBinding) getBaseBinding();
         if (null == data) {
             data = new FirstLoginData();
         }
@@ -99,7 +99,7 @@ public class QuickLoginFragment extends BaseFragment&lt;QuickLoginView, QuickLoginP
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding= (FragmentQuickLoginBinding) baseBinding;
+        binding= (FragmentQuickLoginBinding) getBaseBinding();
         data = new QuickLoginData();
         binding.setData(data);
     }
@@ -68,7 +68,7 @@ public class GenerateQRActivity extends BaseActivity&lt;GenerateQRView, GenerateQRP
     @Override
     protected void initBindingData() {
-        binding = (ActivityGenerateQrBinding) baseBinding;
+        binding = (ActivityGenerateQrBinding) getBaseBinding();
     }
@@ -42,7 +42,7 @@ public class OtherQrActivity extends BaseActivity {
     @Override
     protected void initBindingData() {
-        binding = (ActivityOtherQrBinding) baseBinding;
+        binding = (ActivityOtherQrBinding) getBaseBinding();
     }
     @Override
@@ -77,7 +77,7 @@ public class ScanZarBarActivity extends BaseActivity&lt;ScanNewView, ScanNewPresent
     @Override
     protected void initBindingData() {
-        binding = (ActivityScaZbarBinding) baseBinding;
+        binding = (ActivityScaZbarBinding) getBaseBinding();
     }
     @Override
@@ -36,7 +36,7 @@ public class SpeakerBindStateActivity extends BaseActivity&lt;SpeakerBindStateView,
     @Override
     protected void initBindingData() {
-        binding = (ActivitySpeakerBindStateBinding) baseBinding;
+        binding = (ActivitySpeakerBindStateBinding) getBaseBinding();
     }
     @Override
@@ -51,7 +51,7 @@ public class QrPayFragment extends BaseFragment&lt;QrPayView, QrPayPresenter&gt; imple
     @Override
     protected void initBindingData() {
-        binding = (FragmentQrPayBinding) baseBinding;
+        binding = (FragmentQrPayBinding) getBaseBinding();
     }
     @Override
@@ -43,7 +43,7 @@ public class QrSignInFragment extends BaseFragment&lt;QrSignInView, QrSignInPresent
     @Override
     protected void initBindingData() {
-        binding = (FragmentQrSigninBinding) baseBinding;
+        binding = (FragmentQrSigninBinding) getBaseBinding();
     }
     @Override
@@ -10,6 +10,7 @@ import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.graphics.Point;
 import android.net.Uri;
 import android.os.Build;
@@ -40,6 +41,7 @@ import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ViewDataBinding;
 import androidx.fragment.app.Fragment;
+import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
@@ -66,8 +68,6 @@ import com.me.yokeyword.fragmentation_swipeback.core.SwipeBackActivityDelegate;
 import com.orhanobut.logger.Logger;
 import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -83,8 +83,7 @@ import java.util.Observer;
  */
 public abstract class BaseActivity<V extends BaseView, P extends BasePresenter<V>> extends MvpActivity<V, P> implements ISupportActivity, ISwipeBackActivity, Observer {
     private V view;
-    private P presenter;
-    public ViewDataBinding baseBinding;
+    private ViewDataBinding baseBinding;
     //获取TAG的activity名称
     public final String TAG = this.getClass().getSimpleName();
     //是否显示标题栏
@@ -115,6 +114,13 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     private String[] userSetPermission;
     private Handler myActHandler;
     private List<Observable> observableList;
+    private boolean isCreateDefultEmptyView = true;//如果没有填充布局,是否设置默认布局,默认是设置的
+    @Autowired(name = "isNewUser")
+    boolean isNewUser;
+
+    public ViewDataBinding getBaseBinding() {
+        return baseBinding;
+    }
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -124,20 +130,8 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         } else if (0 != getViewLayoutId()) {
             setContentView(getViewLayoutId());
         }
-        //两种视图都没有设置,就加载默认跟视图,用于fragment切换
-        if (0 == getBindLayoutId() && 0 == getViewLayoutId()) {
-            setContentView(R.layout.base_activity_main);
-        }
-        if (null == observableList) {
-            observableList = new ArrayList<>();
-        }
         context = this;
         me = this;
-        //fragment管理
-        mDelegate.onCreate(savedInstanceState);
-        mSwipeDelegate.onCreate(savedInstanceState);
-        //是否开启滑动返回
-        setSwipeBackEnable(isOpenSwipBack);
         this.savedInstanceState = savedInstanceState;
         //路由参数初始化
         ARouter.getInstance().inject(this);
@@ -145,6 +139,20 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         AppManager.getInstance().pushActivity(me);
         //创建订阅映射
         SubscriptionManager.getInstance().setCurrentDisposables(TAG);
+        //fragment管理
+        mDelegate.onCreate(savedInstanceState);
+        mSwipeDelegate.onCreate(savedInstanceState);
+        initCreate();
+        //两种视图都没有设置,就加载默认跟视图,用于fragment切换
+        if (isCreateDefultEmptyView) {
+            if (0 == getBindLayoutId() && 0 == getViewLayoutId()) {
+                setContentView(R.layout.base_activity_main);
+            }
+        }
+        if (null == observableList) {
+            observableList = new ArrayList<>();
+        }
+
         if (!isShowTitle) {
             requestWindowFeature(Window.FEATURE_NO_TITLE);
         }
@@ -164,6 +172,12 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         initView();
         //设置数据
         initData();
+        //是否开启滑动返回
+        setSwipeBackEnable(isOpenSwipBack);
+    }
+
+    public void setEnableCreateDefultEmptyView(boolean enable) {
+        isCreateDefultEmptyView = enable;
     }
     public Handler getMyActHandler() {
@@ -240,6 +254,9 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
     }
+    protected void initCreate() {
+    }
+
     protected void initParam() {
     }
@@ -56,10 +56,9 @@ import java.util.Observer;
  */
 public abstract class BaseFragment<V extends BaseView, P extends BasePresenter<V>> extends com.hannesdorfmann.mosby3.mvp.MvpFragment<V, P> implements ISupportFragment, ISwipeBackFragment, Observer {
     private V view;
-    private P presenter;
     public final String TAG = this.getClass().getSimpleName();
-    public ViewDataBinding baseBinding;
-    public View baseView;
+    private ViewDataBinding baseBinding;
+    private View baseView;
     public BaseActivity me;
     //fragment管理
     private final SupportFragmentDelegate mDelegate = new SupportFragmentDelegate(this);
@@ -67,6 +66,15 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
     private final SwipeBackFragmentDelegate mSwipeDelegate = new SwipeBackFragmentDelegate(this);
     private Handler myFragHandler;
     private List<Observable> observableList;
+    private Bundle savedInstanceState;
+
+    public ViewDataBinding getBaseBinding() {
+        return baseBinding;
+    }
+
+    public View getBaseView() {
+        return baseView;
+    }
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -76,6 +84,7 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
         if (null == observableList) {
             observableList = new ArrayList<>();
         }
+        this.savedInstanceState = savedInstanceState;
         //创建订阅映射
         SubscriptionManager.getInstance().setCurrentDisposables(TAG);
         mDelegate.onCreate(savedInstanceState);
@@ -146,6 +155,10 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
         return view;
     }
+    public Bundle getSavedInstanceState() {
+        return savedInstanceState;
+    }
+
     //添加观察者
     public void addObservable(Observable... observable) {
         Observable[] result = observable;
@@ -3,4 +3,5 @@
     android:id="@+id/root_container"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:background="@null"
     android:layout_height="match_parent"/>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/root_container"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
 \ No newline at end of file
+    android:layout_height="match_parent"
+    android:background="@null" />
 \ No newline at end of file
@@ -171,4 +171,40 @@
         <!-- Customize your theme here. -->
         <item name="android:windowIsTranslucent">true</item>
     </style>
+
+    <style name="AppTheme.NoTitle_FullScreen" parent="Theme.AppCompat.NoActionBar"> <!--自定义主题名称-->
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowFullscreen">true</item>
+    </style>
+
+    <style name="TranslucentTheme">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
+
+
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="android:background">@color/transparent</item>
+    </style>
+    <!--全屏加透明-->
+    <style name="AppTheme.TranslucentFullScreenTheme" parent="AppTheme.FullScreenTheme">
+        <item name="android:windowBackground">@color/transparent</item>
+        <item name="android:windowIsTranslucent">true</item>
+    </style>
+    <!--全屏-->
+    <style name="AppTheme.FullScreenTheme" parent="AppTheme">
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowNoTitle">true</item>
+    </style>
+    <!--透明，有任务栏电量时间等-->
+    <style name="AppTheme.NoTitleTranslucentTheme" parent="AppTheme">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@color/transparent</item>
+        <item name="android:windowIsTranslucent">true</item>
+    </style>
 </resources>
 \ No newline at end of file
@@ -54,7 +54,7 @@ public class DataProcessingActivity extends BaseActivity&lt;ProcessHtmlView, Proces
     @Override
     protected void initBindingData() {
-        binding = (ActivityDataProcessingBinding) baseBinding;
+        binding = (ActivityDataProcessingBinding) getBaseBinding();
     }
@@ -77,7 +77,7 @@ public class PreviewImageViewActivity extends BaseActivity&lt;PreviewImageView, Pre
     @Override
     protected void initBindingData() {
-        binding = (ActivityPreviewImageViewBinding) baseBinding;
+        binding = (ActivityPreviewImageViewBinding) getBaseBinding();
     }
@@ -41,7 +41,7 @@ public class PreviewImgFragment extends BaseFragment&lt;PreviewImgView, PreviewImgP
     @Override
     protected void initBindingData() {
-        binding = (FragmentPreviewImgBinding) baseBinding;
+        binding = (FragmentPreviewImgBinding) getBaseBinding();
     }
     @Override
@@ -38,7 +38,7 @@ public class CollRunMainFragment extends BaseFragment&lt;CollRunMainFragmentView, B
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentCollRunMainBinding) baseBinding;
+        binding = (FragmentCollRunMainBinding) getBaseBinding();
     }
     @Override
@@ -42,7 +42,7 @@ public class CollRunRaceDetailFragment extends BaseFragment&lt;CollRunRaceDetailFra
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentCollectRunRaceDetailBinding) baseBinding;
+        binding = (FragmentCollectRunRaceDetailBinding) getBaseBinding();
     }
@@ -33,7 +33,7 @@ public class CollRunningFinishFragment extends BaseFragment&lt;CollRunningFinishFra
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentCollFinishRunMapBinding) baseBinding;
+        binding = (FragmentCollFinishRunMapBinding) getBaseBinding();
     }
     @Override
@@ -45,7 +45,7 @@ public class CollRunningMapFragment extends BaseFragment&lt;CollRunningMapFragmentV
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentCollectRunningMapBinding) baseBinding;
+        binding = (FragmentCollectRunningMapBinding) getBaseBinding();
     }
@@ -38,7 +38,7 @@ public class CollTraceListDetailFragment extends BaseFragment&lt;CollTraceListDetai
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentCollRaceDetailBinding) baseBinding;
+        binding = (FragmentCollRaceDetailBinding) getBaseBinding();
     }
     @Override
@@ -34,7 +34,7 @@ public class RaceListFragment extends BaseFragment&lt;RaceListView, RaceListPresent
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentRaceListBinding) baseBinding;
+        binding = (FragmentRaceListBinding) getBaseBinding();
     }
     @Override
@@ -47,7 +47,7 @@ public class RaceNameListFragment extends BaseFragment&lt;RaceNameListView, RaceNam
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentRaceNameListBinding) baseBinding;
+        binding = (FragmentRaceNameListBinding) getBaseBinding();
     }
     @Override
@@ -42,7 +42,7 @@ public class StartTraceFragment extends BaseFragment&lt;StartTraceFragmentView, Bas
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentStartCollectTraceBinding) baseBinding;
+        binding = (FragmentStartCollectTraceBinding) getBaseBinding();
     }
     @Override
@@ -27,7 +27,7 @@ public class ALLScoreDetailFragment extends BaseFragment&lt;ALLScoreDetailFragmentV
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentFinishRunMapBinding) baseBinding;
+        binding = (FragmentFinishRunMapBinding) getBaseBinding();
     }
     @Override
@@ -31,7 +31,7 @@ public class LineUpAgainFragment extends BaseFragment&lt;LineUpAgainView, LineUpAga
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentLineUpAgainBinding) baseBinding;
+        binding = (FragmentLineUpAgainBinding) getBaseBinding();
     }
     @Override
@@ -42,7 +42,7 @@ public class MyRecordFragment extends BaseFragment&lt;MyRecordView, MyRecordPresent
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentMyRecordBinding) baseBinding;
+        binding = (FragmentMyRecordBinding) getBaseBinding();
     }
     @Override
@@ -33,7 +33,7 @@ public class OnGoingFragment extends BaseFragment&lt;OnGoingFragmentView, OnGoingFr
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding= (FragmentRunRaceDetailBinding) baseBinding;
+        binding= (FragmentRunRaceDetailBinding) getBaseBinding();
     }
     @Override
@@ -38,7 +38,7 @@ public class RaceRecorFragment extends BaseFragment&lt;RaceRecorView, RaceRecorPres
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentRaceRecorBinding) baseBinding;
+        binding = (FragmentRaceRecorBinding) getBaseBinding();
     }
     @Override
@@ -58,7 +58,7 @@ public class RegistrationInfoFragment extends BaseFragment&lt;RegistrationInfoView,
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentRegistrationInfoBinding) baseBinding;
+        binding = (FragmentRegistrationInfoBinding) getBaseBinding();
     }
     @Override
@@ -33,7 +33,7 @@ public class RunLineFragment extends BaseFragment&lt;RunLineView, RunLinePresenter&gt;
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentRunLineBinding) baseBinding;
+        binding = (FragmentRunLineBinding) getBaseBinding();
     }
     @Override
@@ -54,7 +54,7 @@ public class RunMainFragment extends BaseFragment&lt;RunMainFragmentView, BasePrese
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding= (FragmentRunMainBinding) baseBinding;
+        binding= (FragmentRunMainBinding) getBaseBinding();
     }
     @Override
@@ -46,7 +46,7 @@ public class RunRaceDetailFragment extends BaseFragment&lt;RunRaceDetailFragmentVie
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentRunRaceDetailBinding) baseBinding;
+        binding = (FragmentRunRaceDetailBinding) getBaseBinding();
     }
     @Override
@@ -36,7 +36,7 @@ public class RunningFinishFragment extends BaseFragment&lt;RunningFinishFragmentVie
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentFinishRunMapBinding) baseBinding;
+        binding = (FragmentFinishRunMapBinding) getBaseBinding();
     }
     @Override
@@ -48,7 +48,7 @@ public class RunningMapFragment extends BaseFragment&lt;RunningMapFragmentView, Run
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentRunningMapBinding) baseBinding;
+        binding = (FragmentRunningMapBinding) getBaseBinding();
     }
     @Override
@@ -50,7 +50,7 @@ public class SelfRecordFragment extends BaseFragment&lt;SelfRecordView, SelfRecordP
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding= (FragmentSelfRecordBinding) baseBinding;
+        binding= (FragmentSelfRecordBinding) getBaseBinding();
     }
     @Override
@@ -29,7 +29,7 @@ public class TakePartFragment extends BaseFragment&lt;TakePartView, TakePartPresent
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentTakePartBinding) baseBinding;
+        binding = (FragmentTakePartBinding) getBaseBinding();
     }
     @Override
@@ -29,7 +29,7 @@ public class UploadFailDetailFragment extends BaseFragment&lt;UploadFailDetailFragm
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentFinishRunMapBinding) baseBinding;
+        binding = (FragmentFinishRunMapBinding) getBaseBinding();
     }
     public static UploadFailDetailFragment newInstance(FailedEntity failedEntity) {
@@ -83,7 +83,7 @@ dependencies {
     implementation 'com.githang:status-bar-compat:0.7'
     /*微信*/
-    implementation 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:+'
+//    implementation 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:+'
     /*自定义各种形状的imageview  */
     implementation 'com.github.siyamed:android-shape-imageview:0.9.+@aar'
@@ -103,10 +103,10 @@ dependencies {
     implementation files('libs/SecurityEnvSDK-release-1.1.0.jar')
     implementation files('libs/umeng-common-1.5.3.jar')
     implementation files('libs/umeng-share-core-6.9.2.jar')
-    implementation files('libs/umeng-share-QQ-simplify-6.9.2.jar')
-    implementation files('libs/umeng-share-sina-simplify-6.9.2.jar')
-    implementation files('libs/umeng-share-wechat-simplify-6.9.2.jar')
-    implementation files('libs/umeng-share-sina-simplify-6.9.2.jar')
+//    implementation files('libs/umeng-share-QQ-simplify-6.9.2.jar')
+//    implementation files('libs/umeng-share-sina-simplify-6.9.2.jar')
+//    implementation files('libs/umeng-share-wechat-simplify-6.9.2.jar')
+//    implementation files('libs/umeng-share-sina-simplify-6.9.2.jar')
     implementation files('libs/umeng-shareboard-widget-6.9.2.jar')
     implementation files('libs/umeng-sharetool-6.9.2.jar')
     implementation files('libs/UPPayAssistEx.jar')
@@ -25,7 +25,7 @@ public class BlueToothHelpActivity extends BaseActivity {
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding= (ActivityBlueToothHelpBinding) baseBinding;
+        binding= (ActivityBlueToothHelpBinding) getBaseBinding();
     }
     @Override
@@ -26,7 +26,7 @@ public class BlueToothStep1Activity extends BaseActivity {
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding= (ActivityBlueToothStep1Binding) baseBinding;
+        binding= (ActivityBlueToothStep1Binding) getBaseBinding();
     }
     @Override
@@ -39,7 +39,7 @@ public class BlueToothStep2Activity extends BaseActivity {
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (ActivityBlueToothStep2Binding) baseBinding;
+        binding = (ActivityBlueToothStep2Binding) getBaseBinding();
     }
     @Override
@@ -40,7 +40,7 @@ public class ConnBluetoothSuccessActivity extends BaseActivity {
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding= (ActivityConnBluetoothSuccessBinding) baseBinding;
+        binding= (ActivityConnBluetoothSuccessBinding) getBaseBinding();
     }
@@ -24,7 +24,7 @@ public class ConnFailActivity extends BaseActivity {
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding= (ActivityConnFailBinding) baseBinding;
+        binding= (ActivityConnFailBinding) getBaseBinding();
     }
     @Override
@@ -27,7 +27,7 @@ public class DeviceInfoActivity extends BaseActivity {
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding= (ActivityDeviceInfoBinding) baseBinding;
+        binding= (ActivityDeviceInfoBinding) getBaseBinding();
     }
     @Override
@@ -25,7 +25,7 @@ public class DeviceInstructionActivity extends BaseActivity {
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding= (ActivityDeviceInstructionBinding) baseBinding;
+        binding= (ActivityDeviceInstructionBinding) getBaseBinding();
     }
     @Override
@@ -36,7 +36,7 @@ public class RemoteControlActivity extends BaseActivity {
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding= (ActivityRemoteControlBinding) baseBinding;
+        binding= (ActivityRemoteControlBinding) getBaseBinding();
     }
     @Override
@@ -35,7 +35,7 @@ public class AllDeviceFragment extends BaseFragment&lt;AllDeviceFragmentView, AllDe
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentAllDeviceBinding) baseBinding;
+        binding = (FragmentAllDeviceBinding) getBaseBinding();
     }
     @Override
@@ -25,7 +25,7 @@ public class ChangeDeviceNameFragment extends BaseFragment&lt;ChangeDeviceNameView,
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding= (FragmentChangeDeviceNameBinding) baseBinding;
+        binding= (FragmentChangeDeviceNameBinding) getBaseBinding();
     }
     @Override
@@ -28,7 +28,7 @@ public class DeviceDetailFragment extends BaseFragment&lt;DeviceDetailView, BasePre
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentDeviceDetailBinding) baseBinding;
+        binding = (FragmentDeviceDetailBinding) getBaseBinding();
     }
     public static DeviceDetailFragment newInstance(FamilyListBean.UsersBeanX.DeviceListBean allDeviceInfo, FamilyListBean.UsersBeanX currentUser) {
@@ -36,7 +36,7 @@ public FragmentDeviceManagerBinding binding;
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding= (FragmentDeviceManagerBinding) baseBinding;
+        binding= (FragmentDeviceManagerBinding) getBaseBinding();
     }
     public static DeviceManagerFragment newInstance(FamilyListBean.UsersBeanX currentUser, FamilyListBean.UsersBeanX.DeviceListBean currentDeviceInfo) {
@@ -38,7 +38,7 @@ public class SearchDevicefragment extends BaseFragment&lt;SearchDevicefragmentView,
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentSearchDeviceBinding) baseBinding;
+        binding = (FragmentSearchDeviceBinding) getBaseBinding();
     }
     @Override
@@ -38,7 +38,7 @@ public class SelectIMFriendFragment extends BaseFragment&lt;SelectIMFriendView, Sel
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentSelectImFriendBinding) baseBinding;
+        binding = (FragmentSelectImFriendBinding) getBaseBinding();
     }
     @Override
@@ -44,7 +44,7 @@ public class SelectWifiFragment extends BaseFragment&lt;SelectWifiFragmentView, Sel
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentSelectWifiBinding) baseBinding;
+        binding = (FragmentSelectWifiBinding) getBaseBinding();
     }
     @Override
@@ -42,7 +42,7 @@ public class SetFriendsRoleFragment extends BaseFragment&lt;SetFriendsRoleView, Set
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding = (FragmentSetFriendRoleBinding) baseBinding;
+        binding = (FragmentSetFriendRoleBinding) getBaseBinding();
     }
     @Override
@@ -43,7 +43,7 @@ public class UserManagerFragment extends BaseFragment&lt;UserManagerView, UserManag
     @Override
     protected void initBindingData() {
         super.initBindingData();
-        binding= (FragmentUserManagerBinding) baseBinding;
+        binding= (FragmentUserManagerBinding) getBaseBinding();
     }
     @Override
@@ -2,6 +2,6 @@ include &#39;:app:strike&#39;
 //基础库
 include ':core:base',':core:network',':core:imageload' ,':core:app_qr'
 include ':cloud:user',':cloud:pay',':cloud:share'
-include ':module:xiaojiasoundbox',':module:pedometer'
+include ':module:xiaojiasoundbox',':module:pedometer',':module:shanghaishop'
 include ':library_baidumap'
 rootProject.name='ModuleStrike'