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

同步PD代码

Browse Source
This commit is contained in:
zlzw 2024-07-22 13:28:09 +08:00
parent b9891367ad
commit b5d4b88753
6 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -56,7 +56,7 @@ allprojects {
ext { ext {
IS_PUBLISH_LOCAL=true IS_PUBLISH_LOCAL=true
LIB_VERSION="1.0.6" LIB_VERSION="1.0.6"
AGORA_RTC_SDK= 'io.agora.rtc:agora-special-full:4.2.6.12' AGORA_RTC_SDK= 'io.agora.rtc:agora-special-full:4.2.6.14'
// AGORA_RTC_SDK= "${rootProject.rootDir.absolutePath}/sdk" // AGORA_RTC_SDK= "${rootProject.rootDir.absolutePath}/sdk"
// AGORA_RTC_SDK="io.agora.rtc:full-sdk:4.2.6" // AGORA_RTC_SDK="io.agora.rtc:full-sdk:4.2.6"
} }

6
common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
View File

@ -88,9 +88,9 @@ public class WebViewActivity extends AbsActivity {
@Override @Override
public void setStatusBar() { public void setStatusBar() {
getWindow().setStatusBarColor(Color.parseColor("#FFFFFF")); // getWindow().setStatusBarColor(Color.parseColor("#FFFFFF"));
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); // getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LAYOUT_STABLE); // getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
} }
@Override @Override

2
config.gradle
View File

@ -4,7 +4,7 @@ ext {
buildToolsVersion: "29.0.2", buildToolsVersion: "29.0.2",
minSdkVersion : 23, minSdkVersion : 23,
targetSdkVersion : 34, targetSdkVersion : 34,
versionCode : 535, versionCode : 536,
versionName : "6.7.1", versionName : "6.7.1",
namespace : "com.pandoralive.shayu" namespace : "com.pandoralive.shayu"
] ]

9
live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java
View File

@ -1759,6 +1759,15 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
liveInputDialogFragment.setArguments(liveInputBundle); liveInputDialogFragment.setArguments(liveInputBundle);
liveInputDialogFragment.show(getSupportFragmentManager(), "LiveInputDialogFragment"); liveInputDialogFragment.show(getSupportFragmentManager(), "LiveInputDialogFragment");
break; break;
case LIVE_DIALOG_ANCHOR_TIPS:
new DialogUitl.Builder(mContext)
.setContent(event.getObject().toString())
.setConfirmString(WordUtil.isNewZh() ? "確定" : "confirm")
.setCancelable(true)
.setShowCancelButton(false)
.build()
.show();
break;
} }
} }

7
live/src/main/java/com/yunbao/live/socket/SocketSwClient.java
View File

@ -778,7 +778,12 @@ public class SocketSwClient {
case "SendMoneyLongEnd": case "SendMoneyLongEnd":
Bus.get().post(new SendMoneyLongEndEvent()); Bus.get().post(new SendMoneyLongEndEvent());
break; break;
case Constants.SOCKET_LIVE_ANCHOR_PK_DIALOG:
item = map.getJSONObject("ct");
//DialogUitl.showSimpleDialog(mContext,WordUtil.isNewZh()?item.getString("text"):item.getString("text_en"),null);
Bus.get().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.LIVE_DIALOG_ANCHOR_TIPS)
.setObject(WordUtil.isNewZh() ? item.getString("text") : item.getString("text_en")));
} }
} }

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

@ -79,9 +79,9 @@ public class ZhuangBanActivity extends AbsActivity {
@Override @Override
public void setStatusBar() { public void setStatusBar() {
getWindow().setStatusBarColor(Color.parseColor("#FFFFFF")); // getWindow().setStatusBarColor(Color.parseColor("#FFFFFF"));
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); // getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LAYOUT_STABLE); // getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
} }
@Override @Override
protected int getLayoutId() { protected int getLayoutId() {