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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zlzw 2023-12-07 13:20:24 +08:00
commit 6df819f3b1
11 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
View File

@ -58,7 +58,7 @@ public class IMLoginManager extends BaseCacheManager {
} }
public boolean getRedPoint() { public boolean getRedPoint() {
return !TextUtils.isEmpty(getString("RedPoint")) && !TextUtils.equals(getString("RedPoint"), "1"); return !TextUtils.isEmpty(getString("RedPoint")) || !TextUtils.equals(getString("RedPoint"), "1");
} }
public void setQuickGiftIfFirst() { public void setQuickGiftIfFirst() {
put("quick_gift_if_first", "1"); put("quick_gift_if_first", "1");

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

@ -1390,8 +1390,8 @@ Limited ride And limited avatar frame</string>
<string name="conversion_quantity">Exchange quantity:</string> <string name="conversion_quantity">Exchange quantity:</string>
<string name="conversion_quantity_need">Need %s</string> <string name="conversion_quantity_need">Need %s</string>
<string name="conversion_quantity_need_of_use">Exchange&amp;Usage Rules:</string> <string name="conversion_quantity_need_of_use">Exchange&amp;Usage Rules:</string>
<string name="conversion_quantity_need_of_use1">·One star coin can be exchanged for one ticket. You can customize the exchange quantity according to your needs. Once the ticket is exchanged, it cannot be revoked. Please confirm in advance;</string> <string name="conversion_quantity_need_of_use1">1.One star coin can be exchanged for one ticket. You can customize the exchange quantity according to your needs. Once the ticket is exchanged, it cannot be revoked. Please confirm in advance;</string>
<string name="conversion_quantity_need_of_use2">·One ticket can be used to watch one episode of a short drama. After successful redemption, you can return to the viewing page and use the ticket to continue watching the movie;</string> <string name="conversion_quantity_need_of_use2">2.One ticket can be used to watch one episode of a short drama. After successful redemption, you can return to the viewing page and use the ticket to continue watching the movie;</string>
<string name="conversion_quantity_need_of_use3">·Ticket prohibit illegal activities such as offline trading and acquisitions, and PDLIVE will crack down severely on various profit-making trading activities.</string> <string name="conversion_quantity_need_of_use3">3.Ticket prohibit illegal activities such as offline trading and acquisitions, and PDLIVE will crack down severely on various profit-making trading activities.</string>
</resources> </resources>

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

@ -1387,7 +1387,7 @@
<string name="conversion_quantity">兌換數量：</string> <string name="conversion_quantity">兌換數量：</string>
<string name="conversion_quantity_need">需要 %s</string> <string name="conversion_quantity_need">需要 %s</string>
<string name="conversion_quantity_need_of_use">兌換&amp;使用規則：</string> <string name="conversion_quantity_need_of_use">兌換&amp;使用規則：</string>
<string name="conversion_quantity_need_of_use1">·1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string> <string name="conversion_quantity_need_of_use1">1.1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string>
<string name="conversion_quantity_need_of_use2">·1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string> <string name="conversion_quantity_need_of_use2">2.1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string>
<string name="conversion_quantity_need_of_use3">·觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲 打擊。</string> <string name="conversion_quantity_need_of_use3">3.觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。</string>
</resources> </resources>

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

@ -1386,7 +1386,7 @@
<string name="conversion_quantity">兌換數量：</string> <string name="conversion_quantity">兌換數量：</string>
<string name="conversion_quantity_need">需要 %s</string> <string name="conversion_quantity_need">需要 %s</string>
<string name="conversion_quantity_need_of_use">兌換&amp;使用規則：</string> <string name="conversion_quantity_need_of_use">兌換&amp;使用規則：</string>
<string name="conversion_quantity_need_of_use1">·1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string> <string name="conversion_quantity_need_of_use1">1.1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string>
<string name="conversion_quantity_need_of_use2">·1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string> <string name="conversion_quantity_need_of_use2">2.1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string>
<string name="conversion_quantity_need_of_use3">·觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲 打擊。</string> <string name="conversion_quantity_need_of_use3">3.觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。</string>
</resources> </resources>

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

@ -1386,8 +1386,8 @@
<string name="conversion_quantity">兌換數量：</string> <string name="conversion_quantity">兌換數量：</string>
<string name="conversion_quantity_need">需要 %s</string> <string name="conversion_quantity_need">需要 %s</string>
<string name="conversion_quantity_need_of_use">兌換&amp;使用規則：</string> <string name="conversion_quantity_need_of_use">兌換&amp;使用規則：</string>
<string name="conversion_quantity_need_of_use1">·1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string> <string name="conversion_quantity_need_of_use1">1.1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string>
<string name="conversion_quantity_need_of_use2">·1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string> <string name="conversion_quantity_need_of_use2">2.1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string>
<string name="conversion_quantity_need_of_use3">·觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。</string> <string name="conversion_quantity_need_of_use3">3.觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。</string>
</resources> </resources>

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

@ -1393,7 +1393,7 @@ Limited ride And limited avatar frame</string>
<string name="conversion_quantity">Exchange quantity:</string> <string name="conversion_quantity">Exchange quantity:</string>
<string name="conversion_quantity_need">Need %s</string> <string name="conversion_quantity_need">Need %s</string>
<string name="conversion_quantity_need_of_use">Exchange&amp;Usage Rules:</string> <string name="conversion_quantity_need_of_use">Exchange&amp;Usage Rules:</string>
<string name="conversion_quantity_need_of_use1">·One star coin can be exchanged for one ticket. You can customize the exchange quantity according to your needs. Once the ticket is exchanged, it cannot be revoked. Please confirm in advance;</string> <string name="conversion_quantity_need_of_use1">1.One star coin can be exchanged for one ticket. You can customize the exchange quantity according to your needs. Once the ticket is exchanged, it cannot be revoked. Please confirm in advance;</string>
<string name="conversion_quantity_need_of_use2">·One ticket can be used to watch one episode of a short drama. After successful redemption, you can return to the viewing page and use the ticket to continue watching the movie;</string> <string name="conversion_quantity_need_of_use2">2.One ticket can be used to watch one episode of a short drama. After successful redemption, you can return to the viewing page and use the ticket to continue watching the movie;</string>
<string name="conversion_quantity_need_of_use3">·Ticket prohibit illegal activities such as offline trading and acquisitions, and PDLIVE will crack down severely on various profit-making trading activities.</string> <string name="conversion_quantity_need_of_use3">3.Ticket prohibit illegal activities such as offline trading and acquisitions, and PDLIVE will crack down severely on various profit-making trading activities.</string>
</resources> </resources>

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

@ -1874,6 +1874,7 @@ public class LiveAudienceActivity extends LiveActivity {
if (manager == null || manager.mLiveAudienceViewHolder == null || manager.mLiveAudienceViewHolder.mRedPointPrivilege == null) { if (manager == null || manager.mLiveAudienceViewHolder == null || manager.mLiveAudienceViewHolder.mRedPointPrivilege == null) {
return; return;
} }
manager.mLiveAudienceViewHolder.setShowCrownRed(isShow);
if (isShow) { if (isShow) {
manager.mLiveAudienceViewHolder.mRedPointPrivilege.setVisibility(View.VISIBLE); manager.mLiveAudienceViewHolder.mRedPointPrivilege.setVisibility(View.VISIBLE);
} else { } else {

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

@ -364,7 +364,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
} }
mQuickGiftRemainingQuantity = mQuickGiftRemainingQuantity - 1; mQuickGiftRemainingQuantity = mQuickGiftRemainingQuantity - 1;
quick_gift_remaining_quantity.setText(String.valueOf(mQuickGiftRemainingQuantity)); quick_gift_remaining_quantity.setText(String.valueOf(mQuickGiftRemainingQuantity));
MobclickAgent.onEvent(mContext, "small_pd_gifts", "连点"+quickGiftingIndex); MobclickAgent.onEvent(mContext, "small_pd_gifts", "连点" + quickGiftingIndex);
} }
} }
}); });
@ -401,7 +401,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
if (!(quickGiftContDown > 0 && quickGiftContDown < 120)) { if (!(quickGiftContDown > 0 && quickGiftContDown < 120)) {
quickGiftHandler.postDelayed(quickGiftRunnable, 1000); quickGiftHandler.postDelayed(quickGiftRunnable, 1000);
} }
}else { } else {
circleProgress.setCurrent(2); circleProgress.setCurrent(2);
time_text.setVisibility(View.GONE); time_text.setVisibility(View.GONE);
} }
@ -720,6 +720,12 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
liveHDDialogFragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment"); liveHDDialogFragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
} }
private boolean mIsShow;
public void setShowCrownRed(boolean isShow) {
mIsShow = isShow;
}
/** /**
* 身份特权 * 身份特权
*/ */
@ -732,7 +738,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
// fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveRoleDialogFragment"); // fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveRoleDialogFragment");
new XPopup.Builder(mContext) new XPopup.Builder(mContext)
.enableDrag(false) .enableDrag(false)
.asCustom(new LiveNewRolePopup(mContext, mRedPointPrivilege.getVisibility() == View.VISIBLE)) .asCustom(new LiveNewRolePopup(mContext, mIsShow))
.show(); .show();
mRedPointPrivilege.setVisibility(View.GONE); mRedPointPrivilege.setVisibility(View.GONE);
} }

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

