no message

app/res/drawable/avchat_logut_bg_selector.xml

@@ -2,7 +2,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@color/color_c2364b" android:state_pressed="true"></item>
-    <item android:drawable="@color/color_f5455e"></item>
-
+    <item android:state_pressed="true" android:drawable="@color/color_c2364b" />
+    <item android:drawable="@color/color_f5455e" />
 </selector>

app/res/layout/circle_item.xml

@@ -72,6 +72,38 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal"
+                    android:paddingBottom="5dp"
+                    android:paddingTop="5dp">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/location_btn_bg"
+                        android:gravity="center"
+                        android:orientation="horizontal"
+                        android:paddingBottom="2dp"
+                        android:paddingLeft="5dp"
+                        android:paddingRight="5dp"
+                        android:paddingTop="2dp">
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="2dp"
+                            app:srcCompat="@drawable/location" />
+
+                        <TextView
+                            android:id="@+id/circle_local"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="重庆北碚区"
+                            android:textColor="@color/grey_light" />
+                    </LinearLayout>
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
 

app/res/layout/mine_user_info_details.xml

@@ -303,6 +303,15 @@
                     android:textColor="@color/grey_light"
                     android:textSize="16sp" />
             </LinearLayout>
+
+            <Button
+                android:id="@+id/user_info_detail_kick_btn"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="20dp"
+                android:background="@drawable/g_red_long_btn_nomal"
+                android:text="移除群租"
+                android:textColor="@color/white" />
         </LinearLayout>
     </ScrollView>
 </LinearLayout>

app/src/com/sheishuo/app/common/views/GridViewAdapter.java

