Browse Source

管理群问题(待测试)、群成员显示问题、名片个ios合成

gongpm 10 years ago
parent
commit
8d4ec2adb5

+ 7 - 4
WeiChat/src/main/AndroidManifest.xml

@@ -100,12 +100,12 @@ b
         <activity android:name=".ui.erp.activity.WorkExtraActivity" />
         <activity android:name=".ui.erp.activity.TravelActivity" />
         <activity android:name=".ui.erp.activity.SaleSelectActivity" />
-        <activity android:name=".ui.message.SelectActivity"/>
+        <activity android:name=".ui.message.SelectActivity" />
         <activity android:name=".ui.erp.activity.SaleChartActivity" />
         <activity android:name=".ui.erp.activity.QueryActivity" />
         <activity android:name=".ui.erp.activity.ErpMenActivity" />
         <activity android:name=".ui.erp.activity.DbfindListActivity" />
-        <activity android:name=".ui.circle.view.CardInfoActivity"/>
+        <activity android:name=".ui.circle.view.CardInfoActivity" />
         <activity
             android:name=".ui.erp.activity.AddTaskActivity"
             android:configChanges="orientation|keyboardHidden"
@@ -224,7 +224,8 @@ b
             android:name="com.baidu.location.f"
             android:enabled="true"
             android:process=":remote" />
-       <meta-data
+
+        <meta-data
             android:name="com.baidu.lbsapi.API_KEY"
             android:value="KxANrz9HRWVqGGCm2cN8mXarpW0bBuYA" />
         <!-- 文件选择的activity -->
@@ -388,7 +389,9 @@ b
         </receiver>
 
         <activity android:name=".ui.erp.activity.CompanyActivity" />
-        <activity android:name=".ui.erp.activity.BaseInfoActivity"/>
+        <activity android:name=".ui.erp.activity.BaseInfoActivity" />
+        <activity android:name=".ui.erp.activity.ClientActivity" >
+        </activity>
     </application>
 
 </manifest>

+ 0 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -237,7 +237,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 				}, String.class, params, true);
 		mRequest.setTag(requestTag);
 		addDefaultRequest(mRequest);*/
-
         ViewUtil.LoginTask(phone, password, mContext);
 
     }

+ 15 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/ClientActivity.java

@@ -0,0 +1,15 @@
+package com.xzjmyk.pm.activity.ui.erp.activity;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+import com.xzjmyk.pm.activity.R;
+
+public class ClientActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_client);
+    }
+}

