From f4016089a1393b8af829dba050da10e999df0881 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 6 Jun 2023 15:28:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8C=E5=96=84=E8=B5=84?=
=?UTF-8?q?=E6=96=99=E5=92=8C=E7=A4=BC=E7=89=A9=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config.gradle | 8 ++++----
.../com/yunbao/live/activity/LiveAudienceActivity.java | 3 +--
.../com/yunbao/live/dialog/LiveGiftDialogFragment.java | 10 +++++++++-
live/src/main/res/layout/dialog_live_gift_wrap.xml | 3 +++
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/config.gradle b/config.gradle
index 62d6c7e7c..a3a252701 100644
--- a/config.gradle
+++ b/config.gradle
@@ -4,14 +4,14 @@ ext {
buildToolsVersion: "29.0.2",
minSdkVersion : 21,
targetSdkVersion : 31,
- versionCode : 423,
+ versionCode : 424,
versionName : "6.5.2"
]
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",
@@ -26,6 +26,6 @@ ext {
// true表示谷歌支付 false
isGooglePlay : false,
//是否上报异常日志
- isUploadLog : false
+ isUploadLog : true
]
}
\ No newline at end of file
diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
index 16e6029e9..1bbc86181 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
@@ -861,8 +861,7 @@ public class LiveAudienceActivity extends LiveActivity {
if (TextUtils.equals(htmlUrl, "recharge")) {
RouteUtil.forwardMyCoin(mContext);
} else if (TextUtils.equals(htmlUrl, "to_me_information")) {
- onBackPressed();
- Constants.isShowPage = 3;
+ RouteUtil.forwardEditProfileActivity();
} else {
if (!screen) {
ZhuangBanActivity.forward(mContext, htmlUrl, false);
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
index 72e2b8901..7b06cd904 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
@@ -154,7 +154,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
DialogInterface.OnDismissListener onDismissListener;
DialogInterface.OnShowListener onShowListener;
private SVGAImageView blindSvga, blindBoxOpen;
-
+ private View close_view;
@Override
protected int getLayoutId() {
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);
mVipGoldTitle = mRootView.findViewById(R.id.vipGoldTitle);
mVipGoldDesc = mRootView.findViewById(R.id.vipGoldDesc);
+ close_view = mRootView.findViewById(R.id.close_view);
mVipGold.setOnClickListener(this);
mGiftPackage = mRootView.findViewById(R.id.btn_gift_package);
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);
mGiftPackage.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() {
@Override
public void handleMessage(Message msg) {
@@ -1258,3 +1265,4 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
};
}
+
diff --git a/live/src/main/res/layout/dialog_live_gift_wrap.xml b/live/src/main/res/layout/dialog_live_gift_wrap.xml
index fa39f0cff..36ce0ea3e 100644
--- a/live/src/main/res/layout/dialog_live_gift_wrap.xml
+++ b/live/src/main/res/layout/dialog_live_gift_wrap.xml
@@ -6,6 +6,7 @@
android:orientation="vertical">
<RelativeLayout
+ android:id="@+id/close_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
@@ -43,6 +44,7 @@
android:id="@+id/btn_luck_gift_tip"
android:layout_width="102dp"
android:layout_height="31dp"
+ android:clickable="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="70dp"
android:layout_marginBottom="5dp"
@@ -88,6 +90,7 @@
<FrameLayout
android:id="@+id/blind_box"
+ android:clickable="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"