修改朋友数据库

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/FriendSortAdapter.java

@@ -44,6 +44,10 @@ public class FriendSortAdapter extends BaseAdapter implements SectionIndexer {
         notifyDataSetChanged();
     }
 
+    public List<BaseSortModel<Friend>> getmSortFriends() {
+        return mSortFriends;
+    }
+
     public void setisRefeshed(boolean isRefeshed) {
         this.isRefeshed = isRefeshed;
         isLog.clear();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/ActionBackActivity.java

@@ -148,7 +148,7 @@ public class ActionBackActivity extends StackActivity {
     private void touchUp() {
         if (getScrollVelocity() > YSPEED_MIN && moveX > XDISTANCE_MIN) {
             recycleVelocityTracker();
-            finish();
+//            finish();
         } else {
             recycleVelocityTracker();
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/UserSelectActivity.java

@@ -28,8 +28,6 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.entity.Hrorgs;
-import com.xzjmyk.pm.activity.ui.erp.model.Employee;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -70,7 +68,7 @@ public class UserSelectActivity extends BaseActivity {
             switch (msg.what) {
                 case WHAT_LOAD:
                     array = JSON.parseObject(message).getJSONArray("datas");//获取到数据
-                    Log.d("handleMessage: ",array.toString());
+                    Log.d("handleMessage: ", array.toString());
                     if (array == null || array.size() <= 0) return;
                     Employees entity = null;
                     String code = null;//em_code
@@ -104,11 +102,11 @@ public class UserSelectActivity extends BaseActivity {
                     }
 
                     //判断selectList不为空
-                    if (selectedList != null && selectedList.size() != 0){
+                    if (selectedList != null && selectedList.size() != 0) {
                         //遍历所有人员将其姓名与前一次所选人员（默认存入的为姓名）对比，如果重复则将该参会人员设置为已勾选
                         for (int i = 0; i < list.size(); i++) {
                             for (int j = 0; j < selectedList.size(); j++) {
-                                if (list.get(i).getEm_name().equals(selectedList.get(j))){
+                                if (list.get(i).getEm_name().equals(selectedList.get(j))) {
                                     list.get(i).setClick(true);
                                     break;
                                 }
@@ -116,13 +114,10 @@ public class UserSelectActivity extends BaseActivity {
                         }
                         adapter.notifyDataSetChanged();
                     }
-
-
                     break;
                 case 0x12:
                     Map<Object, Object> kMap = FlexJsonUtil.fromJson(msg.getData().getString("result"));
                     list = FlexJsonUtil.fromJsonArray(kMap.get("data").toString(), Employees.class);
-                    Log.d("handleMessage: ",list.toString());
                     if (ListUtils.isEmpty(list)) return;
                     if (list.size() > 0) {
                         if (adapter == null) {
@@ -131,11 +126,11 @@ public class UserSelectActivity extends BaseActivity {
                         } else
                             adapter.setUsers(list);
                     }
-                    if (selectedList != null && selectedList.size() != 0){
+                    if (selectedList != null && selectedList.size() != 0) {
 
                         for (int i = 0; i < list.size(); i++) {
                             for (int j = 0; j < selectedList.size(); j++) {
-                                if (list.get(i).getEm_name().equals(selectedList.get(j))){
+                                if (list.get(i).getEm_name().equals(selectedList.get(j))) {
                                     list.get(i).setClick(true);
                                     break;
                                 }
@@ -163,11 +158,12 @@ public class UserSelectActivity extends BaseActivity {
         isNet = getIntent().getBooleanExtra("net", false);
 
         selectedStrs = getIntent().getStringExtra("users"); //
-        String[] split = selectedStrs.split(",");
-        for (int i = 0; i < split.length; i++) {
-            selectedList.add(split[i]);
+        if (selectedStrs != null) {
+            String[] split = selectedStrs.split(",");
+            for (int i = 0; i < split.length; i++) {
+                selectedList.add(split[i]);
+            }
         }
-        Log.d("selected",selectedList.toString());
         initView();
         init();
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/LinksManFragment.java

@@ -62,6 +62,7 @@ import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.entity.HrorgsEntity;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.message.NewFriendActivity;
@@ -84,6 +85,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
+import static com.xzjmyk.pm.activity.R.drawable.friend;
 import static com.xzjmyk.pm.activity.R.id.company;
 
 /**
@@ -314,26 +316,31 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
             }
         });
         mPullToRefreshListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            private Friend friend;   //l临时对象
-
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                friend = mSortFriends.get((int) id).getBean();
-                clickFriend(friend);
+                List<BaseSortModel<Friend>> list = mAdapter.getmSortFriends();
+                if (!ListUtils.isEmpty(list)) {
+                    Friend friend = list.get((int) id).getBean();
+                    clickFriend(friend);
+                }
             }
         });
         mPullToRefreshListView.getRefreshableView().setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
             @Override
             public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-                BaseSortModel<Friend> sortFriend = mSortFriends.get((int) id);
-                if (sortFriend == null || sortFriend.getBean() == null) {
-                    return false;
-                }
-                String userId = sortFriend.getBean().getUserId();
-                if (userId.equals(Friend.ID_SYSTEM_MESSAGE) || userId.equals(Friend.ID_NEW_FRIEND_MESSAGE)) {
+                List<BaseSortModel<Friend>> list = mAdapter.getmSortFriends();
+                if (!ListUtils.isEmpty(list)) {
+                    BaseSortModel<Friend> sortFriend = list.get((int) id);
+                    if (sortFriend == null) return false;
+                    Friend friend = sortFriend.getBean();
+                    if (friend == null) return false;
+                    String userId = friend.getUserId();
+                    if (userId.equals(Friend.ID_SYSTEM_MESSAGE) || userId.equals(Friend.ID_NEW_FRIEND_MESSAGE)) {
+                        return false;
+                    }
+                    showLongClickOperationDialog(sortFriend);
+                } else
                     return false;
-                }
-                showLongClickOperationDialog(sortFriend);
                 return true;
             }
         });

WeiChat/src/main/res/values/styles.xml

@@ -368,7 +368,7 @@
     <!-- form表单  请假单，特殊考勤等单据 -->
     <style name="form_relative_customer">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">40dp</item>
+        <item name="android:layout_height">wrap_content</item>
         <item name="android:clickable">true</item>
     </style>