Merge branch 'master' into AutomaticRedPacketGrabbing

skWeiChatBaidu/src/main/java/com/liaobo/im/ui/base/CoreManager.java

@@ -140,6 +140,7 @@ public class CoreManager {
     // 单聊、群聊的onCreate方法就不调用updateMyBalance了，放到主界面的onCreate方法内调用
     public static void updateMyBalance() {
         HashMap<String, String> params = new HashMap<String, String>();
+
         params.put("access_token", staticSelfStatus.accessToken);
         HttpUtils.get().url(CoreManager.requireConfig(MyApplication.getInstance()).RECHARGE_GET)
                 .params(params)

skWeiChatBaidu/src/main/java/com/liaobo/im/ui/me/redpacket/RedListActivity.java

@@ -48,7 +48,7 @@ public class RedListActivity extends BaseActivity {
     // 数据集合
 //    private RedPacketSendBean redSendBean;
 //    private RedPacketReceiveBean mRedPacketReceviceBean;
-    // 表示发出的还是接受的红包list  0代表收到  1代表发出
+    // 表示发出的还是接受的红包list  0代表收到  1代表发出 2代表专属红包
     private int adapterType;
     // 两个listview数据加载的页数
     private int mPageIndex = 0;
@@ -310,11 +310,7 @@ public class RedListActivity extends BaseActivity {
             } else if (adapterType == 1) {
                 int type = ((RedSendRedItemEntry) mList.get(position)).type;
                 switch (type) {
-                    case 1: {
-                        //                        redViewHolder.userNameTv.setText("普通红包");
-                        redViewHolder.userNameTv.setText(InternationalizationHelper.getString("JX_UsualGift"));
-                    }
-                    break;
+
 
                     case 2: {
                         //                        redViewHolder.userNameTv.setText("拼手气红包");
@@ -327,6 +323,16 @@ public class RedListActivity extends BaseActivity {
                         redViewHolder.userNameTv.setText(InternationalizationHelper.getString("JX_MesGift"));
                     }
                     break;
+                    case 4:
+                        redViewHolder.userNameTv.setText(R.string.exclusive_red_packet1);
+                    break;
+                    case 1:
+                    default:
+                        //                        redViewHolder.userNameTv.setText("普通红包");
+                        redViewHolder.userNameTv.setText(InternationalizationHelper.getString("JX_UsualGift"));
+
+                    break;
+
                 }
                 long lcc_time = ((RedSendRedItemEntry) mList.get(position)).sendTime;
                 String StrTime = sdf.format(new Date(lcc_time * 1000L));

skWeiChatBaidu/src/main/res/values-en/strings.xml

@@ -1688,5 +1688,6 @@
 
     <string name="exclusive_red_packet">Exclusive red packet for %1$1s</string>
     <string name="exclusive_red_packet2">Exclusive red packet</string>
+    <string name="exclusive_red_packet1">Exclusive red packet</string>
     <string name="allow_private_chat">Private Chat</string>
 </resources>

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

@@ -1711,6 +1711,7 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZ`¬!"£$%^*()~=#{}[];':,./?/*-_+<>@&#03
     <string name="update">更新</string>
 
     <string name="exclusive_red_packet">%1$1s的專屬紅包</string>
+    <string name="exclusive_red_packet1">專屬紅包</string>
     <string name="exclusive_red_packet2">的專屬紅包</string>
     <string name="allow_private_chat">允許普通成員私聊</string>
 </resources>

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

@@ -1708,6 +1708,7 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZ`¬!"£$%^*()~=#{}[];':,./?/*-_+<>@&#03
     <string name="update">更新</string>
 
     <string name="exclusive_red_packet">%1$1s的專屬紅包</string>
+    <string name="exclusive_red_packet1">專屬紅包</string>
     <string name="exclusive_red_packet2">的專屬紅包</string>
     <string name="allow_private_chat">允許普通成員私聊</string>
 </resources>

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

@@ -1859,6 +1859,7 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZ`¬!"£$%^*()~=#{}[];':,./?/*-_+<>@&#03
     <string name="update">更新</string>
 
     <string name="exclusive_red_packet">%1$1s的专属红包</string>
+    <string name="exclusive_red_packet1">专属红包</string>
     <string name="exclusive_red_packet2">的专属红包</string>
     <string name="allow_private_chat">允许普通成员私聊</string>
     <string name="setting_packet_grab">设置自动领取红包时间</string>