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

111

Browse Source
This commit is contained in:
18142669586
2022-07-22 17:49:50 +08:00
parent cbf43a3aa3
commit 701f1c6dc1
16 changed files with 208 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
live/src/main/AndroidManifest.xml
View File

@@ -67,7 +67,7 @@
android:name=".activity.MedalQuestionWebViewActivity"
android:screenOrientation="portrait" />
<activity
android:name=".views.ZhuangBanActivity"
android:name=".activity.ZhuangBanActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:screenOrientation="portrait" /> <!-- Android 9.0移除了apache的HttpClient，而金山sdk中用到了这个，不加这个的话在Android 9.0会崩溃 -->
<activity

51
live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
View File

@@ -657,16 +657,20 @@ public class LiveAudienceActivity extends LiveActivity {
* 打开礼物窗口
*/
public void openGiftWindow() {
if (TextUtils.isEmpty(mLiveUid) || TextUtils.isEmpty(mStream)) {
return;
}
LiveGiftDialogFragment fragment = new LiveGiftDialogFragment();
fragment.setLiveGuardInfo(mLiveGuardInfo);
Bundle bundle = new Bundle();
bundle.putString(Constants.LIVE_UID, mLiveUid);
bundle.putString(Constants.LIVE_STREAM, mStream);
fragment.setArguments(bundle);
fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveGiftDialogFragment");
new Handler(Looper.getMainLooper()).post(new Runnable() {
public void run() {
if (TextUtils.isEmpty(mLiveUid) || TextUtils.isEmpty(mStream)) {
return;
}
LiveGiftDialogFragment fragment = new LiveGiftDialogFragment();
fragment.setLiveGuardInfo(mLiveGuardInfo);
Bundle bundle = new Bundle();
bundle.putString(Constants.LIVE_UID, mLiveUid);
bundle.putString(Constants.LIVE_STREAM, mStream);
fragment.setArguments(bundle);
fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveGiftDialogFragment");
}
});
}
public void openGiftWindow(String giftId) {
@@ -687,17 +691,22 @@ public class LiveAudienceActivity extends LiveActivity {
if (TextUtils.isEmpty(mLiveUid) || TextUtils.isEmpty(mStream)) {
return;
}
LiveGiftDialogFragment fragment = new LiveGiftDialogFragment();
fragment.setLiveGuardInfo(mLiveGuardInfo);
Bundle bundle = new Bundle();
bundle.putString(Constants.LIVE_UID, mLiveUid);
bundle.putString(Constants.LIVE_STREAM, mStream);
bundle.putString(Constants.LIVE_WISH_GIFTID, giftId);
if (for_by.equals("1")) {
bundle.putString("by", "1");
}
fragment.setArguments(bundle);
fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveGiftDialogFragment");
new Handler(Looper.getMainLooper()).post(new Runnable() {
public void run() {
LiveGiftDialogFragment fragment = new LiveGiftDialogFragment();
fragment.setLiveGuardInfo(mLiveGuardInfo);
Bundle bundle = new Bundle();
bundle.putString(Constants.LIVE_UID, mLiveUid);
bundle.putString(Constants.LIVE_STREAM, mStream);
bundle.putString(Constants.LIVE_WISH_GIFTID, giftId);
if (for_by.equals("1")) {
bundle.putString("by", "1");
}
fragment.setArguments(bundle);
fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveGiftDialogFragment");
}
});
}
/**

12
live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java
View File

@@ -147,6 +147,12 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
onTrickerySendGiftInto(new JsWishBean(id));
}
}
@JavascriptInterface
public void openWrap() {
dismiss();
((LiveAudienceActivity) mContext).openGiftWindow();
}
}
/**
@@ -166,9 +172,11 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
public void onTrickerySendGiftInto(JsWishBean id) {
Log.i("tvs", "來了" + id);
if (id != null) {
if (id!=null){
dismiss();
if (mContext instanceof LiveAudienceActivity) {
Log.i("tvs","來了111"+id);
if (mContext instanceof LiveAudienceActivity){
Log.i("tvs","來了333"+id);
((LiveAudienceActivity) mContext).openGiftWindow(id.getGiftId(), "1");
}
}