+ 2 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/DBManager.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteStatement;
+import android.util.Log;
 
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.entity.Hrorgs;
@@ -367,6 +368,7 @@ public class DBManager {
         String orderBy = null;
         Cursor cursor = db.query(table, null, selection, selectionArgs, groupBy, having, orderBy);
         while (cursor.moveToNext()) {
+            Log.i("gongpengming","进来一次   说明有人获取到了");
             EmployeesEntity model = new EmployeesEntity();
             model.setEM_CODE(cursor.getString(cursor.getColumnIndex("em_code")));
             model.setEm_defaultorid(cursor.getInt(cursor.getColumnIndex("em_defaultorid")));

+ 7 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -11,6 +11,7 @@ import android.widget.RelativeLayout;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.ClientActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
@@ -45,6 +46,8 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
     private RelativeLayout my_data_rl;
     @ViewInject(R.id.goods_find)
     private RelativeLayout goods_find;
+    @ViewInject(R.id.my_client_rl)
+    private RelativeLayout my_client_rl;
     private FastVolley mFastVolley = MyApplication.getInstance().getFastVolley();
     private AppConfig config;
     private String mLoginUserId;
@@ -74,6 +77,7 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
         setting_rl.setOnClickListener(this);
         my_friend_rl.setOnClickListener(this);
         my_data_rl.setOnClickListener(this);
+        my_client_rl.setOnClickListener(this);
         if (MainActivity.isUnReadWork)
             iv_remain.setVisibility(View.VISIBLE);
         else
@@ -92,10 +96,12 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
             case R.id.rl_uas_sys:
                 ct.startActivity(new Intent(ct, ErpMenActivity.class));
                 break;
+            case R.id.my_client_rl:
+                ct.startActivity(new Intent(ct, ClientActivity.class));
+                break;
             case R.id.my_friend_rl:
                 iv_remain.setVisibility(View.GONE);
                 MainActivity.isUnReadWork = false;
-
                 Intent intent = new Intent(getActivity(), BusinessCircleActivity.class);
                 intent.putExtra(AppConstant.EXTRA_CIRCLE_TYPE, AppConstant.CIRCLE_TYPE_MY_BUSINESS);
                 if (MainActivity.timeMin != -1 && MainActivity.timeMin != PreferenceUtils.getLong(getActivity(), MainActivity.TIME_MAIN)) {

+ 6 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/ViewUtil.java

@@ -229,12 +229,14 @@ public class ViewUtil {
                     Log.i("result", "result:" + result);
                     if (result != null) {
                         if (bundle == null || message == null) {
+
                             Bundle bundle = new Bundle();
                             Message message = new Message();
                             bundle.putString("result", result);
                             message.setData(bundle);
                             message.what = what;
                             handler.sendMessage(message);
+
                         } else {
                             bundle.putString("result", result);
                             message.setData(bundle);
@@ -242,10 +244,10 @@ public class ViewUtil {
                             handler.sendMessage(message);
                         }
                     } else {
-                        // ToastMessage(ct, "服务器未知错误!");
+
                     }
                 } else {
-                    // ToastMessage(ct, "网络未连接!");
+
 
                 }
             }
@@ -319,6 +321,7 @@ public class ViewUtil {
 
     // 登录B2B
     public static void LoginB2BTask(String phone, String password) {
+
         mdProcessDialog.setContent("正在验证B2B...");
         String url = Constants.serviceURL;
         Map<String, String> params = new HashMap<String, String>();
@@ -349,7 +352,6 @@ public class ViewUtil {
                     LoginSucess(msg);
                     break;
                 case Constants.SUCCESS_ERP://切换公司成功
-
                     String result = msg.getData().getString("result");
                     boolean success = JSON.parseObject(result).getBoolean("success");
                     if (success) {
@@ -359,6 +361,7 @@ public class ViewUtil {
                         ChangeStatusERP(msg.getData().getString("result"));
                     } else {
                         String reason = JSON.parseObject(result).getString("reason");
+
                         ToastMessage(ct, reason);
                     }
                     break;

+ 2 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/ViewUtil.java

@@ -59,6 +59,7 @@ public class ViewUtil {
                     Log.i("result:","url="+url);
                     HttpUtil.Response result = httpSendTask(url, params, headers, request);
                     if (result != null) {
+
                         prinltResponseInfo(result, url, params);
                         if (result.getStatusCode() == 200) {
                             if (bundle == null || message == null) {
@@ -117,6 +118,7 @@ public class ViewUtil {
     }
 
     private static void prinltResponseInfo(HttpUtil.Response result, String url, Map<String, Object> params) {
+
         Log.i("result", "http 请求-----------------------------------------");
         Log.i("result", "result:" + result);
         Log.i("result", "url:" + url);

+ 510 - 502
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/AutoCreateChatFragment.java

@@ -1,7 +1,6 @@
 package com.xzjmyk.pm.activity.ui.groupchat;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -27,13 +26,11 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.parser.deserializer.IntegerFieldDeserializer;
 import com.android.volley.Response;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.lidroid.xutils.util.LogUtils;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
@@ -75,515 +72,526 @@ import java.util.List;
 import java.util.Map;
 
 public class AutoCreateChatFragment extends EasyFragment {
-	private PullToRefreshListView mPullToRefreshListView;
-	private List<MucRoom> mMucRooms;
-	private MucRoomAdapter mAdapter;
-	private int mPageIndex = 0;
-	private BaseActivity mActivity;
-	private boolean mNeedUpdate = true;
-	private Context mContext;
-	private BroadcastReceiver mUpdateReceiver = new BroadcastReceiver() {
-		@Override
-		public void onReceive(Context context, Intent intent) {
-			if (intent.getAction().equals(MucgroupUpdateUtil.ACTION_UPDATE)) {
-				if (isResumed()) {
-					requestData(true);
-				} else {
-					mNeedUpdate = true;
-				}
-			}
-		}
-	};
-
-	public AutoCreateChatFragment() {
-		mMucRooms = new ArrayList<MucRoom>();
-		mAdapter = new MucRoomAdapter();
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setHasOptionsMenu(true);
-		getActivity().registerReceiver(mUpdateReceiver,
-				MucgroupUpdateUtil.getUpdateActionFilter());
-
-	}
-
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-		getActivity().unregisterReceiver(mUpdateReceiver);
-	}
-
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		inflater.inflate(R.menu.menu_add_icon, menu);
-		super.onCreateOptionsMenu(menu, inflater);
-	}
-    
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		if (item.getItemId() == R.id.add_item) {
-			startActivity(new Intent(getActivity(),
-					SelectContactsActivity.class));
-		}
-		return super.onOptionsItemSelected(item);
-	}
-
-	@Override
-	protected int inflateLayoutId() {
-		return R.layout.layout_pullrefresh_list;
-	}
-
-	@Override
-	protected void onCreateView(Bundle savedInstanceState, boolean createView) {
-		if (createView) {
-			initView();
-		}
-	}
-
-	@SuppressLint("InflateParams")
-	private void initView() {
-		mContext=getActivity();
-		mContext.bindService(CoreService.getIntent(), mServiceConnection, Context.BIND_AUTO_CREATE);
-		mConfig = MyApplication.getInstance().getConfig();
-
-		mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.pull_refresh_list);
-		mPullToRefreshListView.setAdapter(mAdapter);
-
-		View emptyView = LayoutInflater.from(getActivity()).inflate(
-				R.layout.layout_list_empty_view, null);
-		mPullToRefreshListView.setEmptyView(emptyView);
-
-		mPullToRefreshListView.getRefreshableView().setAdapter(mAdapter);
-
-		mPullToRefreshListView
-				.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
-					@Override
-					public void onPullDownToRefresh(
-							PullToRefreshBase<ListView> refreshView) {
-						requestData(true);
-					}
-
-					@Override
-					public void onPullUpToRefresh(
-							PullToRefreshBase<ListView> refreshView) {
-						requestData(false);
-					}
-				});
-
-		/**@注释:点击进入房间的逻辑 */
-		mPullToRefreshListView.getRefreshableView().setOnItemClickListener(
-				new AdapterView.OnItemClickListener() {
-					@Override
-					public void onItemClick(AdapterView<?> parent, View view,
-											int position, long id) {
-						MucRoom room = mMucRooms.get((int) id);
-						String loginUserId = MyApplication.getInstance().mLoginUser
-								.getUserId();
-						Friend friend = FriendDao.getInstance().getFriend(
-								loginUserId, room.getJid());
-						if (friend == null) {// friend为null,说明之前没加入过该房间,那么调用接口加入
-							// 将房间作为一个好友存到好友表
-							joinRoom(room, loginUserId);
-						} else {
-							interMucChat(room.getJid(), room.getName());
-						}
-
-					}
-				});
-	}
-
-	private void interMucChat(String roomJid, String roomName) {
-		Intent intent = new Intent(getActivity(), MucChatActivity.class);
-		intent.putExtra(AppConstant.EXTRA_USER_ID, roomJid);
-		intent.putExtra(AppConstant.EXTRA_NICK_NAME, roomName);
-		intent.putExtra(AppConstant.EXTRA_IS_GROUP_CHAT, true);
-		startActivity(intent);
-	}
-
-	private void joinRoom(final MucRoom room, final String loginUserId) {
-		Log.d("roamer","joinRoom");
-		HashMap<String, String> params = new HashMap<String, String>();
-		params.put("access_token", MyApplication.getInstance().mAccessToken);
-		params.put("roomId", room.getId());
-		if (room.getUserId() == loginUserId)
-			params.put("type", "1");
-		else
-			params.put("type", "2");
-
-		final ProgressDialog dialog = ProgressDialogUtil.init(getActivity(),
-				null, getString(R.string.please_wait));
-		ProgressDialogUtil.show(dialog);
-
-		StringJsonArrayRequest<Void> request = new StringJsonArrayRequest<Void>(
-				mActivity.mConfig.ROOM_JOIN, new ErrorListener() {
-					@Override
-					public void onErrorResponse(VolleyError arg0) {
-						ToastUtil.showErrorNet(getActivity());
-						ProgressDialogUtil.dismiss(dialog);
-					}
-				}, new StringJsonArrayRequest.Listener<Void>() {
-					@Override
-					public void onResponse(ArrayResult<Void> result) {
-						boolean success = Result.defaultParser(getActivity(),
-								result, true);
-						if (success) {
-							Friend friend = new Friend();// 将房间也存为好友
-							friend.setOwnerId(loginUserId);
-							friend.setUserId(room.getJid());
-							friend.setNickName(room.getName());
-							friend.setDescription(room.getDesc());
-							friend.setRoomFlag(1);
-							friend.setRoomId(room.getId());
-							friend.setRoomCreateUserId(room.getUserId());
-							// timeSend作为取群聊离线消息的标志,所以要在这里设置一个初始值
-							friend.setTimeSend(TimeUtils.sk_time_current_time());
-							friend.setStatus(Friend.STATUS_FRIEND);
-							FriendDao.getInstance()
-									.createOrUpdateFriend(friend);//创建或者更新好友...
-
-							interMucChat(room.getJid(), room.getName());
-						}
-						ProgressDialogUtil.dismiss(dialog);
-					}
-				}, Void.class, params);
-		mActivity.addDefaultRequest(request);
-
-	}
-
-	@Override
-	public void onResume() {
-		super.onResume();
-		if (mNeedUpdate) {
-			mNeedUpdate = false;
-			mPullToRefreshListView.post(new Runnable() {
-				@Override
-				public void run() {
+    private PullToRefreshListView mPullToRefreshListView;
+    private List<MucRoom> mMucRooms;
+    private MucRoomAdapter mAdapter;
+    private int mPageIndex = 0;
+    private BaseActivity mActivity;
+    private boolean mNeedUpdate = true;
+    private Context mContext;
+    private BroadcastReceiver mUpdateReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent.getAction().equals(MucgroupUpdateUtil.ACTION_UPDATE)) {
+                if (isResumed()) {
+                    requestData(true);
+                } else {
+                    mNeedUpdate = true;
+                }
+            }
+        }
+    };
+
+    public AutoCreateChatFragment() {
+        Log.i("gongpengming", "AutoCreateChatFragment");
+        mMucRooms = new ArrayList<MucRoom>();
+        mAdapter = new MucRoomAdapter();
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+        getActivity().registerReceiver(mUpdateReceiver,
+                MucgroupUpdateUtil.getUpdateActionFilter());
+
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        getActivity().unregisterReceiver(mUpdateReceiver);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.menu_add_icon, menu);
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.add_item) {
+            startActivity(new Intent(getActivity(),
+                    SelectContactsActivity.class));
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    protected int inflateLayoutId() {
+        return R.layout.layout_pullrefresh_list;
+    }
+
+    @Override
+    protected void onCreateView(Bundle savedInstanceState, boolean createView) {
+        if (createView) {
+            initView();
+        }
+    }
+
+    @SuppressLint("InflateParams")
+    private void initView() {
+        mContext = getActivity();
+        mContext.bindService(CoreService.getIntent(), mServiceConnection, Context.BIND_AUTO_CREATE);
+        mConfig = MyApplication.getInstance().getConfig();
+
+        mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.pull_refresh_list);
+        mPullToRefreshListView.setAdapter(mAdapter);
+
+        View emptyView = LayoutInflater.from(getActivity()).inflate(
+                R.layout.layout_list_empty_view, null);
+        mPullToRefreshListView.setEmptyView(emptyView);
+
+        mPullToRefreshListView.getRefreshableView().setAdapter(mAdapter);
+
+        mPullToRefreshListView
+                .setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
+                    @Override
+                    public void onPullDownToRefresh(
+                            PullToRefreshBase<ListView> refreshView) {
+                        requestData(true);
+                    }
+
+                    @Override
+                    public void onPullUpToRefresh(
+                            PullToRefreshBase<ListView> refreshView) {
+                        requestData(false);
+                    }
+                });
+
+
+        mPullToRefreshListView.getRefreshableView().setOnItemClickListener(
+                new AdapterView.OnItemClickListener() {
+                    @Override
+                    public void onItemClick(AdapterView<?> parent, View view,
+                                            int position, long id) {
+                        MucRoom room = mMucRooms.get((int) id);
+                        String loginUserId = MyApplication.getInstance().mLoginUser
+                                .getUserId();
+                        Friend friend = FriendDao.getInstance().getFriend(
+                                loginUserId, room.getJid());
+                        if (friend == null) {// friend为null,说明之前没加入过该房间,那么调用接口加入
+                            // 将房间作为一个好友存到好友表
+                            joinRoom(room, loginUserId);
+                        } else {
+                            interMucChat(room.getJid(), room.getName());
+                        }
+
+                    }
+                });
+    }
+
+    private void interMucChat(String roomJid, String roomName) {
+        Intent intent = new Intent(getActivity(), MucChatActivity.class);
+        intent.putExtra(AppConstant.EXTRA_USER_ID, roomJid);
+        intent.putExtra(AppConstant.EXTRA_NICK_NAME, roomName);
+        intent.putExtra(AppConstant.EXTRA_IS_GROUP_CHAT, true);
+        startActivity(intent);
+    }
+
+    private void joinRoom(final MucRoom room, final String loginUserId) {
+        Log.d("roamer", "joinRoom");
+        HashMap<String, String> params = new HashMap<String, String>();
+        params.put("access_token", MyApplication.getInstance().mAccessToken);
+        params.put("roomId", room.getId());
+        if (room.getUserId() == loginUserId)
+            params.put("type", "1");
+        else
+            params.put("type", "2");
+
+        final ProgressDialog dialog = ProgressDialogUtil.init(getActivity(),
+                null, getString(R.string.please_wait));
+        ProgressDialogUtil.show(dialog);
+
+        StringJsonArrayRequest<Void> request = new StringJsonArrayRequest<Void>(
+                mActivity.mConfig.ROOM_JOIN, new ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError arg0) {
+                ToastUtil.showErrorNet(getActivity());
+                ProgressDialogUtil.dismiss(dialog);
+            }
+        }, new StringJsonArrayRequest.Listener<Void>() {
+            @Override
+            public void onResponse(ArrayResult<Void> result) {
+                boolean success = Result.defaultParser(getActivity(),
+                        result, true);
+                if (success) {
+                    Friend friend = new Friend();// 将房间也存为好友
+                    friend.setOwnerId(loginUserId);
+                    friend.setUserId(room.getJid());
+                    friend.setNickName(room.getName());
+                    friend.setDescription(room.getDesc());
+                    friend.setRoomFlag(1);
+                    friend.setRoomId(room.getId());
+                    friend.setRoomCreateUserId(room.getUserId());
+                    // timeSend作为取群聊离线消息的标志,所以要在这里设置一个初始值
+                    friend.setTimeSend(TimeUtils.sk_time_current_time());
+                    friend.setStatus(Friend.STATUS_FRIEND);
+                    FriendDao.getInstance()
+                            .createOrUpdateFriend(friend);//创建或者更新好友...
+
+                    interMucChat(room.getJid(), room.getName());
+                }
+                ProgressDialogUtil.dismiss(dialog);
+            }
+        }, Void.class, params);
+        mActivity.addDefaultRequest(request);
+
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mNeedUpdate) {
+            mNeedUpdate = false;
+            mPullToRefreshListView.post(new Runnable() {
+                @Override
+                public void run() {
 //					mPullToRefreshListView.setPullDownRefreshing(200);
-					autoCreateManageGruop();
-				}
-			});
-		}
-	}
-
-	@Override
-	public void onActivityCreated(Bundle savedInstanceState) {
-		super.onActivityCreated(savedInstanceState);
-		mActivity = (BaseActivity) getActivity();
-	}
-
-	private void requestData(final boolean isPullDwonToRefersh) {
-		if (isPullDwonToRefersh) {
-			mPageIndex = 0;
-		}
-		HashMap<String, String> params = new HashMap<String, String>();
-		params.put("pageIndex", String.valueOf(mPageIndex));
-		params.put("pageSize", String.valueOf(AppConfig.PAGE_SIZE));
-		params.put("access_token", MyApplication.getInstance().mAccessToken);
-		Log.i("Arison", "获取群主列表:" + mActivity.mConfig.ROOM_LIST_HIS);
-		Log.i("Arison", "参数:" + JSON.toJSONString(params));
-		StringJsonArrayRequest<MucRoom> request = new StringJsonArrayRequest<MucRoom>(
-				mActivity.mConfig.ROOM_LIST_HIS, new ErrorListener() {
-					@Override
-					public void onErrorResponse(VolleyError arg0) {
-						ToastUtil.showErrorNet(getActivity());
-						mPullToRefreshListView.onRefreshComplete();
-					}
-				}, new StringJsonArrayRequest.Listener<MucRoom>() {
-					@Override
-					public void onResponse(ArrayResult<MucRoom> result) {
-
-						boolean success = Result.defaultParser(getActivity(),
-								result, true);
-						if (success) {
-							mPageIndex++;
-							if (isPullDwonToRefersh) {
-								mMucRooms.clear();
-							}
-							List<MucRoom> datas = result.getData();
-							Log.i("Arison","datas:"+JSON.toJSONString(datas));
-							//只展示类别是1的管理群
-							List<MucRoom> dataTemp=new ArrayList<>();
-							if (datas != null && datas.size() > 0) {
-								for (int i=0;i<datas.size();i++){
-									if (datas.get(i).getCategory()==1){
-										dataTemp.add(datas.get(i));
-									}
-								}
-								mMucRooms.addAll(dataTemp);
-							}
-							mAdapter.notifyDataSetChanged();
-						}
-						mPullToRefreshListView.onRefreshComplete();
-					}
-				}, MucRoom.class, params);
-		mActivity.addDefaultRequest(request);
-	}
-
-	public class MucRoomAdapter extends BaseAdapter {
-
-		@Override
-		public int getCount() {
-			return mMucRooms.size();
-		}
-
-		@Override
-		public Object getItem(int position) {
-			return mMucRooms.get(position);
-		}
-
-		@Override
-		public long getItemId(int position) {
-			return position;
-		}
-
-		@Override
-		public View getView(final int position, View convertView,
-				ViewGroup parent) {
-			if (convertView == null) {
-				convertView = LayoutInflater.from(getActivity()).inflate(
-						R.layout.row_muc_room, parent, false);
-			}
-			ImageView avatar_img = ViewHolder.get(convertView, R.id.avatar_img);
-			TextView nick_name_tv = ViewHolder.get(convertView,
-					R.id.nick_name_tv);
-			TextView content_tv = ViewHolder.get(convertView, R.id.content_tv);
-			TextView time_tv = ViewHolder.get(convertView, R.id.time_tv);
-
-			final MucRoom room = mMucRooms.get(position);
-			AvatarHelper.getInstance().displayAvatar(room.getUserId(),
-					avatar_img, true);
-
-			nick_name_tv.setText(room.getName());
-			time_tv.setText(TimeUtils.getFriendlyTimeDesc(getActivity(),
-					(int) room.getCreateTime()));
-			content_tv.setText(room.getDesc());
-			return convertView;
-		}
-
-	}
+                    autoCreateManageGruop();
+                }
+            });
+        }
+
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        requestData(true);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        mActivity = (BaseActivity) getActivity();
+    }
+
+    private void requestData(final boolean isPullDwonToRefersh) {
+        if (isPullDwonToRefersh) {
+            mPageIndex = 0;
+        }
+        HashMap<String, String> params = new HashMap<String, String>();
+        params.put("pageIndex", String.valueOf(mPageIndex));
+        params.put("pageSize", String.valueOf(AppConfig.PAGE_SIZE));
+        params.put("access_token", MyApplication.getInstance().mAccessToken);
+        Log.i("Arison", "获取群主列表:" + mActivity.mConfig.ROOM_LIST_HIS);
+        Log.i("Arison", "参数:" + JSON.toJSONString(params));
+        StringJsonArrayRequest<MucRoom> request = new StringJsonArrayRequest<MucRoom>(
+                mActivity.mConfig.ROOM_LIST_HIS, new ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError arg0) {
+                ToastUtil.showErrorNet(getActivity());
+                mPullToRefreshListView.onRefreshComplete();
+            }
+        }, new StringJsonArrayRequest.Listener<MucRoom>() {
+            @Override
+            public void onResponse(ArrayResult<MucRoom> result) {
+
+                boolean success = Result.defaultParser(getActivity(),
+                        result, true);
+                if (success) {
+                    mPageIndex++;
+                    if (isPullDwonToRefersh) {
+                        mMucRooms.clear();
+                    }
+                    List<MucRoom> datas = result.getData();
+                    Log.i("Arison", "datas:" + JSON.toJSONString(datas));
+                    //只展示类别是1的管理群
+                    List<MucRoom> dataTemp = new ArrayList<>();
+                    if (datas != null && datas.size() > 0) {
+                        for (int i = 0; i < datas.size(); i++) {
+                            if (datas.get(i).getCategory() == 1) {
+                                dataTemp.add(datas.get(i));
+                            }
+                        }
+                        mMucRooms.addAll(dataTemp);
+                    }
+                    mAdapter.notifyDataSetChanged();
+                }
+                mPullToRefreshListView.onRefreshComplete();
+            }
+        }, MucRoom.class, params);
+        mActivity.addDefaultRequest(request);
+    }
+
+    public class MucRoomAdapter extends BaseAdapter {
+
+        @Override
+        public int getCount() {
+            return mMucRooms.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mMucRooms.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(final int position, View convertView,
+                            ViewGroup parent) {
+            if (convertView == null) {
+                convertView = LayoutInflater.from(getActivity()).inflate(
+                        R.layout.row_muc_room, parent, false);
+            }
+            ImageView avatar_img = ViewHolder.get(convertView, R.id.avatar_img);
+            TextView nick_name_tv = ViewHolder.get(convertView,
+                    R.id.nick_name_tv);
+            TextView content_tv = ViewHolder.get(convertView, R.id.content_tv);
+            TextView time_tv = ViewHolder.get(convertView, R.id.time_tv);
+
+            final MucRoom room = mMucRooms.get(position);
+            AvatarHelper.getInstance().displayAvatar(room.getUserId(),
+                    avatar_img, true);
+
+            nick_name_tv.setText(room.getName());
+            time_tv.setText(TimeUtils.getFriendlyTimeDesc(getActivity(),
+                    (int) room.getCreateTime()));
+            content_tv.setText(room.getDesc());
+            return convertView;
+        }
+
+    }
 
     /**
      * @desc:自定创建管理群
      * @author:Administrator on 2016/5/13 11:27
-	 * 	//遍历组织架构
-	 *部门人员人数小于2的群不创建
-	 *默认把部门的上级部门的领导人拉进来做群主
-	 *群内人数等于:上级部门领导人   小于2的群不创建
-	 *组织架构叶子节点的不创建群,比如移动终端群不创建,只创建产品研发群,群里面只放领导人;
-	 *根据组织架构表中的or_headmancode 来获取员工表中的员工信息(IMID)
-	 *怎样判断创建群的操作已经结束?
+     * //遍历组织架构
+     * 部门人员人数小于2的群不创建
+     * 默认把部门的上级部门的领导人拉进来做群主
+     * 群内人数等于:上级部门领导人   小于2的群不创建
+     * 组织架构叶子节点的不创建群,比如移动终端群不创建,只创建产品研发群,群里面只放领导人;
+     * 根据组织架构表中的or_headmancode 来获取员工表中的员工信息(IMID)
+     * 怎样判断创建群的操作已经结束?
      */
-	public void autoCreateManageGruop(){
-		 DBManager db=new DBManager(mContext);
-		 String master= CommonUtil.getSharedPreferences(mContext, "erp_master");
-		 String emCode=CommonUtil.getSharedPreferences(mContext,"erp_username");
-		 //查找本地数据库,管理群存在,则不创建
-		 List<HrorgsEntity> hlist=db.queryHrorgList(new String[]{master,emCode}, "whichsys=? and or_headmancode=?");
-		 if(!ListUtils.isEmpty(hlist)){
-			 if (hlist.get(0).getOr_remark()==1){
-				 Log.i("Arison", "管理群已经创建");
-				 mPullToRefreshListView.setPullDownRefreshing(200);
-				 return;
-			 }
-			 String roomdesc="本群为管理群!";
-            for (int i=0;i<hlist.size();i++){
-				List<String> inviteUsers = new ArrayList<String>();//群组人员
-				int or_subof=hlist.get(i).getOr_subof();
-				int or_id=hlist.get(i).getOr_id();
-                String or_name=hlist.get(i).getOr_name();//群名字
-                String or_headmanname=hlist.get(i).getOr_name();//领导人名字  本群创建者
-			    String or_headmancode=hlist.get(i).getOr_headmancode();
-				if (StringUtils.isEmpty(or_headmanname)||StringUtils.isEmpty(or_headmancode))
-					continue;
-			    int im_id=	getEmployeeIMID(db, master, or_headmancode);
-				inviteUsers.add(String.valueOf(im_id));//本群领导人IMID
-
-				//获取上级部门
-				if (!StringUtils.isEmpty(or_headmanname)&&or_subof!=0){
-					//获取上级领导人的名字以及IMID
-					HrorgsEntity suplist= db.select_getRootData(new String[]{String.valueOf(or_subof), master}, "or_id=? and whichsys=?");
-					if (suplist!=null){
-						String  parentName=suplist.getOr_headmanname();
-						String parentCode=suplist.getOr_headmancode();
-						im_id=	getEmployeeIMID(db, master, parentCode);
-						inviteUsers.add(String.valueOf(im_id));////上级领导人IMID
-					}
-				}
+    public void autoCreateManageGruop() {
+        DBManager db = new DBManager(mContext);
+        String master = CommonUtil.getSharedPreferences(mContext, "erp_master");
+        String emCode = CommonUtil.getSharedPreferences(mContext, "erp_username");
+        //查找本地数据库,管理群存在,则不创建
+        List<HrorgsEntity> hlist = db.queryHrorgList(new String[]{master, emCode}, "whichsys=? and or_headmancode=?");
+        if (ListUtils.isEmpty(hlist)) {
+            if (hlist.get(0).getOr_remark() == 1) {
+                mPullToRefreshListView.setPullDownRefreshing(200);
+                return;
+            }
+            String roomdesc = "本群为管理群!";
+            for (int i = 0; i < hlist.size(); i++) {
+                List<String> inviteUsers = new ArrayList<String>();//群组人员
+                int or_subof = hlist.get(i).getOr_subof();
+                int or_id = hlist.get(i).getOr_id();
+                String or_name = hlist.get(i).getOr_name();//群名字
+                String or_headmanname = hlist.get(i).getOr_name();//领导人名字  本群创建者
+                String or_headmancode = hlist.get(i).getOr_headmancode();
+                if (StringUtils.isEmpty(or_headmanname) || StringUtils.isEmpty(or_headmancode))
+                    continue;
+                int im_id = getEmployeeIMID(db, master, or_headmancode);
+                inviteUsers.add(String.valueOf(im_id));//本群领导人IMID
+
+                //获取上级部门
+                if (!StringUtils.isEmpty(or_headmanname) && or_subof != 0) {
+                    //获取上级领导人的名字以及IMID
+                    HrorgsEntity suplist = db.select_getRootData(new String[]{String.valueOf(or_subof), master}, "or_id=? and whichsys=?");
+                    if (suplist != null) {
+                        String parentName = suplist.getOr_headmanname();
+                        String parentCode = suplist.getOr_headmancode();
+                        im_id = getEmployeeIMID(db, master, parentCode);
+                        inviteUsers.add(String.valueOf(im_id));////上级领导人IMID
+                    }
+                }
 
                 //分部门大于等于1才创建群
-				List<HrorgsEntity> chrildlist= db.queryHrorgList(new String[]{String.valueOf(or_id), master}, "or_subof=? and whichsys=?");
-                if(!ListUtils.isEmpty(chrildlist)){
-					if (chrildlist.size()>=1){
-						for (int j=0;j<chrildlist.size();j++){
-                            HrorgsEntity chrild=chrildlist.get(j);
-							String chrild_headmancode=chrild.getOr_headmancode();
-							String chrild_headmanname=chrild.getOr_headmanname();
-							if (StringUtils.isEmpty(chrild_headmancode)||StringUtils.isEmpty(chrild_headmanname))
-								continue;
-							im_id=	getEmployeeIMID(db, master, chrild_headmancode);
-							inviteUsers.add(String.valueOf(im_id));//分部门IMID
-						}
-						inviteUsers=removeDuplicate(inviteUsers);//去除重复数据
-						String userId=MyApplication.getInstance().mLoginUser.getUserId();
-						createGroupChat(or_headmanname,or_name,null,roomdesc,inviteUsers,or_id);
-					}
-				}
-
-
-			}
-		}else{
-			 Log.i("Arison",emCode+"不具备自动创建群的权限");
-		 }
-	}
-
-
-
-	private int getEmployeeIMID(DBManager db, String master, String or_headmancode) {
-		List<EmployeesEntity> elist = db.select_getEmployee(new String[]{or_headmancode,master}, "EM_CODE=? and WHICHSYS=?");
-		int em_imid= elist.get(0).getEm_IMID();
-		return em_imid;
-	}
-
-	/**@注释:去除重复数据  */
-	public  List<String>  removeDuplicate(List<String> list)  {
-		HashSet<String> h = new  HashSet<String>(list);
-		list.clear();
-		list.addAll(h);
-		return list;
-	}
-
-
-	public ProgressDialog mProgressDialog;
-	public AppConfig mConfig;
-	private CoreService mXmppService;
-
-
-	/**
-	 * @desc:房间名字:组织架构名字;房间描述
-	 * @author:Administrator on 2016/5/16 9:35
-	 */
-	private void createGroupChat(String nickName,final String roomName, String roomSubject, final String roomDesc,
-								 List<String> inviteUsers,final int or_id) {
-		Log.i("Arison","nickName:"+nickName);
-		Log.i("Arison","roomName:"+roomName);
-		Log.i("Arison","roomDesc:"+roomDesc);
-		Log.i("Arison","inviteUsers:"+JSON.toJSONString(inviteUsers));
-		final String roomJid = mXmppService.createMucRoom(nickName, roomName, roomSubject, roomDesc);
-		Log.i("Arison","roomJid:"+roomJid);
-		if (TextUtils.isEmpty(roomJid)) {
-			ToastUtil.showToast(mContext, R.string.create_room_failed);
-			return;
-		}
-
-		Map<String, String> params = new HashMap<String, String>();
-		params.put("access_token", MyApplication.getInstance().mAccessToken);
-		params.put("jid", roomJid);
-		params.put("name", roomName);
-		params.put("category","1");
-		params.put("desc", roomDesc);
-		params.put("countryId", String.valueOf(Area.getDefaultCountyId()));// 国家Id
-
-		Area area = Area.getDefaultProvince();
-		if (area != null) {
-			params.put("provinceId", String.valueOf(area.getId()));// 省份Id
-		}
-		area = Area.getDefaultCity();
-		if (area != null) {
-			params.put("cityId", String.valueOf(area.getId()));// 城市Id
-			area = Area.getDefaultDistrict(area.getId());
-			if (area != null) {
-				params.put("areaId", String.valueOf(area.getId()));// 城市Id
-			}
-		}
-
-		double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
-		double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
-		if (latitude != 0)
-			params.put("latitude", String.valueOf(latitude));
-		if (longitude != 0)
-			params.put("longitude", String.valueOf(longitude));
-
-		params.put("text", JSON.toJSONString(inviteUsers));
-
-		ProgressDialogUtil.show(mProgressDialog);
-		Log.i("Arison", "创建群url:" + mConfig.ROOM_ADD);
-		Log.i("Arison","创建群参数:"+JSON.toJSONString(params));
-		StringJsonObjectRequest<MucRoom> request = new StringJsonObjectRequest<MucRoom>(mConfig.ROOM_ADD,
-				new Response.ErrorListener() {
-					@Override
-					public void onErrorResponse(VolleyError arg0) {
-						ProgressDialogUtil.dismiss(mProgressDialog);
-						ToastUtil.showErrorNet(mContext);
-					}
-				}, new StringJsonObjectRequest.Listener<MucRoom>() {
-			@Override
-			public void onResponse(ObjectResult<MucRoom> result) {
-				boolean parserResult = Result.defaultParser(mContext, result, true);
-				if (parserResult && result.getData() != null) {
-					//createRoomSuccess(result.getData().getId(), roomJid, roomName, roomDesc);
-					mPullToRefreshListView.setPullDownRefreshing(200);//加载列表
-					updateCreateFalgToERP(or_id);
-				}
-				ProgressDialogUtil.dismiss(mProgressDialog);
-			}
-		}, MucRoom.class, params);
-		String HASHCODE = Integer.toHexString(this.hashCode()) + "@";
-		MyApplication.getInstance().getFastVolley().addDefaultRequest(HASHCODE, request);
-	}
-
- 
+                List<HrorgsEntity> chrildlist = db.queryHrorgList(new String[]{String.valueOf(or_id), master}, "or_subof=? and whichsys=?");
+                if (!ListUtils.isEmpty(chrildlist)) {
+                    if (chrildlist.size() >= 1) {
+                        for (int j = 0; j < chrildlist.size(); j++) {
+                            HrorgsEntity chrild = chrildlist.get(j);
+                            String chrild_headmancode = chrild.getOr_headmancode();
+                            String chrild_headmanname = chrild.getOr_headmanname();
+                            if (StringUtils.isEmpty(chrild_headmancode) || StringUtils.isEmpty(chrild_headmanname))
+                                continue;
+                            im_id = getEmployeeIMID(db, master, chrild_headmancode);
+                            inviteUsers.add(String.valueOf(im_id));//分部门IMID
+                        }
+                        inviteUsers = removeDuplicate(inviteUsers);//去除重复数据
+                        String userId = MyApplication.getInstance().mLoginUser.getUserId();
+                        createGroupChat(or_headmanname, or_name, null, roomdesc, inviteUsers, or_id);
+                    }
+                }
+
+
+            }
+        } else {
+
+        }
+    }
+
+    private int getEmployeeIMID(DBManager db, String master, String or_headmancode) {
+        List<EmployeesEntity> elist = db.select_getEmployee(new String[]{or_headmancode, master}, "EM_CODE=? and WHICHSYS=?");
+        if (elist != null && elist.size() > 0) {
+            int em_imid = elist.get(0).getEm_IMID();
+            return em_imid;
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * @注释:去除重复数据
+     */
+    public List<String> removeDuplicate(List<String> list) {
+        HashSet<String> h = new HashSet<String>(list);
+        list.clear();
+        list.addAll(h);
+        return list;
+    }
+
+
+    public ProgressDialog mProgressDialog;
+    public AppConfig mConfig;
+    private CoreService mXmppService;
+
+
+    /**
+     * @desc:房间名字:组织架构名字;房间描述
+     * @author:Administrator on 2016/5/16 9:35
+     */
+    private void createGroupChat(String nickName, final String roomName, String roomSubject, final String roomDesc,
+                                 List<String> inviteUsers, final int or_id) {
+        Log.i("Arison", "nickName:" + nickName);
+        Log.i("Arison", "roomName:" + roomName);
+        Log.i("Arison", "roomDesc:" + roomDesc);
+        Log.i("Arison", "inviteUsers:" + JSON.toJSONString(inviteUsers));
+        final String roomJid = mXmppService.createMucRoom(nickName, roomName, roomSubject, roomDesc);
+        Log.i("Arison", "roomJid:" + roomJid);
+        if (TextUtils.isEmpty(roomJid)) {
+            ToastUtil.showToast(mContext, R.string.create_room_failed);
+            return;
+        }
+
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("access_token", MyApplication.getInstance().mAccessToken);
+        params.put("jid", roomJid);
+        params.put("name", roomName);
+        params.put("category", "1");
+        params.put("desc", roomDesc);
+        params.put("countryId", String.valueOf(Area.getDefaultCountyId()));// 国家Id
+
+        Area area = Area.getDefaultProvince();
+        if (area != null) {
+            params.put("provinceId", String.valueOf(area.getId()));// 省份Id
+        }
+        area = Area.getDefaultCity();
+        if (area != null) {
+            params.put("cityId", String.valueOf(area.getId()));// 城市Id
+            area = Area.getDefaultDistrict(area.getId());
+            if (area != null) {
+                params.put("areaId", String.valueOf(area.getId()));// 城市Id
+            }
+        }
+
+        double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
+        double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
+        if (latitude != 0)
+            params.put("latitude", String.valueOf(latitude));
+        if (longitude != 0)
+            params.put("longitude", String.valueOf(longitude));
+
+        params.put("text", JSON.toJSONString(inviteUsers));
+
+        ProgressDialogUtil.show(mProgressDialog);
+        Log.i("Arison", "创建群url:" + mConfig.ROOM_ADD);
+        Log.i("Arison", "创建群参数:" + JSON.toJSONString(params));
+        StringJsonObjectRequest<MucRoom> request = new StringJsonObjectRequest<MucRoom>(mConfig.ROOM_ADD,
+                new Response.ErrorListener() {
+                    @Override
+                    public void onErrorResponse(VolleyError arg0) {
+                        ProgressDialogUtil.dismiss(mProgressDialog);
+                        ToastUtil.showErrorNet(mContext);
+                    }
+                }, new StringJsonObjectRequest.Listener<MucRoom>() {
+            @Override
+            public void onResponse(ObjectResult<MucRoom> result) {
+                boolean parserResult = Result.defaultParser(mContext, result, true);
+                if (parserResult && result.getData() != null) {
+                    //createRoomSuccess(result.getData().getId(), roomJid, roomName, roomDesc);
+                    mPullToRefreshListView.setPullDownRefreshing(200);//加载列表
+                    updateCreateFalgToERP(or_id);
+                }
+                ProgressDialogUtil.dismiss(mProgressDialog);
+            }
+        }, MucRoom.class, params);
+        String HASHCODE = Integer.toHexString(this.hashCode()) + "@";
+        MyApplication.getInstance().getFastVolley().addDefaultRequest(HASHCODE, request);
+    }
+
+
     /**
      * @desc:自动创建群后,避免重复,需要更新标识
      * @author:Administrator on 2016/5/17 16:59
      */
-	public void updateCreateFalgToERP(int or_id){
-        String url= Constants.getAppBaseUrl(mContext)+"/mobile/update_hrorgmobile.action";
-		Map<String, Object> params=new HashMap<>();
-		params.put("orid", or_id);
-		params.put("kind",1);
-		params.put("sessionId", CommonUtil.getSharedPreferences(mContext, "sessionId"));
-		LinkedHashMap<String, Object> headers=new LinkedHashMap<>();
-		headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(mContext, "sessionId"));
-		com.xzjmyk.pm.activity.ui.erp.util.ViewUtil.httpSendRequest(
-			   mContext,url,params,handler,headers,1,null,null,"get");
-	}
-
-	private Handler handler=new Handler(){
-		@Override
-		public void handleMessage(Message msg) {
-			switch (msg.what){
-				case 1:
-                   String result=msg.getData().getString("result");
-                   Log.i("Arison", "result:" + result);
-
-					if (new JsonValidator().validate(result)){
-						String or_id=JSON.parseObject(result).getString("or_id");
-                        if (!StringUtils.isEmpty(or_id)){
-							DBManager db=new DBManager(mContext);
-							db.updateHrogrRemark(Integer.valueOf(or_id),1);
-							ViewUtil.ToastMessage(mContext,"系统创建您的管理群成功!");
-						}
-					}
-					break;
-				case Constants.APP_SOCKETIMEOUTEXCEPTION:
-					result=msg.getData().getString("result");
-					ViewUtil.ToastMessage(mContext,result);
-					break;
-			}
-		}
-	};
-
-	private ServiceConnection mServiceConnection = new ServiceConnection() {
-		@Override
-		public void onServiceDisconnected(ComponentName name) {
-			mXmppService = null;
-		}
-
-		@Override
-		public void onServiceConnected(ComponentName name, IBinder service) {
-			mXmppService = ((CoreService.CoreServiceBinder) service).getService();
-		}
-	};
+    public void updateCreateFalgToERP(int or_id) {
+        String url = Constants.getAppBaseUrl(mContext) + "/mobile/update_hrorgmobile.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("orid", or_id);
+        params.put("kind", 1);
+        params.put("sessionId", CommonUtil.getSharedPreferences(mContext, "sessionId"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(mContext, "sessionId"));
+        com.xzjmyk.pm.activity.ui.erp.util.ViewUtil.httpSendRequest(
+                mContext, url, params, handler, headers, 1, null, null, "get");
+    }
+
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case 1:
+                    String result = msg.getData().getString("result");
+                    Log.i("Arison", "result:" + result);
+
+                    if (new JsonValidator().validate(result)) {
+                        String or_id = JSON.parseObject(result).getString("or_id");
+                        if (!StringUtils.isEmpty(or_id)) {
+                            DBManager db = new DBManager(mContext);
+                            db.updateHrogrRemark(Integer.valueOf(or_id), 1);
+                            ViewUtil.ToastMessage(mContext, "系统创建您的管理群成功!");
+                        }
+                    }
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    result = msg.getData().getString("result");
+                    ViewUtil.ToastMessage(mContext, result);
+                    break;
+            }
+        }
+    };
+
+    private ServiceConnection mServiceConnection = new ServiceConnection() {
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            mXmppService = null;
+        }
+
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            mXmppService = ((CoreService.CoreServiceBinder) service).getService();
+        }
+    };
 }

