fix bug

skWeiChatBaidu/src/main/java/com/liaobo/im/ui/me/MyInfoActivity.java

@@ -364,7 +364,7 @@ public class MyInfoActivity extends BaseActivity implements View.OnClickListener
 //            mSexTv.setText(InternationalizationHelper.getString("JX_Wuman"));
 //        }
         tvBirthday.setText(TimeUtils.sk_time_s_long_2_str(mTempUserData.getBirthday()));
-        tvLocation.setText(Area.getProvinceCityString(mTempUserData.getCityId(), mTempUserData.getAreaId()));
+        tvLocation.setText(Area.getProvinceCityString(mTempUserData.getProvinceId(), mTempUserData.getCityId()));
 //        mTvDiyName.setText(mTempUserData.getDescription());
 
         String phoneNumber = coreManager.getSelf().getTelephone();

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

@@ -66,7 +66,7 @@ public class MyRedPacketActivity extends BaseActivity {
         DialogHelper.showMessageProgressDialog(this,"请稍等...");
         HashMap<String, String> params = new HashMap<String, String>();
         params.put("access_token", coreManager.getSelfStatus().accessToken);
-        params.put("pageIndex",   "1");
+        params.put("pageIndex",   "0");
         params.put("pageSize", "25");
         if (!TextUtils.isEmpty(startTime)){
             params.put("startTime",startTime);

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

@@ -179,7 +179,7 @@ public class RedDetailsActivity extends BaseActivity implements View.OnClickList
         if (v.getId() == R.id.iv_title_left || v.getId() == R.id.red_back_tv) {
             finish();
         } else if (v.getId() == R.id.get_redlist_tv) {
-            Intent intent = new Intent(RedDetailsActivity.this, RedListActivity.class);
+            Intent intent = new Intent(RedDetailsActivity.this, MyRedPacketActivity.class);
             startActivity(intent);
         } else if (v.getId() == R.id.reply_red_tv) {
             DialogHelper.showLimitSingleInputDialog(this, getString(R.string.replay),

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

@@ -15,6 +15,7 @@ import com.liaobo.im.bean.redpacket.RedPacketReceiveBean;
 import com.liaobo.im.bean.redpacket.RedPacketSendBean;
 import com.liaobo.im.bean.redpacket.RedSendRedItemEntry;
 import com.liaobo.im.db.InternationalizationHelper;
+import com.liaobo.im.helper.DialogHelper;
 import com.liaobo.im.ui.base.BaseActivity;
 import com.liaobo.im.xuan.xuanhttplibrary.okhttp.HttpUtils;
 import com.liaobo.im.xuan.xuanhttplibrary.okhttp.callback.BaseCallback;
@@ -163,6 +164,7 @@ public class RedListActivity extends BaseActivity {
     }
 
     private void loadAutoGetAssignRedReceiveList(int pageIndex) {
+        DialogHelper.showMessageProgressDialog(this,getString(R.string.please_wait));
         HashMap<String, String> params = new HashMap<String, String>();
         params.put("access_token", coreManager.getSelfStatus().accessToken);
         params.put("pageIndex", pageIndex + "");
@@ -175,6 +177,7 @@ public class RedListActivity extends BaseActivity {
 
                     @Override
                     public void onResponse(ObjectResult<RedPacketReceiveBean> result) {
+                        DialogHelper.dismissProgressDialog();
                         smartRefreshLayout.finishLoadMore();
                         smartRefreshLayout.finishRefresh();
 
@@ -194,6 +197,7 @@ public class RedListActivity extends BaseActivity {
 
                     @Override
                     public void onError(Call call, Exception e) {
+                        DialogHelper.dismissProgressDialog();
                         smartRefreshLayout.finishLoadMore();
                         smartRefreshLayout.finishRefresh();
                     }

skWeiChatBaidu/src/main/java/com/liaobo/im/view/chatHolder/RedViewHolder.java

@@ -130,11 +130,13 @@ class RedViewHolder extends AChatHolderInterface {
                             intent.putExtras(bundle);
 
                             // 红包不可领取, 或者我发的单聊红包直接跳转
-                            if (resultCode != 1 || (!isGounp && isMysend) ||  (isGounp&&! mLoginUserId.equals(openRedpacket.getPacket().getAssignUserId())) ) {
+                            if (resultCode != 1 || (!isGounp && isMysend)) {
                                 mContext.startActivity(intent);
                             } else {
                                 // 在群里面我领取过的红包直接跳转
-                                if (isGounp && mdata.getFileSize() != 1) {
+
+
+                                if (isGounp &&( mdata.getFileSize() != 1 || !mLoginUserId.equals(openRedpacket.getPacket().getAssignUserId()))) {
                                     mContext.startActivity(intent);
                                 } else {
                                     if (mdata.getFilePath().equals("3")) {

skWeiChatBaidu/src/main/res/layout/a_view_actionbar.xml

@@ -3,13 +3,13 @@
     android:id="@+id/mergerStatus"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white">
+    >
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="50dp">
 
-        <com.liaobo.im.view.SkinImageView
+        <ImageView
             android:id="@+id/iv_title_left"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

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

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

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

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