@@ -25,6 +25,7 @@ public class GridViewAdapter implements ListAdapter {
     List<String> thumbs,pics;
     Context context;
 
+    public int parentWidth = 0;
     public int imgSizeBlank = 0;
 
     public  GridViewAdapter(Context context, List<String> thumbs, List<String> pics) {
@@ -74,17 +75,12 @@ public class GridViewAdapter implements ListAdapter {
     }
 
     @Override
-    public View getView(final int position, View convertView, ViewGroup parent) {
-        ImageView imageView = ImgUtil.getImageFromNet(context,thumbs.get(position));
-//        if (getCount() >= 5){
-        int imgSize = (parent.getMeasuredWidth() - imgSizeBlank)/3;
-            imageView.setMinimumHeight(imgSize);
-            imageView.setMinimumWidth(imgSize);
-//        }
-//        else {
-//            imageView.setMinimumHeight((int) ImgUtil.convertDpToPixel(128,SheishuoApplication.getContext()));
-//            imageView.setMinimumWidth((int) ImgUtil.convertDpToPixel(128,SheishuoApplication.getContext()));
-//        }
+    public View getView(final int position, View convertView, final ViewGroup parent) {
+        final ImageView imageView = ImgUtil.getImageFromNet(context,thumbs.get(position));
+        int imgSize = (parentWidth - imgSizeBlank)/3;
+        Log.e("ImageSize", ""+imgSize);
+        imageView.setMinimumHeight(imgSize);
+        imageView.setMinimumWidth(imgSize);
 
         imageView.setOnClickListener(new View.OnClickListener() {
             @Override

app/src/com/sheishuo/app/core_module/mine/view/ui/activity/UserInfoDetailActivity.java

@@ -12,6 +12,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.netease.nim.uikit.common.ui.dialog.EasyAlertDialog;
+import com.netease.nim.uikit.common.ui.dialog.EasyAlertDialogHelper;
 import com.netease.nim.uikit.common.ui.imageview.HeadImageView;
 import com.netease.nim.uikit.session.activity.WatchPictureActivity;
 import com.netease.nimlib.sdk.NIMClient;
@@ -19,6 +21,8 @@ import com.netease.nimlib.sdk.RequestCallback;
 import com.netease.nimlib.sdk.friend.FriendService;
 import com.netease.nimlib.sdk.friend.constant.VerifyType;
 import com.netease.nimlib.sdk.friend.model.AddFriendData;
+import com.netease.nimlib.sdk.team.TeamService;
+import com.netease.nimlib.sdk.team.model.Team;
 import com.netease.nimlib.sdk.uinfo.UserService;
 import com.netease.nimlib.sdk.uinfo.constant.GenderEnum;
 import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
@@ -48,6 +52,7 @@ import java.util.List;
 public class UserInfoDetailActivity extends SheishuoUI {
 
     public final static String USER_ID = "user_id";
+    public final static String TEAM_ID = "team_id";
 
     private String TAG = this.getClass().getSimpleName();
     private Context context = this;
@@ -58,7 +63,7 @@ public class UserInfoDetailActivity extends SheishuoUI {
 
     private TextView nameTV, idTV, ageTV, hobbyTV, locationTV;
 
-    private Button followBtn, chatBtn, sendGiftBtn;
+    private Button followBtn, chatBtn, sendGiftBtn, kickBtn;
 
     private GridLayout personalPhotosLayout, tweetPhotosLayout;
 
@@ -67,6 +72,7 @@ public class UserInfoDetailActivity extends SheishuoUI {
     private INet net = new NetImpl();
 
     private String userId = "";
+    private Team team;
 
     //FLAGS
     private boolean FOLLOWED = false;
@@ -79,11 +85,25 @@ public class UserInfoDetailActivity extends SheishuoUI {
         context.startActivity(intent);
     }
 
+    public static void start(Context context, String account, String teamId){
+        Intent intent = new Intent();
+        intent.setClass(context, UserInfoDetailActivity.class);
+        intent.putExtra(UserInfoDetailActivity.USER_ID, account);
+        intent.putExtra(UserInfoDetailActivity.TEAM_ID, teamId);
+        intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        context.startActivity(intent);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.mine_user_info_details);
         userId = getIntent().getStringExtra(USER_ID);
+        if(getIntent().hasExtra(TEAM_ID))
+        {
+            String teamId = getIntent().getStringExtra(TEAM_ID);
+            team = NIMClient.getService(TeamService.class).queryTeamBlock(teamId);
+        }
         if (userId.equals(AccountCache.getAccount().getId())){
             startActivity(new Intent(context,PersonalSettingsActivity.class));
             finish();
@@ -114,7 +134,7 @@ public class UserInfoDetailActivity extends SheishuoUI {
         chatBtn = findView(R.id.user_info_details_chat_btn);
         sendGiftBtn = findView(R.id.user_info_details_send_gift_btn);
         sendGiftBtn.setVisibility(View.GONE);
-
+        kickBtn = findView(R.id.user_info_detail_kick_btn);
 
         personalPhotosLayout = findView(R.id.user_info_details_personal_photos_layout);
         tweetPhotosLayout = findView(R.id.user_info_details_tweet_photos_layout);
@@ -190,6 +210,19 @@ public class UserInfoDetailActivity extends SheishuoUI {
                 showCircle();
             }
         });
+
+
+        if(team == null || !team.getCreator().equals(AccountCache.getAccount().getId()))
+        {
+            kickBtn.setVisibility(View.GONE);
+        }
+
+        kickBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                kickOut();
+            }
+        });
     }
 
     @Override
@@ -408,4 +441,40 @@ public class UserInfoDetailActivity extends SheishuoUI {
         }
     }
 
+    private void kickOut()
+    {
+        if(team == null)
+            return;
+
+        EasyAlertDialogHelper.OnDialogActionListener listener = new EasyAlertDialogHelper.OnDialogActionListener() {
+
+            @Override
+            public void doCancelAction() {
+            }
+
+            @Override
+            public void doOkAction() {
+                NIMClient.getService(TeamService.class).removeMember(team.getId(), userId).setCallback(new RequestCallback<Void>() {
+                    @Override
+                    public void onSuccess(Void aVoid) {
+                        showToast(context, "移除成功");
+                        finish();
+                    }
+
+                    @Override
+                    public void onFailed(int i) {
+                        showToast(context, "移除失败");
+                    }
+
+                    @Override
+                    public void onException(Throwable throwable) {
+                        showToast(context, "移除失败");
+                    }
+                });
+            }
+        };
+        final EasyAlertDialog dialog = EasyAlertDialogHelper.createOkCancelDiolag(this, null, "确定要移除该成员？",
+                getString(com.netease.nim.uikit.R.string.remove), getString(com.netease.nim.uikit.R.string.cancel), true, listener);
+        dialog.show();
+    }
 }

app/src/com/sheishuo/app/core_module/sheishuo/view/ui/CreateNewGroupActivity.java

@@ -4,7 +4,10 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.IBinder;
+import android.view.MotionEvent;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -20,8 +23,11 @@ import com.netease.nim.uikit.contact_selector.activity.ContactSelectActivity;
 import com.netease.nimlib.sdk.NIMClient;
 import com.netease.nimlib.sdk.RequestCallback;
 import com.netease.nimlib.sdk.team.TeamService;
+import com.netease.nimlib.sdk.team.constant.TeamBeInviteModeEnum;
 import com.netease.nimlib.sdk.team.constant.TeamFieldEnum;
+import com.netease.nimlib.sdk.team.constant.TeamInviteModeEnum;
 import com.netease.nimlib.sdk.team.constant.TeamTypeEnum;
+import com.netease.nimlib.sdk.team.constant.VerifyTypeEnum;
 import com.netease.nimlib.sdk.team.model.Team;
 import com.netease.nimlib.sdk.uinfo.UserService;
 import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
@@ -126,35 +132,11 @@ public class CreateNewGroupActivity extends SheishuoUI {
                 Map<TeamFieldEnum, Serializable> teamInfoMap = new HashMap<>();
                 teamInfoMap.put(TeamFieldEnum.Name, groupName);
                 teamInfoMap.put(TeamFieldEnum.Introduce, groupIntroduce);
+                teamInfoMap.put(TeamFieldEnum.VerifyType, VerifyTypeEnum.Free);
                 teamService.createTeam(teamInfoMap, TeamTypeEnum.Advanced, "邀请您加入群:"+groupName, memberIds).setCallback(new RequestCallback<Team>() {
                     @Override
                     public void onSuccess(Team team) {
-                        showToast(context, "创建群组成功");
-                        INet net = new NetImpl();
-                        net.teamInvite(team.getId(), memberIds, "邀请您加入群:" + team.getName(), new ResponseCallback() {
-                            @Override
-                            public void onSuccess(Object object) {
-
-                            }
-
-                            @Override
-                            public void onFailed(String error) {
-
-                            }
-                        });
-                        net.teamSync(team.getId(), team.getName(), new ResponseCallback() {
-                            @Override
-                            public void onSuccess(Object object) {
-
-                            }
-
-                            @Override
-                            public void onFailed(String error) {
-
-                            }
-                        });
-                        SheishuoUIKit.startTeamSession(context, team.getId());
-                        finish();
+                        createTeamComplete(team);
                     }
 
                     @Override
@@ -175,6 +157,36 @@ public class CreateNewGroupActivity extends SheishuoUI {
         });
     }
 
+    private void createTeamComplete(Team team)
+    {
+        showToast(context, "创建群组成功");
+        INet net = new NetImpl();
+        net.teamInvite(team.getId(), memberIds, "邀请您加入群:" + team.getName(), new ResponseCallback() {
+            @Override
+            public void onSuccess(Object object) {
+
+            }
+
+            @Override
+            public void onFailed(String error) {
+
+            }
+        });
+        net.teamSync(team.getId(), team.getName(), new ResponseCallback() {
+            @Override
+            public void onSuccess(Object object) {
+
+            }
+
+            @Override
+            public void onFailed(String error) {
+
+            }
+        });
+        SheishuoUIKit.startTeamSession(context, team.getId());
+        finish();
+    }
+
 
     void initAddMembersBtn() {
         groupMemberImg.setOnClickListener(new View.OnClickListener() {
@@ -250,4 +262,56 @@ public class CreateNewGroupActivity extends SheishuoUI {
                     .into(groupAvatar);
         }
     }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
+
+            // 获得当前得到焦点的View，一般情况下就是EditText（特殊情况就是轨迹求或者实体案件会移动焦点）
+            View v = getCurrentFocus();
+
+            if (isShouldHideInput(v, ev)) {
+                hideSoftInput(v.getWindowToken());
+            }
+        }
+        return super.dispatchTouchEvent(ev);
+    }
+
+    /**
+     * 根据EditText所在坐标和用户点击的坐标相对比，来判断是否隐藏键盘，因为当用户点击EditText时没必要隐藏
+     *
+     * @param v
+     * @param event
+     * @return
+     */
+    private boolean isShouldHideInput(View v, MotionEvent event) {
+        if (v != null && (v instanceof EditText)) {
+            int[] l = { 0, 0 };
+            v.getLocationInWindow(l);
+            int left = l[0], top = l[1], bottom = top + v.getHeight(), right = left
+                    + v.getWidth();
+            if (event.getX() > left && event.getX() < right
+                    && event.getY() > top && event.getY() < bottom) {
+                // 点击EditText的事件，忽略它。
+                return false;
+            } else {
+                return true;
+            }
+        }
+        // 如果焦点不是EditText则忽略，这个发生在视图刚绘制完，第一个焦点不在EditView上，和用户用轨迹球选择其他的焦点
+        return false;
+    }
+
+    /**
+     * 多种隐藏软件盘方法的其中一种
+     *
+     * @param token
+     */
+    private void hideSoftInput(IBinder token) {
+        if (token != null) {
+            InputMethodManager im = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+            im.hideSoftInputFromWindow(token,
+                    InputMethodManager.HIDE_NOT_ALWAYS);
+        }
+    }
 }

app/src/com/sheishuo/app/core_module/sheishuo/view/ui/TeamSettingsActivity.java

@@ -115,6 +115,11 @@ public class TeamSettingsActivity extends SheishuoUI implements View.OnClickList
         requestSystemTeamIntro();
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        updateTeamMember();
+    }
 
     void findViews() {
         teamAvatarLayout = findView(R.id.team_settings_room_avatar_layout);
@@ -267,28 +272,7 @@ public class TeamSettingsActivity extends SheishuoUI implements View.OnClickList
         }
 
 
-        //加载群成员头像
-        getTeamService().queryMemberList(teamRoomId).setCallback(new RequestCallback<List<TeamMember>>() {
-            @Override
-            public void onSuccess(List<TeamMember> teamMembers) {
-                List<String> memberIds = new ArrayList<>();
-                for (TeamMember member : teamMembers) {
-                    memberIds.add(member.getAccount());
-                }
-
-                updateMembersInfo(memberIds);
-            }
-
-            @Override
-            public void onFailed(int i) {
-
-            }
-
-            @Override
-            public void onException(Throwable throwable) {
-
-            }
-        });
+        updateTeamMember();
 
         //聊天记录
         chatRecordLayout.setOnClickListener(new View.OnClickListener() {
@@ -317,6 +301,32 @@ public class TeamSettingsActivity extends SheishuoUI implements View.OnClickList
         });
     }
 
+    private void updateTeamMember()
+    {
+        //加载群成员头像
+        getTeamService().queryMemberList(teamRoomId).setCallback(new RequestCallback<List<TeamMember>>() {
+            @Override
+            public void onSuccess(List<TeamMember> teamMembers) {
+                List<String> memberIds = new ArrayList<>();
+                for (TeamMember member : teamMembers) {
+                    memberIds.add(member.getAccount());
+                }
+
+                updateMembersInfo(memberIds);
+            }
+
+            @Override
+            public void onFailed(int i) {
+
+            }
+
+            @Override
+            public void onException(Throwable throwable) {
+
+            }
+        });
+    }
+
 
     private TeamService getTeamService() {
         return NIMClient.getService(TeamService.class);
@@ -656,6 +666,8 @@ public class TeamSettingsActivity extends SheishuoUI implements View.OnClickList
 
                 final int imageSize = HeadImageView.DEFAULT_AVATAR_NOTIFICATION_ICON_SIZE;
 
+                teamMemberAvatarLayout.removeAllViewsInLayout();
+
                 if(team.getCreator().equals(AccountCache.getAccount().getId())) {
                     HeadImageView addBtn = new HeadImageView(context);
                     addBtn.setMaxWidth(imageSize);
@@ -680,9 +692,16 @@ public class TeamSettingsActivity extends SheishuoUI implements View.OnClickList
                     avatar.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
-                            Intent intent = new Intent(context, UserInfoDetailActivity.class);
-                            intent.putExtra(UserInfoDetailActivity.USER_ID, info.getAccount());
-                            startActivity(intent);
+                            if(!SheishuoTeamMessageActivity.isSystemTeam(team.getId()))
+                            {
+                                UserInfoDetailActivity.start(context, info.getAccount(), team.getId());
+                            }
+                            else {
+                                UserInfoDetailActivity.start(context, info.getAccount());
+                            }
+//                            Intent intent = new Intent(context, UserInfoDetailActivity.class);
+//                            intent.putExtra(UserInfoDetailActivity.USER_ID, info.getAccount());
+//                            startActivity(intent);
                         }
                     });
 

