Commit 826d41d70c69fc8f57982173d690c85e322af420
1 parent
c3a2c149
1 优化基类
Showing
38 changed files
with
213 additions
and
144 deletions
app/strike/src/main/java/com/cnlive/strike/demo/activity/DemoActivity.java
| @@ -31,8 +31,8 @@ public class DemoActivity extends BaseActivity { | @@ -31,8 +31,8 @@ public class DemoActivity extends BaseActivity { | ||
| 31 | // } | 31 | // } |
| 32 | 32 | ||
| 33 | // @Override | 33 | // @Override |
| 34 | -// protected void initBindingData() { | ||
| 35 | -// super.initBindingData(); | 34 | +// protected void initBindingLayoutData() { |
| 35 | +// super.initBindingLayoutData(); | ||
| 36 | //// binding=(你的bingding)baseBinding; | 36 | //// binding=(你的bingding)baseBinding; |
| 37 | // } | 37 | // } |
| 38 | 38 | ||
| @@ -44,9 +44,6 @@ public class DemoActivity extends BaseActivity { | @@ -44,9 +44,6 @@ public class DemoActivity extends BaseActivity { | ||
| 44 | super.initParam(); | 44 | super.initParam(); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | - /** | ||
| 48 | - * 初始化视图 | ||
| 49 | - */ | ||
| 50 | @Override | 47 | @Override |
| 51 | protected void initView() { | 48 | protected void initView() { |
| 52 | //是指是否可以侧滑返回,默认禁用d | 49 | //是指是否可以侧滑返回,默认禁用d |
| @@ -68,7 +65,6 @@ public class DemoActivity extends BaseActivity { | @@ -68,7 +65,6 @@ public class DemoActivity extends BaseActivity { | ||
| 68 | dp2px(10); | 65 | dp2px(10); |
| 69 | //px2dp | 66 | //px2dp |
| 70 | px2dp(10); | 67 | px2dp(10); |
| 71 | - | ||
| 72 | } | 68 | } |
| 73 | 69 | ||
| 74 | /** | 70 | /** |
cloud/user/src/main/java/com/cnlive/strike/user/ui/fragment/FirstLoginFragment.java
| @@ -11,6 +11,8 @@ import android.text.TextUtils; | @@ -11,6 +11,8 @@ import android.text.TextUtils; | ||
| 11 | import android.text.TextWatcher; | 11 | import android.text.TextWatcher; |
| 12 | import android.view.View; | 12 | import android.view.View; |
| 13 | 13 | ||
| 14 | +import androidx.databinding.ViewDataBinding; | ||
| 15 | + | ||
| 14 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 16 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 15 | import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener; | 17 | import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener; |
| 16 | import com.cnlive.core.libs.base.util.AlertUtil; | 18 | import com.cnlive.core.libs.base.util.AlertUtil; |
| @@ -69,9 +71,9 @@ public class FirstLoginFragment extends BaseFragment<FirstLoginView, FirstLoginP | @@ -69,9 +71,9 @@ public class FirstLoginFragment extends BaseFragment<FirstLoginView, FirstLoginP | ||
| 69 | } | 71 | } |
| 70 | 72 | ||
| 71 | @Override | 73 | @Override |
| 72 | - protected void initBindingData() { | ||
| 73 | - super.initBindingData(); | ||
| 74 | - binding = (FragmentFirstLoginBinding) getBaseBinding(); | 74 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 75 | + super.initBindingLayoutData(baseBinding); | ||
| 76 | + binding = (FragmentFirstLoginBinding) baseBinding; | ||
| 75 | if (null == data) { | 77 | if (null == data) { |
| 76 | data = new FirstLoginData(); | 78 | data = new FirstLoginData(); |
| 77 | } | 79 | } |
cloud/user/src/main/java/com/cnlive/strike/user/ui/fragment/QuickLoginFragment.java
| @@ -7,6 +7,7 @@ import android.os.Bundle; | @@ -7,6 +7,7 @@ import android.os.Bundle; | ||
| 7 | import android.text.TextUtils; | 7 | import android.text.TextUtils; |
| 8 | 8 | ||
| 9 | import androidx.annotation.NonNull; | 9 | import androidx.annotation.NonNull; |
| 10 | +import androidx.databinding.ViewDataBinding; | ||
| 10 | 11 | ||
| 11 | import com.cnlive.core.libs.base.application.AppConfig; | 12 | import com.cnlive.core.libs.base.application.AppConfig; |
| 12 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 13 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| @@ -92,9 +93,9 @@ public class QuickLoginFragment extends BaseFragment<QuickLoginView, QuickLoginP | @@ -92,9 +93,9 @@ public class QuickLoginFragment extends BaseFragment<QuickLoginView, QuickLoginP | ||
| 92 | } | 93 | } |
| 93 | 94 | ||
| 94 | @Override | 95 | @Override |
| 95 | - protected void initBindingData() { | ||
| 96 | - super.initBindingData(); | ||
| 97 | - binding = (FragmentQuickLoginBinding) getBaseBinding(); | 96 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 97 | + super.initBindingLayoutData(baseBinding); | ||
| 98 | + binding = (FragmentQuickLoginBinding) baseBinding; | ||
| 98 | data = new QuickLoginData(); | 99 | data = new QuickLoginData(); |
| 99 | binding.setData(data); | 100 | binding.setData(data); |
| 100 | } | 101 | } |
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/ui/fragment/QrPayFragment.java
| @@ -4,6 +4,7 @@ import android.app.Dialog; | @@ -4,6 +4,7 @@ import android.app.Dialog; | ||
| 4 | import android.os.Bundle; | 4 | import android.os.Bundle; |
| 5 | 5 | ||
| 6 | import androidx.annotation.Nullable; | 6 | import androidx.annotation.Nullable; |
| 7 | +import androidx.databinding.ViewDataBinding; | ||
| 7 | 8 | ||
| 8 | import android.text.InputFilter; | 9 | import android.text.InputFilter; |
| 9 | import android.text.TextUtils; | 10 | import android.text.TextUtils; |
| @@ -52,8 +53,9 @@ public class QrPayFragment extends BaseFragment<QrPayView, QrPayPresenter> imple | @@ -52,8 +53,9 @@ public class QrPayFragment extends BaseFragment<QrPayView, QrPayPresenter> imple | ||
| 52 | } | 53 | } |
| 53 | 54 | ||
| 54 | @Override | 55 | @Override |
| 55 | - protected void initBindingData() { | ||
| 56 | - binding = (FragmentQrPayBinding) getBaseBinding(); | 56 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 57 | + super.initBindingLayoutData(baseBinding); | ||
| 58 | + binding = (FragmentQrPayBinding) baseBinding; | ||
| 57 | } | 59 | } |
| 58 | 60 | ||
| 59 | @Override | 61 | @Override |
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/ui/fragment/QrSignInFragment.java
| @@ -2,6 +2,7 @@ package com.cnlive.strike.moudle.qr.ui.fragment; | @@ -2,6 +2,7 @@ package com.cnlive.strike.moudle.qr.ui.fragment; | ||
| 2 | 2 | ||
| 3 | import android.os.Bundle; | 3 | import android.os.Bundle; |
| 4 | import androidx.annotation.Nullable; | 4 | import androidx.annotation.Nullable; |
| 5 | +import androidx.databinding.ViewDataBinding; | ||
| 5 | import androidx.fragment.app.Fragment; | 6 | import androidx.fragment.app.Fragment; |
| 6 | 7 | ||
| 7 | import android.text.TextUtils; | 8 | import android.text.TextUtils; |
| @@ -42,8 +43,9 @@ public class QrSignInFragment extends BaseFragment<QrSignInView, QrSignInPresent | @@ -42,8 +43,9 @@ public class QrSignInFragment extends BaseFragment<QrSignInView, QrSignInPresent | ||
| 42 | } | 43 | } |
| 43 | 44 | ||
| 44 | @Override | 45 | @Override |
| 45 | - protected void initBindingData() { | ||
| 46 | - binding = (FragmentQrSigninBinding) getBaseBinding(); | 46 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 47 | + super.initBindingLayoutData(baseBinding); | ||
| 48 | + binding = (FragmentQrSigninBinding) baseBinding; | ||
| 47 | } | 49 | } |
| 48 | 50 | ||
| 49 | @Override | 51 | @Override |
core/base/src/main/java/com/cnlive/core/libs/base/frame/fragment/BaseFragment.java
| @@ -68,11 +68,11 @@ public abstract class BaseFragment<V extends BaseView, P extends BasePresenter<V | @@ -68,11 +68,11 @@ public abstract class BaseFragment<V extends BaseView, P extends BasePresenter<V | ||
| 68 | private Bundle savedInstanceState; | 68 | private Bundle savedInstanceState; |
| 69 | private boolean isCreateDefultEmptyView = true;//默认显示空视图 | 69 | private boolean isCreateDefultEmptyView = true;//默认显示空视图 |
| 70 | 70 | ||
| 71 | - public ViewDataBinding getBaseBinding() { | 71 | + public final ViewDataBinding getBaseBinding() { |
| 72 | return baseBinding; | 72 | return baseBinding; |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | - public View getBaseView() { | 75 | + public final View getBaseView() { |
| 76 | return baseView; | 76 | return baseView; |
| 77 | } | 77 | } |
| 78 | 78 | ||
| @@ -155,7 +155,12 @@ public abstract class BaseFragment<V extends BaseView, P extends BasePresenter<V | @@ -155,7 +155,12 @@ public abstract class BaseFragment<V extends BaseView, P extends BasePresenter<V | ||
| 155 | super.onViewCreated(view, savedInstanceState); | 155 | super.onViewCreated(view, savedInstanceState); |
| 156 | mSwipeDelegate.onViewCreated(view, savedInstanceState); | 156 | mSwipeDelegate.onViewCreated(view, savedInstanceState); |
| 157 | if (null != getMvpView() && null != getPresenter()) { | 157 | if (null != getMvpView() && null != getPresenter()) { |
| 158 | - initBindingData(); | 158 | + if (null != baseBinding) { |
| 159 | + initBindingLayoutData(baseBinding); | ||
| 160 | + } | ||
| 161 | + if (null != baseView) { | ||
| 162 | + initViewLayoutData(baseView); | ||
| 163 | + } | ||
| 159 | initView(); | 164 | initView(); |
| 160 | initData(); | 165 | initData(); |
| 161 | } | 166 | } |
| @@ -293,7 +298,13 @@ public abstract class BaseFragment<V extends BaseView, P extends BasePresenter<V | @@ -293,7 +298,13 @@ public abstract class BaseFragment<V extends BaseView, P extends BasePresenter<V | ||
| 293 | /** | 298 | /** |
| 294 | * 初始化databinding数据 | 299 | * 初始化databinding数据 |
| 295 | */ | 300 | */ |
| 296 | - protected void initBindingData() { | 301 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 302 | + } | ||
| 303 | + | ||
| 304 | + /** | ||
| 305 | + * 初始化dView数据 | ||
| 306 | + */ | ||
| 307 | + protected void initViewLayoutData(View baseView) { | ||
| 297 | } | 308 | } |
| 298 | 309 | ||
| 299 | /** | 310 | /** |
core/imageload/src/main/java/com/cnlive/core/imageload/preview/PreviewImgFragment.java
| @@ -12,6 +12,7 @@ import com.cnlive.core.imageload.preview.view.PreviewImgView; | @@ -12,6 +12,7 @@ import com.cnlive.core.imageload.preview.view.PreviewImgView; | ||
| 12 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 12 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 13 | 13 | ||
| 14 | import androidx.annotation.Nullable; | 14 | import androidx.annotation.Nullable; |
| 15 | +import androidx.databinding.ViewDataBinding; | ||
| 15 | 16 | ||
| 16 | 17 | ||
| 17 | /** | 18 | /** |
| @@ -40,10 +41,11 @@ public class PreviewImgFragment extends BaseFragment<PreviewImgView, PreviewImgP | @@ -40,10 +41,11 @@ public class PreviewImgFragment extends BaseFragment<PreviewImgView, PreviewImgP | ||
| 40 | } | 41 | } |
| 41 | 42 | ||
| 42 | @Override | 43 | @Override |
| 43 | - protected void initBindingData() { | ||
| 44 | - binding = (FragmentPreviewImgBinding) getBaseBinding(); | ||
| 45 | - } | 44 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 45 | + super.initBindingLayoutData(baseBinding); | ||
| 46 | + binding = (FragmentPreviewImgBinding) baseBinding; | ||
| 46 | 47 | ||
| 48 | + } | ||
| 47 | 49 | ||
| 48 | @Override | 50 | @Override |
| 49 | protected void initParams() { | 51 | protected void initParams() { |
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunMainFragment.java
| @@ -2,6 +2,8 @@ package com.cnlive.moudle.collectionTrace.ui.fragment; | @@ -2,6 +2,8 @@ package com.cnlive.moudle.collectionTrace.ui.fragment; | ||
| 2 | 2 | ||
| 3 | import android.os.Bundle; | 3 | import android.os.Bundle; |
| 4 | 4 | ||
| 5 | +import androidx.databinding.ViewDataBinding; | ||
| 6 | + | ||
| 5 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 7 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 6 | import com.cnlive.core.libs.base.frame.presenter.BasePresenter; | 8 | import com.cnlive.core.libs.base.frame.presenter.BasePresenter; |
| 7 | import com.cnlive.moudle.collectionTrace.frame.view.CollRunMainFragmentView; | 9 | import com.cnlive.moudle.collectionTrace.frame.view.CollRunMainFragmentView; |
| @@ -36,9 +38,10 @@ public class CollRunMainFragment extends BaseFragment<CollRunMainFragmentView, B | @@ -36,9 +38,10 @@ public class CollRunMainFragment extends BaseFragment<CollRunMainFragmentView, B | ||
| 36 | } | 38 | } |
| 37 | 39 | ||
| 38 | @Override | 40 | @Override |
| 39 | - protected void initBindingData() { | ||
| 40 | - super.initBindingData(); | ||
| 41 | - binding = (FragmentCollRunMainBinding) getBaseBinding(); | 41 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 42 | + super.initBindingLayoutData(baseBinding); | ||
| 43 | + binding = (FragmentCollRunMainBinding) baseBinding; | ||
| 44 | + | ||
| 42 | } | 45 | } |
| 43 | 46 | ||
| 44 | @Override | 47 | @Override |
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunRaceDetailFragment.java
| @@ -2,10 +2,11 @@ package com.cnlive.moudle.collectionTrace.ui.fragment; | @@ -2,10 +2,11 @@ package com.cnlive.moudle.collectionTrace.ui.fragment; | ||
| 2 | 2 | ||
| 3 | import android.hardware.Sensor; | 3 | import android.hardware.Sensor; |
| 4 | import android.hardware.SensorManager; | 4 | import android.hardware.SensorManager; |
| 5 | -import android.os.Bundle; | ||
| 6 | import android.view.View; | 5 | import android.view.View; |
| 7 | import android.widget.Button; | 6 | import android.widget.Button; |
| 8 | 7 | ||
| 8 | +import androidx.databinding.ViewDataBinding; | ||
| 9 | + | ||
| 9 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 10 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 10 | import com.cnlive.core.libs.base.util.QMUITipDialogUtil; | 11 | import com.cnlive.core.libs.base.util.QMUITipDialogUtil; |
| 11 | import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo; | 12 | import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo; |
| @@ -17,7 +18,6 @@ import com.cnlive.moudle.pedometer.model.Constant; | @@ -17,7 +18,6 @@ import com.cnlive.moudle.pedometer.model.Constant; | ||
| 17 | import com.cnlive.moudle.pedometer.model.MessageEvent; | 18 | import com.cnlive.moudle.pedometer.model.MessageEvent; |
| 18 | import com.example.moudle_pedometer.R; | 19 | import com.example.moudle_pedometer.R; |
| 19 | import com.example.moudle_pedometer.databinding.FragmentCollectRunRaceDetailBinding; | 20 | import com.example.moudle_pedometer.databinding.FragmentCollectRunRaceDetailBinding; |
| 20 | -import com.qmuiteam.qmui.widget.QMUITopBar; | ||
| 21 | 21 | ||
| 22 | import org.greenrobot.eventbus.EventBus; | 22 | import org.greenrobot.eventbus.EventBus; |
| 23 | import org.greenrobot.eventbus.Subscribe; | 23 | import org.greenrobot.eventbus.Subscribe; |
| @@ -40,11 +40,11 @@ public class CollRunRaceDetailFragment extends BaseFragment<CollRunRaceDetailFra | @@ -40,11 +40,11 @@ public class CollRunRaceDetailFragment extends BaseFragment<CollRunRaceDetailFra | ||
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | @Override | 42 | @Override |
| 43 | - protected void initBindingData() { | ||
| 44 | - super.initBindingData(); | ||
| 45 | - binding = (FragmentCollectRunRaceDetailBinding) getBaseBinding(); | ||
| 46 | - } | 43 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 44 | + super.initBindingLayoutData(baseBinding); | ||
| 45 | + binding = (FragmentCollectRunRaceDetailBinding) baseBinding; | ||
| 47 | 46 | ||
| 47 | + } | ||
| 48 | 48 | ||
| 49 | public void onSetupToolBar() { | 49 | public void onSetupToolBar() { |
| 50 | binding.topbar.setTitle("赛事名称"); | 50 | binding.topbar.setTitle("赛事名称"); |
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunningFinishFragment.java
| 1 | package com.cnlive.moudle.collectionTrace.ui.fragment; | 1 | package com.cnlive.moudle.collectionTrace.ui.fragment; |
| 2 | 2 | ||
| 3 | +import androidx.databinding.ViewDataBinding; | ||
| 4 | + | ||
| 3 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 5 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 4 | import com.cnlive.moudle.collectionTrace.frame.presenter.CollRunningFinishFragmetPresenter; | 6 | import com.cnlive.moudle.collectionTrace.frame.presenter.CollRunningFinishFragmetPresenter; |
| 5 | import com.cnlive.moudle.collectionTrace.frame.view.CollRunningFinishFragmentView; | 7 | import com.cnlive.moudle.collectionTrace.frame.view.CollRunningFinishFragmentView; |
| @@ -31,9 +33,10 @@ public class CollRunningFinishFragment extends BaseFragment<CollRunningFinishFra | @@ -31,9 +33,10 @@ public class CollRunningFinishFragment extends BaseFragment<CollRunningFinishFra | ||
| 31 | } | 33 | } |
| 32 | 34 | ||
| 33 | @Override | 35 | @Override |
| 34 | - protected void initBindingData() { | ||
| 35 | - super.initBindingData(); | ||
| 36 | - binding = (FragmentCollFinishRunMapBinding) getBaseBinding(); | 36 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 37 | + super.initBindingLayoutData(baseBinding); | ||
| 38 | + binding = (FragmentCollFinishRunMapBinding) baseBinding; | ||
| 39 | + | ||
| 37 | } | 40 | } |
| 38 | 41 | ||
| 39 | @Override | 42 | @Override |
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunningMapFragment.java
| @@ -6,6 +6,8 @@ import android.hardware.SensorManager; | @@ -6,6 +6,8 @@ import android.hardware.SensorManager; | ||
| 6 | import android.os.Bundle; | 6 | import android.os.Bundle; |
| 7 | import android.os.Vibrator; | 7 | import android.os.Vibrator; |
| 8 | 8 | ||
| 9 | +import androidx.databinding.ViewDataBinding; | ||
| 10 | + | ||
| 9 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 11 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 10 | import com.cnlive.core.libs.base.ui.widget.TipDialog; | 12 | import com.cnlive.core.libs.base.ui.widget.TipDialog; |
| 11 | import com.cnlive.moudle.collectionTrace.frame.presenter.CollRunningMapFragmentPresenter; | 13 | import com.cnlive.moudle.collectionTrace.frame.presenter.CollRunningMapFragmentPresenter; |
| @@ -43,11 +45,11 @@ public class CollRunningMapFragment extends BaseFragment<CollRunningMapFragmentV | @@ -43,11 +45,11 @@ public class CollRunningMapFragment extends BaseFragment<CollRunningMapFragmentV | ||
| 43 | } | 45 | } |
| 44 | 46 | ||
| 45 | @Override | 47 | @Override |
| 46 | - protected void initBindingData() { | ||
| 47 | - super.initBindingData(); | ||
| 48 | - binding = (FragmentCollectRunningMapBinding) getBaseBinding(); | ||
| 49 | - } | 48 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 49 | + super.initBindingLayoutData(baseBinding); | ||
| 50 | + binding = (FragmentCollectRunningMapBinding) baseBinding; | ||
| 50 | 51 | ||
| 52 | + } | ||
| 51 | 53 | ||
| 52 | public static CollRunningMapFragment getInstance(RunRaceDetailInfo runRaceDetailInfo) { | 54 | public static CollRunningMapFragment getInstance(RunRaceDetailInfo runRaceDetailInfo) { |
| 53 | CollRunningMapFragment fragment = new CollRunningMapFragment(); | 55 | CollRunningMapFragment fragment = new CollRunningMapFragment(); |
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollTraceListDetailFragment.java
| @@ -2,6 +2,8 @@ package com.cnlive.moudle.collectionTrace.ui.fragment; | @@ -2,6 +2,8 @@ package com.cnlive.moudle.collectionTrace.ui.fragment; | ||
| 2 | 2 | ||
| 3 | import android.os.Bundle; | 3 | import android.os.Bundle; |
| 4 | 4 | ||
| 5 | +import androidx.databinding.ViewDataBinding; | ||
| 6 | + | ||
| 5 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 7 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 6 | import com.cnlive.moudle.collectionTrace.frame.presenter.CollTraceListDetailFragmentPresenter; | 8 | import com.cnlive.moudle.collectionTrace.frame.presenter.CollTraceListDetailFragmentPresenter; |
| 7 | import com.cnlive.moudle.collectionTrace.frame.view.CollTraceListDetailFragmentView; | 9 | import com.cnlive.moudle.collectionTrace.frame.view.CollTraceListDetailFragmentView; |
| @@ -34,9 +36,10 @@ public class CollTraceListDetailFragment extends BaseFragment<CollTraceListDetai | @@ -34,9 +36,10 @@ public class CollTraceListDetailFragment extends BaseFragment<CollTraceListDetai | ||
| 34 | } | 36 | } |
| 35 | 37 | ||
| 36 | @Override | 38 | @Override |
| 37 | - protected void initBindingData() { | ||
| 38 | - super.initBindingData(); | ||
| 39 | - binding = (FragmentCollRaceDetailBinding) getBaseBinding(); | 39 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 40 | + super.initBindingLayoutData(baseBinding); | ||
| 41 | + binding = (FragmentCollRaceDetailBinding) baseBinding; | ||
| 42 | + | ||
| 40 | } | 43 | } |
| 41 | 44 | ||
| 42 | @Override | 45 | @Override |
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/RaceListFragment.java
| 1 | package com.cnlive.moudle.collectionTrace.ui.fragment; | 1 | package com.cnlive.moudle.collectionTrace.ui.fragment; |
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | -import android.os.Bundle; | ||
| 5 | -import android.view.View; | 4 | +import androidx.databinding.ViewDataBinding; |
| 6 | 5 | ||
| 7 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 6 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 8 | import com.cnlive.moudle.collectionTrace.frame.presenter.RaceListPresenter; | 7 | import com.cnlive.moudle.collectionTrace.frame.presenter.RaceListPresenter; |
| @@ -32,9 +31,10 @@ public class RaceListFragment extends BaseFragment<RaceListView, RaceListPresent | @@ -32,9 +31,10 @@ public class RaceListFragment extends BaseFragment<RaceListView, RaceListPresent | ||
| 32 | } | 31 | } |
| 33 | 32 | ||
| 34 | @Override | 33 | @Override |
| 35 | - protected void initBindingData() { | ||
| 36 | - super.initBindingData(); | ||
| 37 | - binding = (FragmentRaceListBinding) getBaseBinding(); | 34 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 35 | + super.initBindingLayoutData(baseBinding); | ||
| 36 | + binding = (FragmentRaceListBinding) baseBinding; | ||
| 37 | + | ||
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | @Override | 40 | @Override |
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/RaceNameListFragment.java
| @@ -2,7 +2,8 @@ package com.cnlive.moudle.collectionTrace.ui.fragment; | @@ -2,7 +2,8 @@ package com.cnlive.moudle.collectionTrace.ui.fragment; | ||
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | import android.os.Bundle; | 4 | import android.os.Bundle; |
| 5 | -import android.view.View; | 5 | + |
| 6 | +import androidx.databinding.ViewDataBinding; | ||
| 6 | 7 | ||
| 7 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 8 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 8 | import com.cnlive.moudle.collectionTrace.frame.presenter.RaceNameListPresenter; | 9 | import com.cnlive.moudle.collectionTrace.frame.presenter.RaceNameListPresenter; |
| @@ -45,9 +46,10 @@ public class RaceNameListFragment extends BaseFragment<RaceNameListView, RaceNam | @@ -45,9 +46,10 @@ public class RaceNameListFragment extends BaseFragment<RaceNameListView, RaceNam | ||
| 45 | } | 46 | } |
| 46 | 47 | ||
| 47 | @Override | 48 | @Override |
| 48 | - protected void initBindingData() { | ||
| 49 | - super.initBindingData(); | ||
| 50 | - binding = (FragmentRaceNameListBinding) getBaseBinding(); | 49 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 50 | + super.initBindingLayoutData(baseBinding); | ||
| 51 | + binding = (FragmentRaceNameListBinding)baseBinding; | ||
| 52 | + | ||
| 51 | } | 53 | } |
| 52 | 54 | ||
| 53 | @Override | 55 | @Override |
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/StartTraceFragment.java
| @@ -4,6 +4,8 @@ import android.hardware.Sensor; | @@ -4,6 +4,8 @@ import android.hardware.Sensor; | ||
| 4 | import android.hardware.SensorManager; | 4 | import android.hardware.SensorManager; |
| 5 | import android.os.Bundle; | 5 | import android.os.Bundle; |
| 6 | 6 | ||
| 7 | +import androidx.databinding.ViewDataBinding; | ||
| 8 | + | ||
| 7 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 9 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 8 | import com.cnlive.core.libs.base.frame.presenter.BasePresenter; | 10 | import com.cnlive.core.libs.base.frame.presenter.BasePresenter; |
| 9 | import com.cnlive.core.libs.base.util.QMUITipDialogUtil; | 11 | import com.cnlive.core.libs.base.util.QMUITipDialogUtil; |
| @@ -39,9 +41,10 @@ public class StartTraceFragment extends BaseFragment<StartTraceFragmentView, Bas | @@ -39,9 +41,10 @@ public class StartTraceFragment extends BaseFragment<StartTraceFragmentView, Bas | ||
| 39 | } | 41 | } |
| 40 | 42 | ||
| 41 | @Override | 43 | @Override |
| 42 | - protected void initBindingData() { | ||
| 43 | - super.initBindingData(); | ||
| 44 | - binding = (FragmentStartCollectTraceBinding) getBaseBinding(); | 44 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 45 | + super.initBindingLayoutData(baseBinding); | ||
| 46 | + binding = (FragmentStartCollectTraceBinding) baseBinding; | ||
| 47 | + | ||
| 45 | } | 48 | } |
| 46 | 49 | ||
| 47 | @Override | 50 | @Override |
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/ALLScoreDetailFragment.java
| @@ -2,6 +2,8 @@ package com.cnlive.moudle.pedometer.ui.fragment; | @@ -2,6 +2,8 @@ package com.cnlive.moudle.pedometer.ui.fragment; | ||
| 2 | 2 | ||
| 3 | import android.os.Bundle; | 3 | import android.os.Bundle; |
| 4 | 4 | ||
| 5 | +import androidx.databinding.ViewDataBinding; | ||
| 6 | + | ||
| 5 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 7 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 6 | import com.cnlive.moudle.pedometer.frame.presenter.ALLScoreDetailFragmentPresenter; | 8 | import com.cnlive.moudle.pedometer.frame.presenter.ALLScoreDetailFragmentPresenter; |
| 7 | import com.cnlive.moudle.pedometer.frame.view.ALLScoreDetailFragmentView; | 9 | import com.cnlive.moudle.pedometer.frame.view.ALLScoreDetailFragmentView; |
| @@ -24,9 +26,10 @@ public class ALLScoreDetailFragment extends BaseFragment<ALLScoreDetailFragmentV | @@ -24,9 +26,10 @@ public class ALLScoreDetailFragment extends BaseFragment<ALLScoreDetailFragmentV | ||
| 24 | } | 26 | } |
| 25 | 27 | ||
| 26 | @Override | 28 | @Override |
| 27 | - protected void initBindingData() { | ||
| 28 | - super.initBindingData(); | ||
| 29 | - binding = (FragmentFinishRunMapBinding) getBaseBinding(); | 29 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 30 | + super.initBindingLayoutData(baseBinding); | ||
| 31 | + binding = (FragmentFinishRunMapBinding) baseBinding; | ||
| 32 | + | ||
| 30 | } | 33 | } |
| 31 | 34 | ||
| 32 | @Override | 35 | @Override |
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/LineUpAgainFragment.java
| 1 | package com.cnlive.moudle.pedometer.ui.fragment; | 1 | package com.cnlive.moudle.pedometer.ui.fragment; |
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | -import android.Manifest; | ||
| 5 | -import android.os.Build; | ||
| 6 | import android.view.View; | 4 | import android.view.View; |
| 7 | 5 | ||
| 6 | +import androidx.databinding.ViewDataBinding; | ||
| 7 | + | ||
| 8 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 8 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 9 | -import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener; | ||
| 10 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; | 9 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; |
| 11 | import com.cnlive.moudle.pedometer.frame.presenter.LineUpAgainPresenter; | 10 | import com.cnlive.moudle.pedometer.frame.presenter.LineUpAgainPresenter; |
| 12 | import com.cnlive.moudle.pedometer.frame.view.LineUpAgainView; | 11 | import com.cnlive.moudle.pedometer.frame.view.LineUpAgainView; |
| @@ -29,9 +28,10 @@ public class LineUpAgainFragment extends BaseFragment<LineUpAgainView, LineUpAga | @@ -29,9 +28,10 @@ public class LineUpAgainFragment extends BaseFragment<LineUpAgainView, LineUpAga | ||
| 29 | } | 28 | } |
| 30 | 29 | ||
| 31 | @Override | 30 | @Override |
| 32 | - protected void initBindingData() { | ||
| 33 | - super.initBindingData(); | ||
| 34 | - binding = (FragmentLineUpAgainBinding) getBaseBinding(); | 31 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 32 | + super.initBindingLayoutData(baseBinding); | ||
| 33 | + binding = (FragmentLineUpAgainBinding) baseBinding; | ||
| 34 | + | ||
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | @Override | 37 | @Override |
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/MyRecordFragment.java
| @@ -2,9 +2,9 @@ package com.cnlive.moudle.pedometer.ui.fragment; | @@ -2,9 +2,9 @@ package com.cnlive.moudle.pedometer.ui.fragment; | ||
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | import android.os.Bundle; | 4 | import android.os.Bundle; |
| 5 | -import android.view.View; | ||
| 6 | 5 | ||
| 7 | import androidx.annotation.NonNull; | 6 | import androidx.annotation.NonNull; |
| 7 | +import androidx.databinding.ViewDataBinding; | ||
| 8 | 8 | ||
| 9 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 9 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 10 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; | 10 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; |
| @@ -40,9 +40,10 @@ public class MyRecordFragment extends BaseFragment<MyRecordView, MyRecordPresent | @@ -40,9 +40,10 @@ public class MyRecordFragment extends BaseFragment<MyRecordView, MyRecordPresent | ||
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | @Override | 42 | @Override |
| 43 | - protected void initBindingData() { | ||
| 44 | - super.initBindingData(); | ||
| 45 | - binding = (FragmentMyRecordBinding) getBaseBinding(); | 43 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 44 | + super.initBindingLayoutData(baseBinding); | ||
| 45 | + binding = (FragmentMyRecordBinding) baseBinding; | ||
| 46 | + | ||
| 46 | } | 47 | } |
| 47 | 48 | ||
| 48 | @Override | 49 | @Override |
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/OnGoingFragment.java
| @@ -3,6 +3,8 @@ package com.cnlive.moudle.pedometer.ui.fragment; | @@ -3,6 +3,8 @@ package com.cnlive.moudle.pedometer.ui.fragment; | ||
| 3 | import android.os.Bundle; | 3 | import android.os.Bundle; |
| 4 | import android.text.TextUtils; | 4 | import android.text.TextUtils; |
| 5 | 5 | ||
| 6 | +import androidx.databinding.ViewDataBinding; | ||
| 7 | + | ||
| 6 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 8 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 7 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; | 9 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; |
| 8 | import com.cnlive.moudle.pedometer.frame.presenter.OnGoingFragmentPresenter; | 10 | import com.cnlive.moudle.pedometer.frame.presenter.OnGoingFragmentPresenter; |
| @@ -28,11 +30,11 @@ public class OnGoingFragment extends BaseFragment<OnGoingFragmentView, OnGoingFr | @@ -28,11 +30,11 @@ public class OnGoingFragment extends BaseFragment<OnGoingFragmentView, OnGoingFr | ||
| 28 | } | 30 | } |
| 29 | 31 | ||
| 30 | @Override | 32 | @Override |
| 31 | - protected void initBindingData() { | ||
| 32 | - super.initBindingData(); | ||
| 33 | - binding= (FragmentRunRaceDetailBinding) getBaseBinding(); | ||
| 34 | - } | 33 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 34 | + super.initBindingLayoutData(baseBinding); | ||
| 35 | + binding= (FragmentRunRaceDetailBinding) baseBinding; | ||
| 35 | 36 | ||
| 37 | + } | ||
| 36 | 38 | ||
| 37 | @Override | 39 | @Override |
| 38 | protected void init(Bundle savedInstanceState) { | 40 | protected void init(Bundle savedInstanceState) { |
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RaceRecorFragment.java
| @@ -2,7 +2,8 @@ package com.cnlive.moudle.pedometer.ui.fragment; | @@ -2,7 +2,8 @@ package com.cnlive.moudle.pedometer.ui.fragment; | ||
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | import android.os.Bundle; | 4 | import android.os.Bundle; |
| 5 | -import android.view.View; | 5 | + |
| 6 | +import androidx.databinding.ViewDataBinding; | ||
| 6 | 7 | ||
| 7 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 8 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 8 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; | 9 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; |
| @@ -36,9 +37,10 @@ public class RaceRecorFragment extends BaseFragment<RaceRecorView, RaceRecorPres | @@ -36,9 +37,10 @@ public class RaceRecorFragment extends BaseFragment<RaceRecorView, RaceRecorPres | ||
| 36 | } | 37 | } |
| 37 | 38 | ||
| 38 | @Override | 39 | @Override |
| 39 | - protected void initBindingData() { | ||
| 40 | - super.initBindingData(); | ||
| 41 | - binding = (FragmentRaceRecorBinding) getBaseBinding(); | 40 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 41 | + super.initBindingLayoutData(baseBinding); | ||
| 42 | + binding = (FragmentRaceRecorBinding) baseBinding; | ||
| 43 | + | ||
| 42 | } | 44 | } |
| 43 | 45 | ||
| 44 | @Override | 46 | @Override |
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
| @@ -3,7 +3,8 @@ package com.cnlive.moudle.pedometer.ui.fragment; | @@ -3,7 +3,8 @@ package com.cnlive.moudle.pedometer.ui.fragment; | ||
| 3 | 3 | ||
| 4 | import android.os.Bundle; | 4 | import android.os.Bundle; |
| 5 | import android.text.TextUtils; | 5 | import android.text.TextUtils; |
| 6 | -import android.view.View; | 6 | + |
| 7 | +import androidx.databinding.ViewDataBinding; | ||
| 7 | 8 | ||
| 8 | import com.baidu.trace.LBSTraceClient; | 9 | import com.baidu.trace.LBSTraceClient; |
| 9 | import com.baidu.trace.api.fence.AddMonitoredPersonRequest; | 10 | import com.baidu.trace.api.fence.AddMonitoredPersonRequest; |
| @@ -56,9 +57,10 @@ public class RegistrationInfoFragment extends BaseFragment<RegistrationInfoView, | @@ -56,9 +57,10 @@ public class RegistrationInfoFragment extends BaseFragment<RegistrationInfoView, | ||
| 56 | } | 57 | } |
| 57 | 58 | ||
| 58 | @Override | 59 | @Override |
| 59 | - protected void initBindingData() { | ||
| 60 | - super.initBindingData(); | ||
| 61 | - binding = (FragmentRegistrationInfoBinding) getBaseBinding(); | 60 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 61 | + super.initBindingLayoutData(baseBinding); | ||
| 62 | + binding = (FragmentRegistrationInfoBinding)baseBinding; | ||
| 63 | + | ||
| 62 | } | 64 | } |
| 63 | 65 | ||
| 64 | @Override | 66 | @Override |
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunLineFragment.java
| 1 | package com.cnlive.moudle.pedometer.ui.fragment; | 1 | package com.cnlive.moudle.pedometer.ui.fragment; |
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | +import androidx.databinding.ViewDataBinding; | ||
| 5 | + | ||
| 4 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 6 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 5 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; | 7 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; |
| 6 | import com.cnlive.moudle.pedometer.frame.presenter.RunLinePresenter; | 8 | import com.cnlive.moudle.pedometer.frame.presenter.RunLinePresenter; |
| @@ -31,9 +33,9 @@ public class RunLineFragment extends BaseFragment<RunLineView, RunLinePresenter> | @@ -31,9 +33,9 @@ public class RunLineFragment extends BaseFragment<RunLineView, RunLinePresenter> | ||
| 31 | } | 33 | } |
| 32 | 34 | ||
| 33 | @Override | 35 | @Override |
| 34 | - protected void initBindingData() { | ||
| 35 | - super.initBindingData(); | ||
| 36 | - binding = (FragmentRunLineBinding) getBaseBinding(); | 36 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 37 | + super.initBindingLayoutData(baseBinding); | ||
| 38 | + binding = (FragmentRunLineBinding) baseBinding; | ||
| 37 | } | 39 | } |
| 38 | 40 | ||
| 39 | @Override | 41 | @Override |
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunMainFragment.java
| @@ -5,6 +5,8 @@ import android.os.Handler; | @@ -5,6 +5,8 @@ import android.os.Handler; | ||
| 5 | import android.os.Vibrator; | 5 | import android.os.Vibrator; |
| 6 | import android.text.TextUtils; | 6 | import android.text.TextUtils; |
| 7 | 7 | ||
| 8 | +import androidx.databinding.ViewDataBinding; | ||
| 9 | + | ||
| 8 | import com.baidu.mapapi.model.LatLng; | 10 | import com.baidu.mapapi.model.LatLng; |
| 9 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 11 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 10 | import com.cnlive.core.libs.base.frame.presenter.BasePresenter; | 12 | import com.cnlive.core.libs.base.frame.presenter.BasePresenter; |
| @@ -52,9 +54,10 @@ public class RunMainFragment extends BaseFragment<RunMainFragmentView, BasePrese | @@ -52,9 +54,10 @@ public class RunMainFragment extends BaseFragment<RunMainFragmentView, BasePrese | ||
| 52 | } | 54 | } |
| 53 | 55 | ||
| 54 | @Override | 56 | @Override |
| 55 | - protected void initBindingData() { | ||
| 56 | - super.initBindingData(); | ||
| 57 | - binding = (FragmentRunMainBinding) getBaseBinding(); | 57 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 58 | + super.initBindingLayoutData(baseBinding); | ||
| 59 | + binding = (FragmentRunMainBinding) baseBinding; | ||
| 60 | + | ||
| 58 | } | 61 | } |
| 59 | 62 | ||
| 60 | @Override | 63 | @Override |
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunRaceDetailFragment.java
| @@ -6,6 +6,8 @@ import android.os.Bundle; | @@ -6,6 +6,8 @@ import android.os.Bundle; | ||
| 6 | import android.text.TextUtils; | 6 | import android.text.TextUtils; |
| 7 | import android.util.Log; | 7 | import android.util.Log; |
| 8 | 8 | ||
| 9 | +import androidx.databinding.ViewDataBinding; | ||
| 10 | + | ||
| 9 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 11 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 10 | import com.cnlive.core.libs.base.util.QMUITipDialogUtil; | 12 | import com.cnlive.core.libs.base.util.QMUITipDialogUtil; |
| 11 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; | 13 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; |
| @@ -40,9 +42,10 @@ public class RunRaceDetailFragment extends BaseFragment<RunRaceDetailFragmentVie | @@ -40,9 +42,10 @@ public class RunRaceDetailFragment extends BaseFragment<RunRaceDetailFragmentVie | ||
| 40 | } | 42 | } |
| 41 | 43 | ||
| 42 | @Override | 44 | @Override |
| 43 | - protected void initBindingData() { | ||
| 44 | - super.initBindingData(); | ||
| 45 | - binding = (FragmentRunRaceDetailBinding) getBaseBinding(); | 45 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 46 | + super.initBindingLayoutData(baseBinding); | ||
| 47 | + binding = (FragmentRunRaceDetailBinding) baseBinding; | ||
| 48 | + | ||
| 46 | } | 49 | } |
| 47 | 50 | ||
| 48 | @Override | 51 | @Override |
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunningFinishFragment.java
| 1 | package com.cnlive.moudle.pedometer.ui.fragment; | 1 | package com.cnlive.moudle.pedometer.ui.fragment; |
| 2 | 2 | ||
| 3 | import android.os.Bundle; | 3 | import android.os.Bundle; |
| 4 | -import android.view.View; | 4 | + |
| 5 | +import androidx.databinding.ViewDataBinding; | ||
| 5 | 6 | ||
| 6 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 7 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 7 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; | 8 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; |
| @@ -34,9 +35,10 @@ public class RunningFinishFragment extends BaseFragment<RunningFinishFragmentVie | @@ -34,9 +35,10 @@ public class RunningFinishFragment extends BaseFragment<RunningFinishFragmentVie | ||
| 34 | } | 35 | } |
| 35 | 36 | ||
| 36 | @Override | 37 | @Override |
| 37 | - protected void initBindingData() { | ||
| 38 | - super.initBindingData(); | ||
| 39 | - binding = (FragmentFinishRunMapBinding) getBaseBinding(); | 38 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 39 | + super.initBindingLayoutData(baseBinding); | ||
| 40 | + binding = (FragmentFinishRunMapBinding)baseBinding; | ||
| 41 | + | ||
| 40 | } | 42 | } |
| 41 | 43 | ||
| 42 | @Override | 44 | @Override |
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunningMapFragment.java
| @@ -6,6 +6,8 @@ import android.hardware.SensorManager; | @@ -6,6 +6,8 @@ import android.hardware.SensorManager; | ||
| 6 | import android.os.Bundle; | 6 | import android.os.Bundle; |
| 7 | import android.os.Vibrator; | 7 | import android.os.Vibrator; |
| 8 | 8 | ||
| 9 | +import androidx.databinding.ViewDataBinding; | ||
| 10 | + | ||
| 9 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 11 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 10 | import com.cnlive.core.libs.base.ui.widget.TipDialog; | 12 | import com.cnlive.core.libs.base.ui.widget.TipDialog; |
| 11 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; | 13 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; |
| @@ -46,9 +48,10 @@ public class RunningMapFragment extends BaseFragment<RunningMapFragmentView, Run | @@ -46,9 +48,10 @@ public class RunningMapFragment extends BaseFragment<RunningMapFragmentView, Run | ||
| 46 | } | 48 | } |
| 47 | 49 | ||
| 48 | @Override | 50 | @Override |
| 49 | - protected void initBindingData() { | ||
| 50 | - super.initBindingData(); | ||
| 51 | - binding = (FragmentRunningMapBinding) getBaseBinding(); | 51 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 52 | + super.initBindingLayoutData(baseBinding); | ||
| 53 | + binding = (FragmentRunningMapBinding)baseBinding; | ||
| 54 | + | ||
| 52 | } | 55 | } |
| 53 | 56 | ||
| 54 | @Override | 57 | @Override |
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/SelfRecordFragment.java
| 1 | package com.cnlive.moudle.pedometer.ui.fragment; | 1 | package com.cnlive.moudle.pedometer.ui.fragment; |
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | -import android.content.Context; | ||
| 5 | -import android.os.Bundle; | ||
| 6 | -import android.view.View; | ||
| 7 | - | ||
| 8 | import androidx.annotation.NonNull; | 4 | import androidx.annotation.NonNull; |
| 9 | -import androidx.annotation.Nullable; | 5 | +import androidx.databinding.ViewDataBinding; |
| 10 | 6 | ||
| 11 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 7 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 12 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; | 8 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; |
| @@ -48,9 +44,10 @@ public class SelfRecordFragment extends BaseFragment<SelfRecordView, SelfRecordP | @@ -48,9 +44,10 @@ public class SelfRecordFragment extends BaseFragment<SelfRecordView, SelfRecordP | ||
| 48 | } | 44 | } |
| 49 | 45 | ||
| 50 | @Override | 46 | @Override |
| 51 | - protected void initBindingData() { | ||
| 52 | - super.initBindingData(); | ||
| 53 | - binding= (FragmentSelfRecordBinding) getBaseBinding(); | 47 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 48 | + super.initBindingLayoutData(baseBinding); | ||
| 49 | + binding= (FragmentSelfRecordBinding) baseBinding; | ||
| 50 | + | ||
| 54 | } | 51 | } |
| 55 | 52 | ||
| 56 | @Override | 53 | @Override |
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/TakePartFragment.java
| 1 | package com.cnlive.moudle.pedometer.ui.fragment; | 1 | package com.cnlive.moudle.pedometer.ui.fragment; |
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | -import android.os.Bundle; | ||
| 5 | -import android.view.View; | 4 | +import androidx.databinding.ViewDataBinding; |
| 6 | 5 | ||
| 7 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 6 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 8 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; | 7 | import com.cnlive.moudle.pedometer.commonInfo.CommonInfo; |
| @@ -27,9 +26,10 @@ public class TakePartFragment extends BaseFragment<TakePartView, TakePartPresent | @@ -27,9 +26,10 @@ public class TakePartFragment extends BaseFragment<TakePartView, TakePartPresent | ||
| 27 | } | 26 | } |
| 28 | 27 | ||
| 29 | @Override | 28 | @Override |
| 30 | - protected void initBindingData() { | ||
| 31 | - super.initBindingData(); | ||
| 32 | - binding = (FragmentTakePartBinding) getBaseBinding(); | 29 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 30 | + super.initBindingLayoutData(baseBinding); | ||
| 31 | + binding = (FragmentTakePartBinding) baseBinding; | ||
| 32 | + | ||
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | @Override | 35 | @Override |
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/UploadFailDetailFragment.java
| @@ -2,6 +2,8 @@ package com.cnlive.moudle.pedometer.ui.fragment; | @@ -2,6 +2,8 @@ package com.cnlive.moudle.pedometer.ui.fragment; | ||
| 2 | 2 | ||
| 3 | import android.os.Bundle; | 3 | import android.os.Bundle; |
| 4 | 4 | ||
| 5 | +import androidx.databinding.ViewDataBinding; | ||
| 6 | + | ||
| 5 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 7 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 6 | import com.cnlive.moudle.pedometer.frame.presenter.UploadFailDetailFragmentPresenter; | 8 | import com.cnlive.moudle.pedometer.frame.presenter.UploadFailDetailFragmentPresenter; |
| 7 | import com.cnlive.moudle.pedometer.frame.view.UploadFailDetailFragmentView; | 9 | import com.cnlive.moudle.pedometer.frame.view.UploadFailDetailFragmentView; |
| @@ -26,9 +28,9 @@ public class UploadFailDetailFragment extends BaseFragment<UploadFailDetailFragm | @@ -26,9 +28,9 @@ public class UploadFailDetailFragment extends BaseFragment<UploadFailDetailFragm | ||
| 26 | } | 28 | } |
| 27 | 29 | ||
| 28 | @Override | 30 | @Override |
| 29 | - protected void initBindingData() { | ||
| 30 | - super.initBindingData(); | ||
| 31 | - binding = (FragmentFinishRunMapBinding) getBaseBinding(); | 31 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 32 | + super.initBindingLayoutData(baseBinding); | ||
| 33 | + binding = (FragmentFinishRunMapBinding)baseBinding; | ||
| 32 | } | 34 | } |
| 33 | 35 | ||
| 34 | public static UploadFailDetailFragment newInstance(FailedEntity failedEntity) { | 36 | public static UploadFailDetailFragment newInstance(FailedEntity failedEntity) { |
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/AllDeviceFragment.java
| @@ -3,6 +3,8 @@ package com.cnlive.strike.xiaojiaspeaker.ui.fragment; | @@ -3,6 +3,8 @@ package com.cnlive.strike.xiaojiaspeaker.ui.fragment; | ||
| 3 | import android.os.Bundle; | 3 | import android.os.Bundle; |
| 4 | import android.view.View; | 4 | import android.view.View; |
| 5 | 5 | ||
| 6 | +import androidx.databinding.ViewDataBinding; | ||
| 7 | + | ||
| 6 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 8 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 7 | import com.cnlive.strike.xiaojiaspeaker.R; | 9 | import com.cnlive.strike.xiaojiaspeaker.R; |
| 8 | import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo; | 10 | import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo; |
| @@ -33,11 +35,11 @@ public class AllDeviceFragment extends BaseFragment<AllDeviceFragmentView, AllDe | @@ -33,11 +35,11 @@ public class AllDeviceFragment extends BaseFragment<AllDeviceFragmentView, AllDe | ||
| 33 | } | 35 | } |
| 34 | 36 | ||
| 35 | @Override | 37 | @Override |
| 36 | - protected void initBindingData() { | ||
| 37 | - super.initBindingData(); | ||
| 38 | - binding = (FragmentAllDeviceBinding) getBaseBinding(); | ||
| 39 | - } | 38 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 39 | + super.initBindingLayoutData(baseBinding); | ||
| 40 | + binding = (FragmentAllDeviceBinding)baseBinding; | ||
| 40 | 41 | ||
| 42 | + } | ||
| 41 | 43 | ||
| 42 | @Override | 44 | @Override |
| 43 | protected void init(Bundle savedInstanceState) { | 45 | protected void init(Bundle savedInstanceState) { |
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/ChangeDeviceNameFragment.java
| @@ -4,6 +4,8 @@ import android.os.Bundle; | @@ -4,6 +4,8 @@ import android.os.Bundle; | ||
| 4 | import android.text.TextUtils; | 4 | import android.text.TextUtils; |
| 5 | import android.view.View; | 5 | import android.view.View; |
| 6 | 6 | ||
| 7 | +import androidx.databinding.ViewDataBinding; | ||
| 8 | + | ||
| 7 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 9 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 8 | import com.cnlive.strike.xiaojiaspeaker.R; | 10 | import com.cnlive.strike.xiaojiaspeaker.R; |
| 9 | import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentChangeDeviceNameBinding; | 11 | import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentChangeDeviceNameBinding; |
| @@ -22,9 +24,10 @@ public class ChangeDeviceNameFragment extends BaseFragment<ChangeDeviceNameView, | @@ -22,9 +24,10 @@ public class ChangeDeviceNameFragment extends BaseFragment<ChangeDeviceNameView, | ||
| 22 | } | 24 | } |
| 23 | 25 | ||
| 24 | @Override | 26 | @Override |
| 25 | - protected void initBindingData() { | ||
| 26 | - super.initBindingData(); | ||
| 27 | - binding= (FragmentChangeDeviceNameBinding) getBaseBinding(); | 27 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 28 | + super.initBindingLayoutData(baseBinding); | ||
| 29 | + binding= (FragmentChangeDeviceNameBinding) baseBinding; | ||
| 30 | + | ||
| 28 | } | 31 | } |
| 29 | 32 | ||
| 30 | @Override | 33 | @Override |
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/DeviceDetailFragment.java
| @@ -4,6 +4,8 @@ import android.os.Bundle; | @@ -4,6 +4,8 @@ import android.os.Bundle; | ||
| 4 | import android.text.TextUtils; | 4 | import android.text.TextUtils; |
| 5 | import android.view.View; | 5 | import android.view.View; |
| 6 | 6 | ||
| 7 | +import androidx.databinding.ViewDataBinding; | ||
| 8 | + | ||
| 7 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 9 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 8 | import com.cnlive.core.libs.base.frame.presenter.BasePresenter; | 10 | import com.cnlive.core.libs.base.frame.presenter.BasePresenter; |
| 9 | import com.cnlive.strike.xiaojiaspeaker.R; | 11 | import com.cnlive.strike.xiaojiaspeaker.R; |
| @@ -25,9 +27,10 @@ public class DeviceDetailFragment extends BaseFragment<DeviceDetailView, BasePre | @@ -25,9 +27,10 @@ public class DeviceDetailFragment extends BaseFragment<DeviceDetailView, BasePre | ||
| 25 | } | 27 | } |
| 26 | 28 | ||
| 27 | @Override | 29 | @Override |
| 28 | - protected void initBindingData() { | ||
| 29 | - super.initBindingData(); | ||
| 30 | - binding = (FragmentDeviceDetailBinding) getBaseBinding(); | 30 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 31 | + super.initBindingLayoutData(baseBinding); | ||
| 32 | + binding = (FragmentDeviceDetailBinding) baseBinding; | ||
| 33 | + | ||
| 31 | } | 34 | } |
| 32 | 35 | ||
| 33 | public static DeviceDetailFragment newInstance(FamilyListBean.UsersBeanX.DeviceListBean allDeviceInfo, FamilyListBean.UsersBeanX currentUser) { | 36 | public static DeviceDetailFragment newInstance(FamilyListBean.UsersBeanX.DeviceListBean allDeviceInfo, FamilyListBean.UsersBeanX currentUser) { |
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/DeviceManagerFragment.java
| @@ -5,6 +5,7 @@ import android.text.TextUtils; | @@ -5,6 +5,7 @@ import android.text.TextUtils; | ||
| 5 | import android.view.View; | 5 | import android.view.View; |
| 6 | 6 | ||
| 7 | import androidx.annotation.NonNull; | 7 | import androidx.annotation.NonNull; |
| 8 | +import androidx.databinding.ViewDataBinding; | ||
| 8 | 9 | ||
| 9 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 10 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 10 | import com.cnlive.strike.xiaojiaspeaker.R; | 11 | import com.cnlive.strike.xiaojiaspeaker.R; |
| @@ -33,9 +34,10 @@ public FragmentDeviceManagerBinding binding; | @@ -33,9 +34,10 @@ public FragmentDeviceManagerBinding binding; | ||
| 33 | } | 34 | } |
| 34 | 35 | ||
| 35 | @Override | 36 | @Override |
| 36 | - protected void initBindingData() { | ||
| 37 | - super.initBindingData(); | ||
| 38 | - binding= (FragmentDeviceManagerBinding) getBaseBinding(); | 37 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 38 | + super.initBindingLayoutData(baseBinding); | ||
| 39 | + binding= (FragmentDeviceManagerBinding) baseBinding; | ||
| 40 | + | ||
| 39 | } | 41 | } |
| 40 | 42 | ||
| 41 | public static DeviceManagerFragment newInstance(FamilyListBean.UsersBeanX currentUser, FamilyListBean.UsersBeanX.DeviceListBean currentDeviceInfo) { | 43 | public static DeviceManagerFragment newInstance(FamilyListBean.UsersBeanX currentUser, FamilyListBean.UsersBeanX.DeviceListBean currentDeviceInfo) { |
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SearchDevicefragment.java
| @@ -5,6 +5,7 @@ import android.os.Handler; | @@ -5,6 +5,7 @@ import android.os.Handler; | ||
| 5 | import android.view.View; | 5 | import android.view.View; |
| 6 | 6 | ||
| 7 | import androidx.core.content.ContextCompat; | 7 | import androidx.core.content.ContextCompat; |
| 8 | +import androidx.databinding.ViewDataBinding; | ||
| 8 | 9 | ||
| 9 | import com.clj.fastble.BleManager; | 10 | import com.clj.fastble.BleManager; |
| 10 | import com.clj.fastble.scan.BleScanRuleConfig; | 11 | import com.clj.fastble.scan.BleScanRuleConfig; |
| @@ -33,11 +34,11 @@ public class SearchDevicefragment extends BaseFragment<SearchDevicefragmentView, | @@ -33,11 +34,11 @@ public class SearchDevicefragment extends BaseFragment<SearchDevicefragmentView, | ||
| 33 | } | 34 | } |
| 34 | 35 | ||
| 35 | @Override | 36 | @Override |
| 36 | - protected void initBindingData() { | ||
| 37 | - super.initBindingData(); | ||
| 38 | - binding = (FragmentSearchDeviceBinding) getBaseBinding(); | ||
| 39 | - } | 37 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 38 | + super.initBindingLayoutData(baseBinding); | ||
| 39 | + binding = (FragmentSearchDeviceBinding) baseBinding; | ||
| 40 | 40 | ||
| 41 | + } | ||
| 41 | 42 | ||
| 42 | @Override | 43 | @Override |
| 43 | protected void init(Bundle savedInstanceState) { | 44 | protected void init(Bundle savedInstanceState) { |
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SelectIMFriendFragment.java
| @@ -5,6 +5,7 @@ import android.text.TextUtils; | @@ -5,6 +5,7 @@ import android.text.TextUtils; | ||
| 5 | import android.view.View; | 5 | import android.view.View; |
| 6 | 6 | ||
| 7 | import androidx.core.content.ContextCompat; | 7 | import androidx.core.content.ContextCompat; |
| 8 | +import androidx.databinding.ViewDataBinding; | ||
| 8 | 9 | ||
| 9 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 10 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 10 | import com.cnlive.strike.xiaojiaspeaker.R; | 11 | import com.cnlive.strike.xiaojiaspeaker.R; |
| @@ -35,11 +36,11 @@ public class SelectIMFriendFragment extends BaseFragment<SelectIMFriendView, Sel | @@ -35,11 +36,11 @@ public class SelectIMFriendFragment extends BaseFragment<SelectIMFriendView, Sel | ||
| 35 | } | 36 | } |
| 36 | 37 | ||
| 37 | @Override | 38 | @Override |
| 38 | - protected void initBindingData() { | ||
| 39 | - super.initBindingData(); | ||
| 40 | - binding = (FragmentSelectImFriendBinding) getBaseBinding(); | ||
| 41 | - } | 39 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 40 | + super.initBindingLayoutData(baseBinding); | ||
| 41 | + binding = (FragmentSelectImFriendBinding) baseBinding; | ||
| 42 | 42 | ||
| 43 | + } | ||
| 43 | 44 | ||
| 44 | @Override | 45 | @Override |
| 45 | protected void init(Bundle savedInstanceState) { | 46 | protected void init(Bundle savedInstanceState) { |
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SelectWifiFragment.java
| @@ -11,6 +11,7 @@ import android.util.Log; | @@ -11,6 +11,7 @@ import android.util.Log; | ||
| 11 | import android.view.View; | 11 | import android.view.View; |
| 12 | 12 | ||
| 13 | import androidx.core.content.ContextCompat; | 13 | import androidx.core.content.ContextCompat; |
| 14 | +import androidx.databinding.ViewDataBinding; | ||
| 14 | 15 | ||
| 15 | import com.clj.fastble.data.BleDevice; | 16 | import com.clj.fastble.data.BleDevice; |
| 16 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 17 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| @@ -41,11 +42,11 @@ public class SelectWifiFragment extends BaseFragment<SelectWifiFragmentView, Sel | @@ -41,11 +42,11 @@ public class SelectWifiFragment extends BaseFragment<SelectWifiFragmentView, Sel | ||
| 41 | } | 42 | } |
| 42 | 43 | ||
| 43 | @Override | 44 | @Override |
| 44 | - protected void initBindingData() { | ||
| 45 | - super.initBindingData(); | ||
| 46 | - binding = (FragmentSelectWifiBinding) getBaseBinding(); | ||
| 47 | - } | 45 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 46 | + super.initBindingLayoutData(baseBinding); | ||
| 47 | + binding = (FragmentSelectWifiBinding) baseBinding; | ||
| 48 | 48 | ||
| 49 | + } | ||
| 49 | 50 | ||
| 50 | @Override | 51 | @Override |
| 51 | protected void init(Bundle savedInstanceState) { | 52 | protected void init(Bundle savedInstanceState) { |
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SetFriendsRoleFragment.java
| @@ -4,6 +4,7 @@ import android.os.Bundle; | @@ -4,6 +4,7 @@ import android.os.Bundle; | ||
| 4 | import android.view.View; | 4 | import android.view.View; |
| 5 | 5 | ||
| 6 | import androidx.core.content.ContextCompat; | 6 | import androidx.core.content.ContextCompat; |
| 7 | +import androidx.databinding.ViewDataBinding; | ||
| 7 | 8 | ||
| 8 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 9 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 9 | import com.cnlive.strike.xiaojiaspeaker.R; | 10 | import com.cnlive.strike.xiaojiaspeaker.R; |
| @@ -39,11 +40,11 @@ public class SetFriendsRoleFragment extends BaseFragment<SetFriendsRoleView, Set | @@ -39,11 +40,11 @@ public class SetFriendsRoleFragment extends BaseFragment<SetFriendsRoleView, Set | ||
| 39 | } | 40 | } |
| 40 | 41 | ||
| 41 | @Override | 42 | @Override |
| 42 | - protected void initBindingData() { | ||
| 43 | - super.initBindingData(); | ||
| 44 | - binding = (FragmentSetFriendRoleBinding) getBaseBinding(); | ||
| 45 | - } | 43 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 44 | + super.initBindingLayoutData(baseBinding); | ||
| 45 | + binding = (FragmentSetFriendRoleBinding) baseBinding; | ||
| 46 | 46 | ||
| 47 | + } | ||
| 47 | 48 | ||
| 48 | @Override | 49 | @Override |
| 49 | protected void init(Bundle savedInstanceState) { | 50 | protected void init(Bundle savedInstanceState) { |
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/UserManagerFragment.java
| @@ -5,6 +5,7 @@ import android.text.TextUtils; | @@ -5,6 +5,7 @@ import android.text.TextUtils; | ||
| 5 | import android.view.View; | 5 | import android.view.View; |
| 6 | 6 | ||
| 7 | import androidx.core.content.ContextCompat; | 7 | import androidx.core.content.ContextCompat; |
| 8 | +import androidx.databinding.ViewDataBinding; | ||
| 8 | 9 | ||
| 9 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 10 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; |
| 10 | import com.cnlive.strike.xiaojiaspeaker.R; | 11 | import com.cnlive.strike.xiaojiaspeaker.R; |
| @@ -40,11 +41,11 @@ public class UserManagerFragment extends BaseFragment<UserManagerView, UserManag | @@ -40,11 +41,11 @@ public class UserManagerFragment extends BaseFragment<UserManagerView, UserManag | ||
| 40 | } | 41 | } |
| 41 | 42 | ||
| 42 | @Override | 43 | @Override |
| 43 | - protected void initBindingData() { | ||
| 44 | - super.initBindingData(); | ||
| 45 | - binding= (FragmentUserManagerBinding) getBaseBinding(); | ||
| 46 | - } | 44 | + protected void initBindingLayoutData(ViewDataBinding baseBinding) { |
| 45 | + super.initBindingLayoutData(baseBinding); | ||
| 46 | + binding= (FragmentUserManagerBinding) baseBinding; | ||
| 47 | 47 | ||
| 48 | + } | ||
| 48 | 49 | ||
| 49 | @Override | 50 | @Override |
| 50 | protected void init(Bundle savedInstanceState) { | 51 | protected void init(Bundle savedInstanceState) { |