修复问题

common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java

@@ -35,9 +35,9 @@ import com.yunbao.common.bean.PrankHttpTurntableBean;
 import com.yunbao.common.bean.RandomPkUserBean;
 import com.yunbao.common.bean.RankPkInfoBean;
 import com.yunbao.common.bean.RedPacketDetailsBean;
-import com.yunbao.common.bean.RedPacketListBean;
 import com.yunbao.common.bean.RedPacketGiftModel;
 import com.yunbao.common.bean.RedPacketInfoModel;
+import com.yunbao.common.bean.RedPacketListBean;
 import com.yunbao.common.bean.SetAttentsModel;
 import com.yunbao.common.bean.StarChallengeStatusModel;
 import com.yunbao.common.bean.UserAreaBean;
@@ -1554,6 +1554,7 @@ public class LiveNetManager {
                     }
                 }).isDisposed();
     }
+
     /**
      * 获取红包记录列表
      */
@@ -1578,10 +1579,11 @@ public class LiveNetManager {
                     }
                 }).isDisposed();
     }
+
     /**
      * 获取红包记录列表
      */
-    public void getRedPacketUserList(int id,HttpCallback<RedPacketDetailsBean> callback) {
+    public void getRedPacketUserList(int id, HttpCallback<RedPacketDetailsBean> callback) {
         API.get().pdLiveApi(mContext)
                 .getRedPacketDetails(id)
                 .subscribeOn(Schedulers.io())
@@ -1626,6 +1628,7 @@ public class LiveNetManager {
                                 callback.onError(objectResponseModel.getData().getMsg());
                             }
                         }
+
                     }
                 }, new Consumer<Throwable>() {
                     @Override
@@ -1747,7 +1750,7 @@ public class LiveNetManager {
                 }).isDisposed();
     }
 
