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

修改完善资料和礼物点击

Browse Source
This commit is contained in:
18401019693 2023-06-06 15:28:00 +08:00
parent c53757c64b
commit f4016089a1
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config.gradle
View File

@ -4,14 +4,14 @@ ext {
buildToolsVersion: "29.0.2", buildToolsVersion: "29.0.2",
minSdkVersion : 21, minSdkVersion : 21,
targetSdkVersion : 31, targetSdkVersion : 31,
versionCode : 423, versionCode : 424,
versionName : "6.5.2" versionName : "6.5.2"
] ]
manifestPlaceholders = [ 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", txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",
@ -26,6 +26,6 @@ ext {
// true表示谷歌支付 false // true表示谷歌支付 false
isGooglePlay : false, isGooglePlay : false,
//是否上报异常日志 //是否上报异常日志
isUploadLog : false isUploadLog : true
] ]
} }

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

@ -861,8 +861,7 @@ public class LiveAudienceActivity extends LiveActivity {
if (TextUtils.equals(htmlUrl, "recharge")) { if (TextUtils.equals(htmlUrl, "recharge")) {
RouteUtil.forwardMyCoin(mContext); RouteUtil.forwardMyCoin(mContext);
} else if (TextUtils.equals(htmlUrl, "to_me_information")) { } else if (TextUtils.equals(htmlUrl, "to_me_information")) {
onBackPressed(); RouteUtil.forwardEditProfileActivity();
Constants.isShowPage = 3;
} else { } else {
if (!screen) { if (!screen) {
ZhuangBanActivity.forward(mContext, htmlUrl, false); ZhuangBanActivity.forward(mContext, htmlUrl, false);

10
live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
View File

@ -154,7 +154,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
DialogInterface.OnDismissListener onDismissListener; DialogInterface.OnDismissListener onDismissListener;
DialogInterface.OnShowListener onShowListener; DialogInterface.OnShowListener onShowListener;
private SVGAImageView blindSvga, blindBoxOpen; private SVGAImageView blindSvga, blindBoxOpen;
private View close_view;
@Override @Override
protected int getLayoutId() { protected int getLayoutId() {
return R.layout.dialog_live_gift_wrap; return R.layout.dialog_live_gift_wrap;
@ -316,6 +316,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
description = mRootView.findViewById(R.id.description); description = mRootView.findViewById(R.id.description);
mVipGoldTitle = mRootView.findViewById(R.id.vipGoldTitle); mVipGoldTitle = mRootView.findViewById(R.id.vipGoldTitle);
mVipGoldDesc = mRootView.findViewById(R.id.vipGoldDesc); mVipGoldDesc = mRootView.findViewById(R.id.vipGoldDesc);
close_view = mRootView.findViewById(R.id.close_view);
mVipGold.setOnClickListener(this); mVipGold.setOnClickListener(this);
mGiftPackage = mRootView.findViewById(R.id.btn_gift_package); mGiftPackage = mRootView.findViewById(R.id.btn_gift_package);
blindNumber = mRootView.findViewById(R.id.blind_number); blindNumber = mRootView.findViewById(R.id.blind_number);
@ -323,6 +324,12 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
textBlindGiftName = mRootView.findViewById(R.id.text_blind_gift_name); textBlindGiftName = mRootView.findViewById(R.id.text_blind_gift_name);
mGiftPackage.setOnClickListener(this); mGiftPackage.setOnClickListener(this);
mRootView.findViewById(R.id.live_gift_download_all).setOnClickListener(this); mRootView.findViewById(R.id.live_gift_download_all).setOnClickListener(this);
close_view.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
dismiss();
}
});
mHandler = new Handler() { mHandler = new Handler() {
@Override @Override
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
@ -1258,3 +1265,4 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
}; };
} }

3
live/src/main/res/layout/dialog_live_gift_wrap.xml
View File

@ -6,6 +6,7 @@
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:id="@+id/close_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
@ -43,6 +44,7 @@
android:id="@+id/btn_luck_gift_tip" android:id="@+id/btn_luck_gift_tip"
android:layout_width="102dp" android:layout_width="102dp"
android:layout_height="31dp" android:layout_height="31dp"
android:clickable="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginTop="70dp" android:layout_marginTop="70dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
@ -88,6 +90,7 @@
<FrameLayout <FrameLayout
android:id="@+id/blind_box" android:id="@+id/blind_box"
android:clickable="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"