diff --git a/app/src/main/java/com/chwl/app/base/BaseActivity.java b/app/src/main/java/com/chwl/app/base/BaseActivity.java index 7daaa4945..b180cc3ab 100644 --- a/app/src/main/java/com/chwl/app/base/BaseActivity.java +++ b/app/src/main/java/com/chwl/app/base/BaseActivity.java @@ -28,6 +28,7 @@ import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; import android.text.style.StyleSpan; +import android.view.Gravity; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; @@ -46,6 +47,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.chwl.app.notify.GlobalNotifyManager; import com.chwl.library.language.LanguageHelper; +import com.example.lib_utils.UiUtils; import com.google.gson.Gson; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.NIMSDK; @@ -236,6 +238,21 @@ public abstract class BaseActivity extends RxAppCompatActivity } } + public void initVipCenterBar(String title) { + mTitleBar = findViewById(R.id.title_bar); + if (mTitleBar != null) { + mTitleBar.setTitle(title); + mTitleBar.setImmersive(false); + mTitleBar.setTitleColor(getResources().getColor(R.color.color_FFE3AF)); + mTitleBar.setLeftImageResource(R.drawable.vip_center_back_button); + mTitleBar.setBackgroundResource(R.color.transparent); + mTitleBar.setLeftClickListener(v -> onLeftClickListener()); + if(UiUtils.INSTANCE.isRtl(context)){ + mTitleBar.leftTextViewUpdateScaleXForRTL(); + } + } + } + public void initWhiteTitleBar(String title) { mTitleBar = findViewById(R.id.title_bar); if (mTitleBar != null) { diff --git a/app/src/main/java/com/chwl/app/base/TitleBar.java b/app/src/main/java/com/chwl/app/base/TitleBar.java index 4cc2eba92..ffbce7474 100644 --- a/app/src/main/java/com/chwl/app/base/TitleBar.java +++ b/app/src/main/java/com/chwl/app/base/TitleBar.java @@ -63,6 +63,10 @@ public class TitleBar extends ViewGroup implements View.OnClickListener { private LayoutInflater mInflater; + public void leftTextViewUpdateScaleXForRTL() { + mLeftText.setScaleX(-1); + } + public TitleBar(Context context) { super(context); init(context); diff --git a/app/src/main/java/com/chwl/app/vip/VipCenterActivity.kt b/app/src/main/java/com/chwl/app/vip/VipCenterActivity.kt index 489e19aed..eb887d7ba 100644 --- a/app/src/main/java/com/chwl/app/vip/VipCenterActivity.kt +++ b/app/src/main/java/com/chwl/app/vip/VipCenterActivity.kt @@ -91,7 +91,8 @@ class VipCenterActivity : BaseViewBindingActivity(), @SuppressLint("SetTextI18N") override fun init() { EventBus.getDefault().register(this) - initWhiteTitleBar(getString(R.string.vip_center)) + initVipCenterBar(getString(R.string.vip_center)) + updateVipCenterBar() initView() initObserve() @@ -119,11 +120,11 @@ class VipCenterActivity : BaseViewBindingActivity(), private fun initView() { banner = findViewById(R.id.banner_view) - if (UiUtils.isRtl(AppUtils.getApp())) { - banner.setBannerGalleryEffect(5, 5, 5) - } else { +// if (UiUtils.isRtl(AppUtils.getApp())) { +//// banner.setBannerGalleryEffect(5, 5, 5) +// } else { banner.setBannerGalleryEffect(20, 20, 15) - } +// } banner.addOnPageChangeListener(object : OnPageChangeListener { override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) { @@ -146,15 +147,9 @@ class VipCenterActivity : BaseViewBindingActivity(), recyclerView.layoutManager = GridLayoutManager(this, 2) } - override fun initWhiteTitleBar(title: String?) { + private fun updateVipCenterBar() { mTitleBar = findViewById(R.id.title_bar) if (mTitleBar != null) { - mTitleBar.setTitle(title) - mTitleBar.setImmersive(false) - mTitleBar.setTitleColor(resources.getColor(R.color.color_FFE3AF)) - mTitleBar.setLeftImageResource(R.drawable.vip_center_back_button) - mTitleBar.setBackgroundResource(R.color.transparent) - mTitleBar.setLeftClickListener { onLeftClickListener() } mTitleBar.addAction(object : TitleBar.ImageAction(R.drawable.vip_center_help_button) { override fun performAction(view: View) { CommonWebViewActivity.start( diff --git a/app/src/main/res/layout/activity_vip_center.xml b/app/src/main/res/layout/activity_vip_center.xml index ba0258ff0..cb67e8044 100644 --- a/app/src/main/res/layout/activity_vip_center.xml +++ b/app/src/main/res/layout/activity_vip_center.xml @@ -41,7 +41,8 @@ app:bvp_indicator_visibility="gone" app:bvp_page_style="multi_page_scale" app:layout_goneMarginTop="@dimen/dp_16" - tools:visibility="visible" /> + tools:visibility="visible" + android:layoutDirection="ltr" />