-    public void endRedPacket(String liveUid,String redPacketId, HttpCallback<String> callback) {
+    public void endRedPacket(String liveUid, String redPacketId, HttpCallback<String> callback) {
         API.get().pdLiveApi(mContext)
                 .endRedPacket(liveUid, redPacketId)
                 .subscribeOn(Schedulers.io())

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

@@ -1212,4 +1212,7 @@ Limited ride And limited avatar frame</string>
     <string name="red_packet_info_residue_back">Return to account</string>
     <string name="red_packet_user_tips2">Popularity Red packet</string>
     <string name="main_tabs_red_packet">Red packets</string>
+    <string name="save_popular_red_packets">Save popular red packets</string>
+    <string name="amount">amount</string>
+    <string name="drill">drill</string>
 </resources>

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

@@ -1207,4 +1207,13 @@
     <string name="red_packet_info_residue_back">退回賬戶</string>
     <string name="red_packet_user_tips2">攢人氣紅包</string>
     <string name="main_tabs_red_packet">紅包專區</string>
+    <string name="save_popular_red_packets">攢人氣紅包</string>
+    <string name="amount">金額</string>
+    <string name="drill">鑚</string>
+    <string name="conditions">條件</string>
+    <string name="there_is_no">無</string>
+    <string name="following_anchor">關注主播</string>
+    <string name="red_envelope_rill">紅包%s鑚/個</string>
+    <string name="total_consumption_of_drill">共計消耗%s鑚</string>
+    <string name="top_up_now">去充值></string>
 </resources>

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

@@ -1206,4 +1206,13 @@
     <string name="red_packet_info_residue_back">退回賬戶</string>
     <string name="red_packet_user_tips2">攢人氣紅包</string>
     <string name="main_tabs_red_packet">紅包專區</string>
+    <string name="save_popular_red_packets">攢人氣紅包</string>
+    <string name="amount">金額</string>
+    <string name="drill">鑚</string>
+    <string name="conditions">條件</string>
+    <string name="there_is_no">無</string>
+    <string name="following_anchor">關注主播</string>
+    <string name="red_envelope_rill">紅包%s鑚/個</string>
+    <string name="total_consumption_of_drill">共計消耗%s鑚</string>
+    <string name="top_up_now">去充值></string>
 </resources>

common/src/main/res/values-zh/strings.xml

@@ -1207,4 +1207,13 @@
     <string name="red_packet_info_residue_back">退回賬戶</string>
     <string name="red_packet_user_tips2">攢人氣紅包</string>
     <string name="main_tabs_red_packet">紅包專區</string>
+    <string name="save_popular_red_packets">攢人氣紅包</string>
+    <string name="amount">金額</string>
+    <string name="drill">鑚</string>
+    <string name="conditions">條件</string>
+    <string name="there_is_no">無</string>
+    <string name="following_anchor">關注主播</string>
+    <string name="red_envelope_rill">紅包%s鑚/個</string>
+    <string name="total_consumption_of_drill">共計消耗%s鑚</string>
+    <string name="top_up_now">去充值></string>
 </resources>

common/src/main/res/values/strings.xml

@@ -1213,9 +1213,9 @@ Limited ride And limited avatar frame</string>
     <string name="red_packet_info_residue_back">Return to account</string>
     <string name="red_packet_user_tips2">Popularity Red packet</string>
     <string name="main_tabs_red_packet">Red packets</string>
-    <string name="save_popular_red_packets">攢人氣紅包</string>
+    <string name="save_popular_red_packets">Save popular red packets</string>
-    <string name="amount">金額</string>
+    <string name="amount">amount</string>
-    <string name="drill">鑚</string>
+    <string name="drill">drill</string>
     <string name="conditions">條件</string>
     <string name="there_is_no">無</string>
     <string name="following_anchor">關注主播</string>

gradle.properties

@@ -19,8 +19,8 @@ org.gradle.configureondemand=true
 android.useAndroidX=true
 android.enableJetifier=true
 
-#systemProp.http.proxyHost=127.0.0.1
+systemProp.http.proxyHost=127.0.0.1
-#systemProp.https.proxyHost=127.0.0.1
+systemProp.https.proxyHost=127.0.0.1
-#systemProp.https.proxyPort=7890
+systemProp.https.proxyPort=10809
-#systemProp.http.proxyPort=7890
+systemProp.http.proxyPort=10809
 #android.enableR8.fullMode=true

live/src/main/java/com/yunbao/live/dialog/ResultRendPacketPopup.java

@@ -101,9 +101,14 @@ public class ResultRendPacketPopup extends CenterPopupView {
                                         new HttpCallback<List<RedPacketGiftModel>>() {
                                             @Override
                                             public void onSuccess(List<RedPacketGiftModel> data) {
+                                                if (data.size() > 0) {
                                                     new XPopup.Builder(getContext())
                                                             .asCustom(new LuckUserRedPacketPopup(getContext(), data))
                                                             .show();
+                                                } else {
+                                                    ToastUtil.show(R.string.no_data);
+                                                }
+
                                             }
 
                                             @Override
@@ -117,9 +122,14 @@ public class ResultRendPacketPopup extends CenterPopupView {
                                         new HttpCallback<List<RedPacketGiftModel>>() {
                                             @Override
                                             public void onSuccess(List<RedPacketGiftModel> data) {
+                                                if (data.size()>0){
                                                     new XPopup.Builder(getContext())
                                                             .asCustom(new LuckUserRedPacketPopup(getContext(), data))
                                                             .show();
+                                                }else {
+                                                    ToastUtil.show(R.string.no_data);
+                                                }
+
                                             }
 
                                             @Override

live/src/main/java/com/yunbao/live/dialog/SendRendPacketPopup.java

@@ -100,7 +100,7 @@ public class SendRendPacketPopup extends CenterPopupView {
                         totalConsumptionOfDrill.setText(String.format(getContext().getString(R.string.total_consumption_of_drill), String.valueOf((totalInt * numberInt))));
                         redEnvelopeRill.setText(String.format(getContext().getString(R.string.red_envelope_rill), s.toString()));
                     } else {
-                        ToastUtil.show(String.format(getContext().getString(R.string.range_range_is), "200~10000"));
+                        ToastUtil.show(getContext().getString(R.string.amount) + String.format(getContext().getString(R.string.range_range_is), "200~10000"));
                     }
 
                 }
@@ -135,7 +135,7 @@ public class SendRendPacketPopup extends CenterPopupView {
                     if (numberInt >= 1 && numberInt <= 100) {
                         totalConsumptionOfDrill.setText(String.format(getContext().getString(R.string.total_consumption_of_drill), String.valueOf((rillInt * numberInt))));
                     } else {
-                        ToastUtil.show(String.format(getContext().getString(R.string.range_range_is), "1~100"));
+                        ToastUtil.show(getContext().getString(R.string.drill) + String.format(getContext().getString(R.string.range_range_is), "1~100"));
                     }
 
                 }
@@ -180,12 +180,12 @@ public class SendRendPacketPopup extends CenterPopupView {
                 if (totalInt >= 1 && totalInt <= 100) {
                     totalTrue = true;
                 } else {
-                    ToastUtil.show(String.format(getContext().getString(R.string.range_range_is), "1~100"));
+                    ToastUtil.show(getContext().getString(R.string.drill) + String.format(getContext().getString(R.string.range_range_is), "1~100"));
                 }
                 if (rillInt >= 200 && rillInt <= 10000) {
                     rillTrue = true;
                 } else {
-                    ToastUtil.show(String.format(getContext().getString(R.string.range_range_is), "200~10000"));
+                    ToastUtil.show(getContext().getString(R.string.amount) + String.format(getContext().getString(R.string.range_range_is), "200~10000"));
                 }
                 if (totalTrue && rillTrue) {
                     LiveNetManager.get(getContext())

live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

@@ -1453,11 +1453,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                 redPacketQueue.setVisibility(View.VISIBLE);
                 redPacketCountdown.setVisibility(View.GONE);
                 StringBuffer stringBuffer = new StringBuffer();
-                stringBuffer.append(mRedPacketModel.getRedPacketRemain() )
+                stringBuffer.append(mRedPacketModel.getRedPacketCount())
                         .append("/")
                         .append(mRedPacketModel.getRedPacketQuantity());
                 redSchedule.setText(stringBuffer.toString());
-                openRedPacket.setText(String.format(mContext.getString(R.string.open_red_packet), mRedPacketModel.getRedPacketCount()+ ""));
+                openRedPacket.setText(String.format(mContext.getString(R.string.open_red_packet), mRedPacketModel.getRedPacketRemain() + ""));
             }
             if (IMLoginManager.get(mContext).getUserInfo().anchorUserType() && mContext instanceof LiveRyAnchorActivity) {
                 anchorTimeHandler.removeCallbacks(anchorTimeRunnable);