@ -714,6 +714,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
combo_layout.setVisibility(View.GONE); combo_layout.setVisibility(View.GONE);
if (IMLoginManager.get(mContext).getQuickGiftIfFirst()) { if (IMLoginManager.get(mContext).getQuickGiftIfFirst()) {
quick_gift_reminder.setVisibility(View.VISIBLE); quick_gift_reminder.setVisibility(View.VISIBLE);
IMLoginManager.get(mContext).setQuickGiftIfFirst();
} else { } else {
quick_gift_reminder.setVisibility(View.GONE); quick_gift_reminder.setVisibility(View.GONE);
} }

1
main/src/main/res/layout/view_homemain.xml
View File

@ -9,6 +9,7 @@
<com.yunbao.common.custom.MyViewPager <com.yunbao.common.custom.MyViewPager
android:id="@+id/viewPager" android:id="@+id/viewPager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginBottom="55dp"
android:layout_height="match_parent" android:layout_height="match_parent"
app:canScroll="false" /> app:canScroll="false" />

4
main/src/main/res/layout/view_search_results_item.xml
View File

@ -76,9 +76,9 @@
<ImageButton <ImageButton
android:id="@+id/change_batch" android:id="@+id/change_batch"
android:layout_width="wrap_content" android:layout_width="80dp"
android:clickable="true" android:clickable="true"
android:layout_height="wrap_content" android:layout_height="30dp"
android:layout_gravity="center_vertical|right" android:layout_gravity="center_vertical|right"
android:background="@mipmap/icon_cange" android:background="@mipmap/icon_cange"
android:focusable="true" /> android:focusable="true" />