From 3effb630c5f4b39bb30b0995c8de97d353298c21 Mon Sep 17 00:00:00 2001 From: hch <16607480311@163.com> Date: Tue, 23 Jan 2024 17:49:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=9F=AD=E5=89=A7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=A1=B6=E9=83=A8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=A0=8F=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=97=AA=E9=80=80bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yunbao/main/activity/MainHomeCommunityActivity.java | 6 +++++- .../main/fragment/MainHomeCommunityVideoFragment.java | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/main/src/main/java/com/yunbao/main/activity/MainHomeCommunityActivity.java b/main/src/main/java/com/yunbao/main/activity/MainHomeCommunityActivity.java index 084ac2870..6eb1db028 100644 --- a/main/src/main/java/com/yunbao/main/activity/MainHomeCommunityActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/MainHomeCommunityActivity.java @@ -1,5 +1,7 @@ package com.yunbao.main.activity; +import android.view.Window; +import android.view.WindowManager; import android.widget.LinearLayout; import androidx.fragment.app.FragmentManager; @@ -25,8 +27,10 @@ public class MainHomeCommunityActivity extends AbsActivity { @Override protected void main() { - MainHomeCommunityVideoFragment communityVideoFragment = new MainHomeCommunityVideoFragment(); + Window window = getWindow(); + window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); + MainHomeCommunityVideoFragment communityVideoFragment = new MainHomeCommunityVideoFragment(); FragmentManager FM = getSupportFragmentManager();//获取管理器 FragmentTransaction FT = FM.beginTransaction();//获取启动器 FT.replace(R.id.fragment, communityVideoFragment);//替换碎片 diff --git a/main/src/main/java/com/yunbao/main/fragment/MainHomeCommunityVideoFragment.java b/main/src/main/java/com/yunbao/main/fragment/MainHomeCommunityVideoFragment.java index f2db90261..969bf6c31 100644 --- a/main/src/main/java/com/yunbao/main/fragment/MainHomeCommunityVideoFragment.java +++ b/main/src/main/java/com/yunbao/main/fragment/MainHomeCommunityVideoFragment.java @@ -204,6 +204,10 @@ public class MainHomeCommunityVideoFragment extends BaseFragment { @Override public void onDestroy() { super.onDestroy(); + if (timer != null) { + timer.cancel(); + timer = null; + } getActivity().finish(); } From dfca615735f288736294ac30366a12b24e821adc Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Tue, 23 Jan 2024 17:50:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/src/main/res/layout/item_home_sud_game_list.xml | 1 + config.gradle | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/src/main/res/layout/item_home_sud_game_list.xml b/common/src/main/res/layout/item_home_sud_game_list.xml index a15051431..de0159c94 100644 --- a/common/src/main/res/layout/item_home_sud_game_list.xml +++ b/common/src/main/res/layout/item_home_sud_game_list.xml @@ -53,6 +53,7 @@ android:layout_marginTop="10dp" android:ellipsize="end" android:singleLine="true" + android:textStyle="bold" android:text="@string/interactive_game_create_room_name" android:textColor="#000" android:textSize="14sp" /> diff --git a/config.gradle b/config.gradle index 1ccac4e22..58279b97c 100644 --- a/config.gradle +++ b/config.gradle @@ -4,14 +4,14 @@ ext { buildToolsVersion: "29.0.2", minSdkVersion : 21, targetSdkVersion : 33, - versionCode : 462, - versionName : "6.6.4" + versionCode : 463, + versionName : "6.6.5" ] manifestPlaceholders = [ //正式、 - serverHost : "https://napi.yaoulive.com", +// serverHost : "https://napi.yaoulive.com", // 测试 -// serverHost : " https://ceshi.yaoulive.com", + serverHost : " https://ceshi.yaoulive.com", //百度语音识别 From c00afb1db0b8f00fb4ab81d995b922b99cdb34d4 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Wed, 24 Jan 2024 09:53:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yunbao/main/activity/MainActivity.java | 9 ++++++++- .../java/com/yunbao/main/views/MainHomeViewHolder.java | 9 +++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java index 4655f2172..2b280ad62 100644 --- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java @@ -633,11 +633,17 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene ((TextView) floatRedPacket.findViewById(R.id.progressText)).setText(data.getRedPacketNum() + "/" + data.getRedPacketTotal()); } if (data.getShowWarOrder() == 0) { + floatWarOrder.setVisibility(View.GONE); floatBanner.setVisibility(View.VISIBLE); findViewById(R.id.banner_click).setVisibility(View.VISIBLE); } else { - floatWarOrder.setVisibility(View.VISIBLE); + if (mainHomeViewHolder!=null&&mainHomeViewHolder.isFloatWarOrder()){ + floatWarOrder.setVisibility(View.GONE); + }else { + floatWarOrder.setVisibility(View.VISIBLE); + } + floatBanner.setVisibility(View.GONE); findViewById(R.id.banner_click).setVisibility(View.GONE); } @@ -645,6 +651,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene @Override public void onError(String error) { + ToastUtil.show(mContext.getString(R.string.net_error)); } }); diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java index 3996e16cb..aa91acf13 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java @@ -25,6 +25,11 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder { private MainHomeGameViewHolder mainHomeGameLiveViewHolder; private final String mPageName = "home_page"; private ImageView img_trophy; + private boolean floatWarOrder; + + public boolean isFloatWarOrder() { + return floatWarOrder; + } public MainHomeViewHolder(Context context, ViewGroup parentView) { super(context, parentView); @@ -60,18 +65,22 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder { protected void loadPageData(int position) { switch (position) { case 0: + floatWarOrder = false; MobclickAgent.onEvent(mContext, "home_page_follow", "首页关注列表按钮"); EventBus.getDefault().post(new FloatWarOrderEvent().setFloatWarOrder(false)); break; case 1: + floatWarOrder = false; MobclickAgent.onEvent(mContext, "home_page_hot", "首页热门列表按钮"); EventBus.getDefault().post(new FloatWarOrderEvent().setFloatWarOrder(false)); break; case 2: + floatWarOrder = false; MobclickAgent.onEvent(mContext, "home_page_recommend", "首页推荐列表按钮"); EventBus.getDefault().post(new FloatWarOrderEvent().setFloatWarOrder(false)); break; case 3: + floatWarOrder = true; MobclickAgent.onEvent(mContext, "home_page_redpk", "首页红包列表按钮"); EventBus.getDefault().post(new FloatWarOrderEvent().setFloatWarOrder(true)); break; From 508e9f19315edb242d5bcff4eae29b54608560ad Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Wed, 24 Jan 2024 11:29:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=BC=80=E6=92=AD=E9=82=80=E8=AF=B7=E5=A4=9A=E4=BA=BA?= =?UTF-8?q?PK=EF=BC=8C=E5=A4=9A=E4=BA=BAPK=E4=B8=80=E8=BD=AE=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E5=90=8E=EF=BC=8C=E5=86=8D=E6=AC=A1=E5=A4=9A=E4=BA=BA?= =?UTF-8?q?PK=EF=BC=8C=E5=9C=A8=E7=9B=B4=E6=92=AD=E9=97=B4=E7=9A=84?= =?UTF-8?q?=E8=A7=82=E4=BC=97=E6=97=A0=E6=B3=95=E7=9C=8B=E5=88=B0=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E8=BD=AE=E7=9A=84PK=E5=80=92=E8=AE=A1=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java | 1 + 1 file changed, 1 insertion(+) diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 437dfdf5e..0c2ef8bf0 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -5147,6 +5147,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis if (time > 0) { mPkTimeCount2 = time; drPKtIME = time; + timeTitle.setVisibility(View.VISIBLE); timeTitle.post(countdownRunnable); } }