From f1645cf72ccad0845c3484710eb0188d62f28036 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Thu, 30 Nov 2023 15:18:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/utils/JavascriptInterfacePlayLetUtils.java | 6 ++++++ common/src/main/res/values-en-rUS/string.xml | 1 + common/src/main/res/values-zh-rHK/strings.xml | 1 + common/src/main/res/values-zh-rTW/strings.xml | 1 + common/src/main/res/values-zh/strings.xml | 1 + common/src/main/res/values/strings.xml | 2 +- .../main/java/com/yunbao/live/socket/SocketRyClient.java | 4 ++-- .../java/com/yunbao/live/views/LiveAudienceViewHolder.java | 3 +++ .../main/java/com/yunbao/live/views/LiveRoomViewHolder.java | 1 - live/src/main/res/layout/view_live_room.xml | 6 +++--- 10 files changed, 19 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/utils/JavascriptInterfacePlayLetUtils.java b/common/src/main/java/com/yunbao/common/utils/JavascriptInterfacePlayLetUtils.java index 0016d5196..69627c998 100644 --- a/common/src/main/java/com/yunbao/common/utils/JavascriptInterfacePlayLetUtils.java +++ b/common/src/main/java/com/yunbao/common/utils/JavascriptInterfacePlayLetUtils.java @@ -3,6 +3,7 @@ package com.yunbao.common.utils; import android.app.Activity; import android.util.Log; import android.webkit.JavascriptInterface; +import android.webkit.ValueCallback; import android.webkit.WebView; public class JavascriptInterfacePlayLetUtils { @@ -23,6 +24,11 @@ public class JavascriptInterfacePlayLetUtils { public JavascriptInterfacePlayLetUtils setmContext(Activity mContext, WebView mWebView) { this.mContext = mContext; this.mWebView = mWebView; +// webView.evaluateJavascript("javascript:nativeCallback('" + params + "')", new ValueCallback() { +// @Override +// public void onReceiveValue(String value) { +// } +// }); return this; } diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml index b8c6597cd..4d8c78578 100644 --- a/common/src/main/res/values-en-rUS/string.xml +++ b/common/src/main/res/values-en-rUS/string.xml @@ -1386,5 +1386,6 @@ Limited ride And limited avatar frame 0-100 coins 100-500 coins Above 500 coins + combo X diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml index 9313068f9..fda612880 100644 --- a/common/src/main/res/values-zh-rHK/strings.xml +++ b/common/src/main/res/values-zh-rHK/strings.xml @@ -1383,4 +1383,5 @@ 0-100星幣 100-500星幣 500以上星幣 + 連擊× diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index 4a2e232d9..a29fd4693 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -1382,4 +1382,5 @@ 0-100星幣 100-500星幣 500以上星幣 + 連擊× diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index eed7b579e..d38df75c0 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1382,5 +1382,6 @@ 0-100星幣 100-500星幣 500以上星幣 + 連擊× diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index a7de8ca9e..984589395 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1389,5 +1389,5 @@ Limited ride And limited avatar frame 0-100 coins 100-500 coins Above 500 coins - 連擊× + combo X diff --git a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java index c3c0b0763..03b009666 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java @@ -768,9 +768,9 @@ public class SocketRyClient { SendQuickGiftModel sendQuickGiftModel = GsonUtils.fromJson(map.toString(), SendQuickGiftModel.class); StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append(sendQuickGiftModel.getUserNicename()) - .append(WordUtil.isNewZh() ? "送出了" : "sent") + .append(WordUtil.isNewZh() ? " 送出了 " : " sent ") .append(sendQuickGiftModel.getQuickGiftNumber()) - .append(WordUtil.isNewZh() ? "個小PD" : "small pandas"); + .append(WordUtil.isNewZh() ? " 個小PD " : " small pandas "); systemChatMessage2(stringBuffer.toString()); Bus.get().post(new QuickGiftingEvent().setHotNum(sendQuickGiftModel.getHotNum())); break; diff --git a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java index e2b652461..d2b6b7a6d 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java @@ -296,6 +296,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { LiveHDDialogFragment liveHDDialogFragment = new LiveHDDialogFragment(); liveHDDialogFragment.setArguments(bundle1); liveHDDialogFragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment"); + Bus.get().post(new QuickGiftingEvent().setReminder(true)); } }); pd_pao.setOnLongClickListener(new View.OnLongClickListener() { @@ -400,6 +401,8 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { if (!(quickGiftContDown > 0 && quickGiftContDown < 120)) { quickGiftHandler.postDelayed(quickGiftRunnable, 1000); } + }else { + circleProgress.setCurrent(2); } } diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 9a135da2f..96c65ea14 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -717,7 +717,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } else { quick_gift_reminder.setVisibility(View.GONE); } - IMLoginManager.get(mContext).setQuickGiftIfFirst(); } } public void onQuickGifting3() { diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index ce7507d06..c0d36fdfb 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -2537,10 +2537,10 @@