From f8ea294d6db75246ad5fcd31c621f944f24655a8 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Thu, 18 Aug 2022 16:23:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yunbao/common/bean/IMLoginModel.java | 12 +++++++++ .../common/dialog/EffectsSettingsDialog.java | 23 ++++++++++++++-- .../com/yunbao/common/glide/ImgLoader.java | 5 +++- .../main/res/layout/view_effects_settings.xml | 25 ++++++++++++++++++ common/src/main/res/mipmap-xxhdpi/live_bg.jpg | Bin 0 -> 20828 bytes common/src/main/res/values/strings.xml | 1 + config.gradle | 4 +-- .../live/activity/LiveAudienceActivity.java | 5 ++++ .../presenter/LiveEnterRoomAnimPresenter.java | 2 +- .../res/layout/activity_live_audience.xml | 2 +- 10 files changed, 72 insertions(+), 7 deletions(-) create mode 100644 common/src/main/res/mipmap-xxhdpi/live_bg.jpg diff --git a/common/src/main/java/com/yunbao/common/bean/IMLoginModel.java b/common/src/main/java/com/yunbao/common/bean/IMLoginModel.java index 48ae294b0..307c5023c 100644 --- a/common/src/main/java/com/yunbao/common/bean/IMLoginModel.java +++ b/common/src/main/java/com/yunbao/common/bean/IMLoginModel.java @@ -209,6 +209,18 @@ public class IMLoginModel extends BaseModel { //礼物特效开关 @SerializedName("gift_effect") private boolean giftEffect = false; + //坐骑特效开关 + @SerializedName("mount_effect") + private boolean mountEffect = false; + + public boolean isMountEffect() { + return mountEffect; + } + + public IMLoginModel setMountEffect(boolean mountEffect) { + this.mountEffect = mountEffect; + return this; + } public boolean isGiftEffect() { return giftEffect; diff --git a/common/src/main/java/com/yunbao/common/dialog/EffectsSettingsDialog.java b/common/src/main/java/com/yunbao/common/dialog/EffectsSettingsDialog.java index f882aa612..f2de3925d 100644 --- a/common/src/main/java/com/yunbao/common/dialog/EffectsSettingsDialog.java +++ b/common/src/main/java/com/yunbao/common/dialog/EffectsSettingsDialog.java @@ -16,8 +16,8 @@ import com.yunbao.common.views.weight.ViewClicksAntiShake; * 特效设置页面 */ public class EffectsSettingsDialog extends AbsDialogFragment { - private ImageView specialSwitch; - private boolean giftEffect; + private ImageView specialSwitch, specialMountSwitch; + private boolean giftEffect, mountEffect; @Override protected int getLayoutId() { @@ -39,12 +39,19 @@ public class EffectsSettingsDialog extends AbsDialogFragment { super.onActivityCreated(savedInstanceState); IMLoginModel userInfo = IMLoginManager.get(getContext()).getUserInfo(); specialSwitch = (ImageView) findViewById(R.id.special_switch); + specialMountSwitch = (ImageView) findViewById(R.id.special_mount_switch); giftEffect = userInfo.isGiftEffect(); + mountEffect = userInfo.isMountEffect(); if (giftEffect) { ImgLoader.display(getContext(), R.mipmap.special_icon_off, specialSwitch); } else { ImgLoader.display(getContext(), R.mipmap.special_icon_on, specialSwitch); } + if (mountEffect) { + ImgLoader.display(getContext(), R.mipmap.special_icon_off, specialMountSwitch); + } else { + ImgLoader.display(getContext(), R.mipmap.special_icon_on, specialMountSwitch); + } //礼物特效开关 ViewClicksAntiShake.clicksAntiShake(specialSwitch, () -> { giftEffect = !giftEffect; @@ -57,6 +64,18 @@ public class EffectsSettingsDialog extends AbsDialogFragment { IMLoginManager.get(getContext()).upDataUserInfo(userInfo.setGiftEffect(giftEffect)); } ); + //坐骑特效开关 + ViewClicksAntiShake.clicksAntiShake(specialMountSwitch, () -> { + mountEffect = !mountEffect; + if (mountEffect) { + ImgLoader.display(getContext(), R.mipmap.special_icon_off, specialMountSwitch); + } else { + ImgLoader.display(getContext(), R.mipmap.special_icon_on, specialMountSwitch); + } + //更新特效开关 + IMLoginManager.get(getContext()).upDataUserInfo(userInfo.setMountEffect(mountEffect)); + } + ); } @Override diff --git a/common/src/main/java/com/yunbao/common/glide/ImgLoader.java b/common/src/main/java/com/yunbao/common/glide/ImgLoader.java index a06f1801b..b18655118 100644 --- a/common/src/main/java/com/yunbao/common/glide/ImgLoader.java +++ b/common/src/main/java/com/yunbao/common/glide/ImgLoader.java @@ -166,6 +166,7 @@ public class ImgLoader { .apply(RequestOptions.bitmapTransform(sBlurTransformation)) .into(imageView); } + /** * 显示模糊的毛玻璃图片 */ @@ -175,9 +176,11 @@ public class ImgLoader { } Glide.with(context).asDrawable().load(url) .skipMemoryCache(SKIP_MEMORY_CACHE) - .apply(RequestOptions.bitmapTransform(new BlurTransformation(95))) + .apply(RequestOptions.bitmapTransform(new BlurTransformation(100))) + .placeholder(R.mipmap.live_bg) .into(imageView); } + private static boolean contextIsExist(Context context) { if (context == null) { return false; diff --git a/common/src/main/res/layout/view_effects_settings.xml b/common/src/main/res/layout/view_effects_settings.xml index 381d0e138..dc2fbea48 100644 --- a/common/src/main/res/layout/view_effects_settings.xml +++ b/common/src/main/res/layout/view_effects_settings.xml @@ -38,4 +38,29 @@ android:src="@mipmap/special_icon_off" /> + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/mipmap-xxhdpi/live_bg.jpg b/common/src/main/res/mipmap-xxhdpi/live_bg.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6d9899eb178736c05404675b28e7b64db6a9fd73 GIT binary patch literal 20828 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 literal 0 HcmV?d00001 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 7357524e8..e513747e8 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -879,4 +879,5 @@ 基础工具 特效設置 屏蔽礼物特效 + 屏蔽坐骑特效 diff --git a/config.gradle b/config.gradle index 492fa93ba..3f66756b1 100644 --- a/config.gradle +++ b/config.gradle @@ -9,9 +9,9 @@ ext { ] manifestPlaceholders = [ //正式 - serverHost : "https://napi.yaoulive.com", +// serverHost : "https://napi.yaoulive.com", //測試 -// serverHost : "https://ceshi.yaoulive.com", + serverHost : "https://ceshi.yaoulive.com", //腾讯地图 txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index 84c740d57..3a4a38df9 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -66,6 +66,7 @@ import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.pay.PayCallback; import com.yunbao.common.pay.PayPresenter; import com.yunbao.common.utils.Bus; +import com.yunbao.common.utils.DeviceUtils; import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.L; import com.yunbao.common.utils.ProcessResultUtil; @@ -357,6 +358,10 @@ public class LiveAudienceActivity extends LiveActivity { //侧边栏 drawerLayout = findViewById(R.id.drawer_layout); + FrameLayout leftDrawer = findViewById(R.id.left_drawer); + DrawerLayout.LayoutParams layoutParams = (DrawerLayout.LayoutParams) leftDrawer.getLayoutParams(); + layoutParams.width = DeviceUtils.getScreenWidth(this) / 3 * 2; + leftDrawer.setLayoutParams(layoutParams); sidebarList = (CommonRefreshView) findViewById(R.id.sidebarList); sidebarBack = findViewById(R.id.sidebar_back); ImgLoader.displayBlurLive(mContext, liveBean.getAvatar(), sidebarBack); diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveEnterRoomAnimPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveEnterRoomAnimPresenter.java index 79ecf186c..46b6a4096 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveEnterRoomAnimPresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveEnterRoomAnimPresenter.java @@ -414,7 +414,7 @@ public class LiveEnterRoomAnimPresenter { colocNow = "#" + car.getCar_colour(); playText = car.getUser_nicename() + mContext.getResources().getString(R.string.enter_room); } - if (IMLoginManager.get(mContext).getUserInfo().isGiftEffect()){ + if (IMLoginManager.get(mContext).getUserInfo().isMountEffect()){ GifCacheUtil.getFile(Constants.GIF_CAR_PREFIX + id, url1, "0", mDownloadGifCallback); } diff --git a/live/src/main/res/layout/activity_live_audience.xml b/live/src/main/res/layout/activity_live_audience.xml index 2d8e8cee0..9a6b5d465 100644 --- a/live/src/main/res/layout/activity_live_audience.xml +++ b/live/src/main/res/layout/activity_live_audience.xml @@ -53,7 +53,7 @@