+ 10 - 28
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/ChatActivity.java

@@ -336,7 +336,7 @@ public class ChatActivity extends ActionBackActivity
         super.onResume();
         Log.i("Arison", "chatActivity onResume()");
         PreferenceUtils.putBoolean(getApplicationContext(), Constants.IS_NOTIFICATION, false);//不进行通知
-        Log.i("Arison","isNotify"+PreferenceUtils.getBoolean(getApplicationContext(),Constants.IS_NOTIFICATION));
+        Log.i("Arison", "isNotify" + PreferenceUtils.getBoolean(getApplicationContext(), Constants.IS_NOTIFICATION));
 
     }
 
@@ -492,7 +492,7 @@ public class ChatActivity extends ActionBackActivity
         if (interprect(message)) {
             return;
         }
-        Log.i("wang","send message:"+JSON.toJSONString(message));
+        Log.i("wang", "send message:" + JSON.toJSONString(message));
         mHasSend = true;
         Log.d("roamer", "开始发送消息,ChatBottomView的回调 sendmessage");
         message.setPacketId(UUID.randomUUID().toString().replaceAll("-", ""));
@@ -512,7 +512,7 @@ public class ChatActivity extends ActionBackActivity
 
             mService.sendChatMessage(mFriend.getUserId(), message);
             //进行百度推送