app/src/com/sheishuo/app/core_module/trade/view/adapter/TradeItemAdapter.java

@@ -187,8 +187,12 @@ public class TradeItemAdapter extends RecyclerView.Adapter<TradeItemAdapter.Trad
         holder.review.setText("浏览" + bean.getReview());
 
         //加载thumbs
-        GridViewAdapter gridViewAdapter = new GridViewAdapter(context, bean.getThumbs(), bean.getPics());
+        List<String> thumbs = bean.getThumbs().size() > 3 ? bean.getThumbs().subList(0, 3) : bean.getThumbs();
+        List<String> pics = bean.getPics().size() > 3 ? bean.getPics().subList(0, 3) : bean.getPics();
+        GridViewAdapter gridViewAdapter = new GridViewAdapter(context, thumbs, pics);
         gridViewAdapter.imgSizeBlank = ScreenUtil.dip2px(20);
+        gridViewAdapter.parentWidth = holder.imgGridView.getMeasuredWidth();
+        Log.e("GridWidth", ""+gridViewAdapter.parentWidth);
         if (bean.getThumbs().size() > 4) {
             //默认为两列，如果超过4张图则显示为3列
             holder.imgGridView.setNumColumns(3);
@@ -197,7 +201,6 @@ public class TradeItemAdapter extends RecyclerView.Adapter<TradeItemAdapter.Trad
         }
         holder.imgGridView.setAdapter(gridViewAdapter);
 
