yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zlzw 2024-01-24 11:30:26 +08:00
commit 0c07e8c2be
7 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/main/res/layout/item_home_sud_game_list.xml
View File

@ -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" />

8
config.gradle
View File

@ -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",
//百度语音识别

1
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -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);
}
}

9
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@ -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));
}
});

6
main/src/main/java/com/yunbao/main/activity/MainHomeCommunityActivity.java
View File

@ -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);//替换碎片

4
main/src/main/java/com/yunbao/main/fragment/MainHomeCommunityVideoFragment.java
View File

@ -204,6 +204,10 @@ public class MainHomeCommunityVideoFragment extends BaseFragment {
@Override
public void onDestroy() {
super.onDestroy();
if (timer != null) {
timer.cancel();
timer = null;
}
getActivity().finish();
}

9
main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
View File

@ -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;