-           // sendPushTask(mLoginUserId, mFriend.getUserId(), message.getContent());
+            // sendPushTask(mLoginUserId, mFriend.getUserId(), message.getContent());
 
         }
     }
@@ -684,24 +684,9 @@ public class ChatActivity extends ActionBackActivity
     //TODO 发送卡片
     public void sendCard(String ObjectId) {
         this.objectId = ObjectId;
-//        ChatMessage message = new ChatMessage();
-//        message.setType(XmppMessage.TYPE_CARD);
-//        message.setFromUserName(mLoginNickName);
-//        message.setFromUserId(mLoginUserId);
-//        message.setTimeSend(TimeUtils.sk_time_current_time());
         //TODO 选择名片用户
         Intent intent = new Intent(this, SelectCardActivity.class);
-//        intent.setAction("");
         startActivityForResult(intent, REQUEST_CODE_SELECT_CARD);
-        //TODO 以下在返回里写
-
-//        message.setObjectId(ObjectId);
-//        message.setContent(MyApplication.getInstance().mLoginUser.getSex() + "");// 性别
-        // 0表示女,1表示男
-//        mChatMessages.add(message);
-//        mChatContentView.notifyDataSetInvalidated(true);
-//        sendMessage(message);
-
     }
 
 
@@ -780,7 +765,7 @@ public class ChatActivity extends ActionBackActivity
             return false;
         }
         if (mFriend.getUserId().compareToIgnoreCase(fromUserId) == 0) {// 是该人的聊天消息
-            Log.i("wang","单聊界面,新消息到来:"+ JSON.toJSONString(message));
+            Log.i("wang", "单聊界面,新消息到来:" + JSON.toJSONString(message));
             mChatMessages.add(message);
             mChatContentView.notifyDataSetInvalidated(true);
             return true;
@@ -927,21 +912,18 @@ public class ChatActivity extends ActionBackActivity
         } else if (requestCode == REQUEST_CODE_SELECT_CARD && resultCode == RESULT_OK) {//选择名片返回
             Friend card = (Friend) data.getSerializableExtra("card");
             ChatMessage message = new ChatMessage();
+
             message.setType(XmppMessage.TYPE_CARD);
-            message.setFromUserName(card.getNickName());
-            message.setCardId(card.getUserId());
+            message.setContent(card.getNickName());
+            message.setFromUserName(mLoginNickName);
+            message.setObjectId(card.getUserId());
             message.setFromUserId(mLoginUserId);
             message.setMySend(true);
             message.setTimeSend(TimeUtils.sk_time_current_time());
-            message.setObjectId(objectId);
-
-            loadCardInfo(card.getUserId(), message);
-
+//            message.setObjectId(objectId);
             mChatMessages.add(message);
+            sendMessage(message);
             mChatContentView.notifyDataSetInvalidated(true);
-//            message.setContent(MyApplication.getInstance().mLoginUser.getSex() + "");// 性别
-//            // 0表示女,1表示男
-            // sendMessage(message);
         }
     }
 