-
         //预加载
         //如果为搜索结果模式，停止预加载
         if (IS_SEARCH_MODE) return;

app/src/com/sheishuo/app/impl/SheishuoTeamMessageActivity.java

@@ -456,6 +456,19 @@ public class SheishuoTeamMessageActivity extends TeamMessageActivity {
         return false;
     }
 
+    public static boolean isSystemTeam(String teamId){
+        Team team = NIMClient.getService(TeamService.class).queryTeamBlock(teamId);
+        if(team == null)
+            return false;
+
+        if (Integer.parseInt(team.getCreator()) < 20000)
+        {
+            return true;
+        }
+
+        return false;
+    }
+
 
     private void showClearChatHistoryDialog(){
         /* @setIcon 设置对话框图标

app/src/com/sheishuo/app/main/activity/RequestActivity.java

@@ -24,6 +24,7 @@ import com.sheishuo.app.common.util.net.NetImpl;
 import com.sheishuo.app.common.util.net.ResponseCallback;
 import com.sheishuo.app.common.views.BaseToolbar;
 import com.sheishuo.app.core_module.friends.activity.ContactsListActivity;
+import com.sheishuo.app.core_module.mine.view.ui.activity.UserInfoDetailActivity;
 import com.sheishuo.app.impl.SheishuoUI;
 import com.sheishuo.app.impl.SheishuoUIKit;
 import com.sheishuo.app.main.adapter.RequestAdapter;
@@ -112,6 +113,10 @@ public class RequestActivity extends SheishuoUI {
                         joinTeam(targetTeam, bean);
                     }
                 }
+                else if(bean.getType().equals("2"))
+                {
+                    UserInfoDetailActivity.start(context, bean.getUser_id());
+                }
             }
 
             @Override
@@ -143,7 +148,19 @@ public class RequestActivity extends SheishuoUI {
                 @Override
                 public void onSuccess(Team team) {
                     makeToast("已经加入群"+team.getName());
-                    removeRequest(bean);
+                    DialogMaker.showProgressDialog(context, "", false);
+                    net.requestDelete(bean.getId(), new ResponseCallback() {
+                        @Override
+                        public void onSuccess(Object object) {
+                            DialogMaker.dismissProgressDialog();
+                            removeRequest(bean);
+                        }
+
+                        @Override
+                        public void onFailed(String error) {
+                            DialogMaker.dismissProgressDialog();
+                        }
+                    });
                 }
 
                 @Override

app/src/com/sheishuo/app/main/adapter/CircleListAdapter.java

@@ -14,6 +14,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -103,6 +104,7 @@ public class CircleListAdapter  extends RecyclerView.Adapter<CircleListAdapter.C
         holder.usernameTV.setText(getUserName(bean.getUser_id()));
         holder.usernameTV.setOnClickListener(this);
         holder.usernameTV.setTag(bean);
+        holder.locationTV.setText(bean.getLocal());
 
         holder.deleteTV.setVisibility(bean.getUser_id().equals(AccountCache.getAccount().getId())? View.VISIBLE : View.GONE);
         holder.deleteTV.setOnClickListener(new View.OnClickListener() {
@@ -131,6 +133,7 @@ public class CircleListAdapter  extends RecyclerView.Adapter<CircleListAdapter.C
         holder.gridView.setNumColumns(3);
         GridViewAdapter gridViewAdapter = new GridViewAdapter(context,bean.getThumbs(),bean.getPics());
         gridViewAdapter.imgSizeBlank = ScreenUtil.dip2px(5);
+        gridViewAdapter.parentWidth = holder.gridView.getMeasuredWidth();
         holder.gridView.setAdapter(gridViewAdapter);
         holder.gridView.setVisibility(bean.getThumbs().size() > 0 ? View.VISIBLE : View.GONE);
 
@@ -467,7 +470,8 @@ public class CircleListAdapter  extends RecyclerView.Adapter<CircleListAdapter.C
                 ,likedUserTV
                 ,commentTV
                 ,firstCommentTV
-                ,secondCommentTV;
+                ,secondCommentTV
+                ,locationTV;
         private ImgGridView gridView;
         private ImageView avatar
                 ,likedImg
@@ -498,6 +502,7 @@ public class CircleListAdapter  extends RecyclerView.Adapter<CircleListAdapter.C
             //firstCommentImg = (ImageView) v.findViewById(R.id.circle_comment_first_img);
             //secondCommentImg = (ImageView) v.findViewById(R.id.circle_comment_second_img);
 
+            locationTV = (TextView) v.findViewById(R.id.circle_local);
         }
     }
 }

app/src/com/sheishuo/app/main/adapter/RequestAdapter.java

@@ -62,6 +62,15 @@ public class RequestAdapter extends RecyclerView.Adapter<RequestAdapter.RequestV
         holder.layout.setTag(bean);
         holder.acceptBtn.setTag(bean);
 
+        if(bean.getType().equals("2"))
+        {
+            holder.acceptBtn.setText("查看");
+        }
+        else
+        {
+            holder.acceptBtn.setText("接受");
+        }
+
         NimUserInfo nimUserInfo = NIMClient.getService(UserService.class).getUserInfo(bean.getUser_id());
         if(nimUserInfo == null)
         {

app/src/com/sheishuo/app/main/fragment/CircleOfFriendsFragment.java

@@ -305,6 +305,13 @@ public class CircleOfFriendsFragment extends MainTabFragment{
                     adapter.addAll(bean);
                     adapter.notifyDataSetChanged();
                 }
+
+                getHandler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        adapter.notifyDataSetChanged();
+                    }
+                }, 1000);
             }
         });
     }

app/src/com/sheishuo/app/main/fragment/TradeListFragment.java

@@ -341,6 +341,13 @@ public class TradeListFragment extends MainTabFragment {
 
                 }
             });
+
+            getHandler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    adapter.notifyDataSetChanged();
+                }
+            }, 1000);
         }
     }
 

app/src/com/sheishuo/app/session/SessionHelper.java

@@ -17,6 +17,7 @@ import com.netease.nimlib.sdk.team.model.TeamMember;
 import com.sheishuo.app.SheishuoCache;
 import com.sheishuo.app.contact.activity.UserProfileActivity;
 import com.sheishuo.app.core_module.mine.view.ui.activity.UserInfoDetailActivity;
+import com.sheishuo.app.impl.SheishuoTeamMessageActivity;
 import com.sheishuo.app.impl.SheishuoUIKit;
 import com.sheishuo.app.session.action.AVChatAction;
 import com.sheishuo.app.session.action.FileAction;
@@ -428,7 +429,13 @@ public class SessionHelper {
 
                 //Intent intent = new Intent(context, UserInfoDetailActivity.class);
 
-                UserInfoDetailActivity.start(context,message.getFromAccount());
+                if(message.getSessionType() == SessionTypeEnum.Team && !SheishuoTeamMessageActivity.isSystemTeam(message.getSessionId()))
+                {
+                    UserInfoDetailActivity.start(context, message.getFromAccount(), message.getSessionId());
+                }
+                else {
+                    UserInfoDetailActivity.start(context, message.getFromAccount());
+                }
             }
 
             @Override