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

修改 测试问题

Browse Source
This commit is contained in:
18401019693 2023-11-30 15:18:28 +08:00
parent cd35b9e40f
commit f1645cf72c
10 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/java/com/yunbao/common/utils/JavascriptInterfacePlayLetUtils.java
View File

@ -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<String>() {
// @Override
// public void onReceiveValue(String value) {
// }
// });
return this;
}

1
common/src/main/res/values-en-rUS/string.xml
View File

@ -1386,5 +1386,6 @@ Limited ride And limited avatar frame</string>
<string name="room_sill0_100">0-100 coins</string>
<string name="room_sill100_500">100-500 coins</string>
<string name="room_sill500_m">Above 500 coins</string>
<string name="combo">combo X</string>
</resources>

1
common/src/main/res/values-zh-rHK/strings.xml
View File

@ -1383,4 +1383,5 @@
<string name="room_sill0_100">0-100星幣</string>
<string name="room_sill100_500">100-500星幣</string>
<string name="room_sill500_m">500以上星幣</string>
<string name="combo">連擊×</string>
</resources>

1
common/src/main/res/values-zh-rTW/strings.xml
View File

@ -1382,4 +1382,5 @@
<string name="room_sill0_100">0-100星幣</string>
<string name="room_sill100_500">100-500星幣</string>
<string name="room_sill500_m">500以上星幣</string>
<string name="combo">連擊×</string>
</resources>

1
common/src/main/res/values-zh/strings.xml
View File

@ -1382,5 +1382,6 @@
<string name="room_sill0_100">0-100星幣</string>
<string name="room_sill100_500">100-500星幣</string>
<string name="room_sill500_m">500以上星幣</string>
<string name="combo">連擊×</string>
</resources>

2
common/src/main/res/values/strings.xml
View File

@ -1389,5 +1389,5 @@ Limited ride And limited avatar frame</string>
<string name="room_sill0_100">0-100 coins</string>
<string name="room_sill100_500">100-500 coins</string>
<string name="room_sill500_m">Above 500 coins</string>
<string name="combo">連擊×</string>
<string name="combo">combo X</string>
</resources>

4
live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
View File

@ -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;

3
live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
View File

@ -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);
}
}

1
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -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() {

6
live/src/main/res/layout/view_live_room.xml
View File

@ -2537,10 +2537,10 @@
<ImageView
android:id="@+id/quick_gift_reminder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_width="63dp"
android:layout_height="72dp"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginEnd="125dp"
android:src="@mipmap/background_quick_gift_reminder"
android:visibility="gone" />