+ 5 - 30
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MucChatActivity.java

@@ -779,24 +779,9 @@ public class MucChatActivity extends ActionBackActivity
     //TODO 发送卡片
     public void sendCard(String ObjectId) {
         this.objectId = ObjectId;
-//        ChatMessage message = new ChatMessage();
-//        message.setType(XmppMessage.TYPE_CARD);
-//        message.setFromUserName(mLoginNickName);
-//        message.setFromUserId(mLoginUserId);
-//        message.setTimeSend(TimeUtils.sk_time_current_time());
         //TODO 选择名片用户
         Intent intent = new Intent(this, SelectCardActivity.class);
-//        intent.setAction("");
         startActivityForResult(intent, REQUEST_CODE_SELECT_CARD);
-        //TODO 以下在返回里写
-
-//        message.setObjectId(ObjectId);
-//        message.setContent(MyApplication.getInstance().mLoginUser.getSex() + "");// 性别
-        // 0表示女,1表示男
-//        mChatMessages.add(message);
-//        mChatContentView.notifyDataSetInvalidated(true);
-//        sendMessage(message);
-
     }
 
     @Override
@@ -1002,28 +987,18 @@ public class MucChatActivity extends ActionBackActivity
             }
         } else if (requestCode == REQUEST_CODE_SELECT_CARD && resultCode == RESULT_OK) {//选择名片返回
             Friend card = (Friend) data.getSerializableExtra("card");
-
             ChatMessage message = new ChatMessage();
             message.setType(XmppMessage.TYPE_CARD);
-            message.setFromUserName(card.getNickName());
-            if (card.getUserId()==null){
-                Log.i("gongpengming","card.getUserId(为空");
-            }else{
-                Log.i("gongpengming","card.getUserId(不为空");
-            }
-            message.setCardId(card.getUserId());//
+            message.setContent(card.getNickName());
+            message.setFromUserName(mLoginNickName);
+            message.setObjectId(card.getUserId());
             message.setFromUserId(mLoginUserId);
             message.setMySend(true);
             message.setTimeSend(TimeUtils.sk_time_current_time());
-            message.setObjectId(objectId);
-
-            loadCardInfo(card.getUserId(), message);
-
+//            message.setObjectId(objectId);
             mChatMessages.add(message);
+            sendMessage(message);
             mChatContentView.notifyDataSetInvalidated(true);
-//            message.setContent(MyApplication.getInstance().mLoginUser.getSex() + "");// 性别
-//            // 0表示女,1表示男
-//            sendMessage(message);
         } else if (requestCode == RETURN_CODE && resultCode == RETURN_CODE) {
             String nameReturn = data.getStringExtra("NickName");
             String userId = data.getStringExtra("UserId");   //获取到的userid

+ 6 - 30
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/RoomInfoActivity.java

@@ -180,7 +180,6 @@ public class RoomInfoActivity extends BaseActivity {
         mGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                Log.i("gongpengming","进来的");
                 if (add_minus_count == 1) {
                     if (mMembers == null) return;
                     if (position == mMembers.size() - 1) {
@@ -189,7 +188,6 @@ public class RoomInfoActivity extends BaseActivity {
                             existIds.add(mMembers.get(i).getUserId());
                         }
                         // 去添加人
-                        Log.i("gongpengming","去添加人");
                         Intent intent = new Intent(RoomInfoActivity.this, AddContactsActivity.class);
                         intent.putExtra("roomId", mRoom.getRoomId());
                         intent.putExtra("roomJid", mRoomJid);
@@ -281,7 +279,6 @@ public class RoomInfoActivity extends BaseActivity {
         mCreatorTv.setText(mucRoom.getNickName());
         mCountTv.setText(mucRoom.getMaxUserSize() + "");
         int s = FriendDao.getInstance().getFriendStatus(mLoginUserId, mRoom.getUserId());
-        //TODO 当前状态只有拉黑2和好友-1
         if (s == -1) {
             sc_tv.setText("取消屏蔽群消息");
         } else {
@@ -289,8 +286,6 @@ public class RoomInfoActivity extends BaseActivity {
         }
         long createTime = mucRoom.getCreateTime();
         String formatDate = DateFormatUtil.getFormatDate(createTime * 1000);
-        Log.d("wang", "createtime" + formatDate);
-        Log.d("wang", "createtime:::" + mucRoom.toString() + "....." + createTime);
         mCreateTime.setText(TimeUtils.s_long_2_str(mucRoom.getCreateTime() * 1000));
         String myNickName = "";
         if (mMembers != null) mMembers.clear();
@@ -309,15 +304,16 @@ public class RoomInfoActivity extends BaseActivity {
                 if (userId.equals(mLoginUserId)) {
                     myNickName = munber.get(i).getNickName();
                     my = munber.get(i);
-                    break;
                 }
             }
-            if (create != null)
-                mMembers.add(create);
             if (my != null) {// 将我自己移动到第一个的位置
                 mMembers.remove(my);
                 mMembers.add(0, my);
             }
+            if (create != null) {
+                if (!create.getUserId().equals(mLoginUserId))
+                    mMembers.add(0, create);
+            }
         }
         mAdapter = new GridViewAdapter(mMembers);
         mGridView.setAdapter(mAdapter);
@@ -331,7 +327,6 @@ public class RoomInfoActivity extends BaseActivity {
             if (btnExit == null) {
                 btnExit = (Button) findViewById(R.id.btn_exit);
             }
-            Log.i("gongpengming", "mucRoom.getUserId()=" + mucRoom.getUserId());
             add_minus_count = 2;
             btnExit.setText("删除商务群");
             findViewById(R.id.room_name_arrow_img).setVisibility(View.VISIBLE);
@@ -342,7 +337,6 @@ public class RoomInfoActivity extends BaseActivity {
             btnExit.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    Log.i("gongpengming", "删除商务群");
                     deleteRoom(mRoom);
                 }
             });
@@ -372,7 +366,6 @@ public class RoomInfoActivity extends BaseActivity {
             findViewById(R.id.banned_delete_rl).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {//删除群房间
-                    Log.i("gongpengming", "删除群房间");
                     deleteRoom(mRoom);
                 }
             });
@@ -422,7 +415,6 @@ public class RoomInfoActivity extends BaseActivity {
         findViewById(R.id.exit_room_rl).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {//成员退出房间
-                Log.i("gongpengming", "成员退出房间");
                 deleteRoom(mRoom);
             }
         });
@@ -553,24 +545,8 @@ public class RoomInfoActivity extends BaseActivity {
 
         private final List<MucRoomMember> members;
 
-        public GridViewAdapter(List<MucRoomMember> members ) {
-            this.members=members;
-//            boolean isf = false;
-//            this.members = new ArrayList<>();
-////            for (int i = 0; i < members.size(); i++) {
-////                if (members.get(i).getUserId().equals(id)) {//如果是群主
-////                    if (!isf) {
-////                        isf = true;
-////                    } else {
-////                        members.remove(i);
-////                    }
-////                }
-////            }
-//            members.add(new MucRoomMember());
-//            if (id.equals(mLoginUserId))
-//                members.add(new MucRoomMember());
-//            this.members.addAll(members);
-//            gridmembers = this.members;
+        public GridViewAdapter(List<MucRoomMember> members) {
+            this.members = members;
         }
 
         @Override

+ 38 - 36
WeiChat/src/main/java/com/xzjmyk/pm/activity/view/ChatContentView.java

@@ -61,10 +61,6 @@ import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.circle.BaiduMapActivity;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.ui.circle.view.CardInfoActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.message.InstantMessageActivity;
 import com.xzjmyk.pm.activity.ui.message.SelectMessageWindow;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
@@ -563,7 +559,7 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
             } else {
                 contentViewHolder.time_tv.setVisibility(GONE);
             }
-			/* 处理From和To不一样的地方 */
+            /* 处理From和To不一样的地方 */
             if (viewType >= VIEW_FROM_ME_TEXT && viewType <= VIEW_FROM_ME_VIDEO || viewType == VIEW_FROM_ME_FILE
                     || viewType == VIEW_FROM_ME_CARD) {// MSG_FROM_ME
                 if (mLoginUserId.equals(Friend.ID_SYSTEM_MESSAGE)) {// 我就是系统账号,那么显示系统头像
@@ -634,13 +630,14 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
                     contentViewHolder.nick_name.setText(mLoginNickName);
                 } else {
                     contentViewHolder.nick_name.setVisibility(VISIBLE);
-                    if (message.getType() == 8) {
-                        getUserByUserId(message.getFromUserId(),contentViewHolder);
-                    } else {
+//                    if (message.getType() == 8) {
+//
+//                        getUserByUserId(message.getFromUserId(), contentViewHolder);
+//                    } else {
                         contentViewHolder.nick_name.setText(friend == null ? message.getFromUserName() :
                                 (friend.getRemarkName() != null ? friend.getRemarkName() :
                                         friend.getNickName()));
-                    }
+//                    }
                 }
             }
             View longView = null;
@@ -835,15 +832,12 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
                 }
                 break;
                 case XmppMessage.TYPE_CARD:
+                    //TODO  标记
                     CardViewHolder cardViewHolder = (CardViewHolder) contentViewHolder;
                     if (!TextUtils.isEmpty(message.getContent())) {
                         cardViewHolder.chat_head_iv.setVisibility(VISIBLE);
-                        cardViewHolder.chat_person_name.setText("昵称:" + message.getFromUserName());
-                        if (message.getContent().equals("0")) {
-                            cardViewHolder.chat_person_sex.setText("性别:女");
-                        } else {
-                            cardViewHolder.chat_person_sex.setText("性别:男");
-                        }
+                        cardViewHolder.chat_person_name.setText("昵称:" + message.getContent());
+                        AvatarHelper.getInstance().displayAvatar(message.getObjectId(), cardViewHolder.chat_warp_head, true);
                         if (!message.isMySend()) {
                             cardViewHolder.card_progress.setVisibility(GONE);
                             if (!message.isRead()) {
@@ -1047,7 +1041,9 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
 
                     @Override
                     public void onClick(View v) {
-                        String userId = null;
+
+
+                        String userId = message.getObjectId();
                         if (!message.isMySend() && !message.isRead()) {
                             message.setRead(true);
                             ChatMessageDao.getInstance().updateMessageReadState(mLoginUserId, mToUserId,
@@ -1056,34 +1052,39 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
                                 cardViewHolder.unread_img_view.setVisibility(GONE);
                             }
                         }
+//                        if (viewType == VIEW_TO_ME_CARD) {  //发给我的时候
+//                            //缺少cardid;只能根据名称来获取信息
+//                            Friend friend = FriendDao.getInstance().getFriendByKey("nickName", message.getFromUserName());
+//                            if (friend != null) {
+//                                userId = friend.getUserId();
+//                            } else {
+//                                DBManager dbManager = new DBManager(mContext);
+//                                String master = CommonUtil.getSharedPreferences(mContext, "erp_master");
+//                                List<EmployeesEntity> employeeList = dbManager.select_getEmployee(new String[]{message.getFromUserName(), master}, "em_name=? and whichsys=?");
+//                                if (!ListUtils.isEmpty(employeeList)) {
+//                                    userId = String.valueOf(employeeList.get(0).getEm_IMID());
+//                                } else {
+////                                    ViewUtil.ToastMessage(MyApplication.getInstance(), "企业架构数据没有初始化!");
+//                                }
+//                            }
+//                        } else {
+//                            userId = message.getCardId();
+//                        }
 
-                        if (viewType == VIEW_TO_ME_CARD) {
-                            //缺少cardid;只能根据名称来获取信息
-                            Friend friend = FriendDao.getInstance().getFriendByKey("nickName", message.getFromUserName());
-                            if (friend != null) {
-                                userId = friend.getUserId();
-                            } else {
-                                DBManager dbManager = new DBManager(mContext);
-                                String master = CommonUtil.getSharedPreferences(mContext, "erp_master");
-                                List<EmployeesEntity> employeeList = dbManager.select_getEmployee(new String[]{message.getFromUserName(), master}, "em_name=? and whichsys=?");
-                                if (!ListUtils.isEmpty(employeeList)) {
-                                    userId = String.valueOf(employeeList.get(0).getEm_IMID());
-                                } else {
-//                                    ViewUtil.ToastMessage(MyApplication.getInstance(), "企业架构数据没有初始化!");
-                                }
-                            }
-                        } else {
-                            userId = message.getCardId();
-                        }
                         if (userId == null) {
                             Intent intent = new Intent(mContext, CardInfoActivity.class);
-                            intent.putExtra(AppConstant.EXTRA_NICK_NAME, message.getFromUserName());
+                            intent.putExtra(AppConstant.EXTRA_NICK_NAME, message.getContent());
                             mContext.startActivity(intent);
                         } else {
                             Intent intent = new Intent(mContext, BasicInfoActivity.class);
                             intent.putExtra(AppConstant.EXTRA_USER_ID, userId);
                             mContext.startActivity(intent);
                         }
+
+
+
+
+
                     }
                 });
             }
@@ -1118,6 +1119,7 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
             // });
             return convertView;
         }
+
         private AppConfig mConfig = MyApplication.getInstance().getConfig();
         private FastVolley mFastVolley = MyApplication.getInstance().getFastVolley();
 
@@ -1139,7 +1141,7 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
                     if (success && result.getData() != null) {
                         User mUser = result.getData();
 
-                        contentViewHolder.nick_name.setText( mUser.getNickName());
+                        contentViewHolder.nick_name.setText(mUser.getNickName());
                     } else {
                         contentViewHolder.nick_name.setText("");
                     }

BIN
WeiChat/src/main/res/drawable-xhdpi/my_shangwu.png


+ 15 - 0
WeiChat/src/main/res/layout/activity_client.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.ClientActivity">
+<TextView
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:textSize="25sp"
+    android:text="该功能尚未完善"/>
+</RelativeLayout>

+ 1 - 0
WeiChat/src/main/res/layout/chat_from_item_card.xml

@@ -97,6 +97,7 @@
                     <TextView
                         android:layout_gravity="center_horizontal"
                         android:id="@+id/person_sex"
+                        android:visibility="gone"
                         android:layout_marginTop="@dimen/line_min"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"

+ 1 - 0
WeiChat/src/main/res/layout/chat_to_item_card.xml

@@ -106,6 +106,7 @@
                         android:layout_marginTop="5dp"
                         android:id="@+id/person_sex"
                         android:layout_width="wrap_content"
+                        android:visibility="gone"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
                         android:layout_gravity="center_horizontal"

+ 5 - 4
WeiChat/src/main/res/layout/fragment_me.xml

@@ -51,17 +51,18 @@
                     android:singleLine="true"
                     android:textColor="@color/text_hine"
                     android:textSize="@dimen/text_hine" />
+
             </RelativeLayout>
 
             <ImageView
-                android:id="@+id/arrow_img"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:background="@drawable/set_list_next"
                 android:contentDescription="@string/app_name"
-                android:visibility="invisible" />
+                android:alpha="0.26"
+                />
         </RelativeLayout>
         <View
             android:layout_width="match_parent"

+ 27 - 1
WeiChat/src/main/res/layout/fragment_works.xml

@@ -125,7 +125,33 @@
             android:layout_height="@dimen/line"
             android:layout_marginTop="7dp"
             android:background="@color/item_line" />
+        <RelativeLayout
+            android:id="@+id/my_client_rl"
+            style="@style/IMTbleLine">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/title_set_u"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="我的客户"
+                android:textColor="@color/text_main"
+                android:textSize="14sp" />
 
+            <ImageView
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:alpha="0.26"
+                android:background="@drawable/set_list_next"
+                android:contentDescription="@string/app_name" />
+        </RelativeLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:background="@color/item_line" />
         <RelativeLayout
             android:id="@+id/setting_rl"
             style="@style/IMTbleLine">
@@ -134,7 +160,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/title_set_u"
+                android:drawableLeft="@drawable/my_shangwu"
                 android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="我的商务"