常用联系人

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

@@ -92,6 +92,7 @@ public class UUFriendSortAdapter extends BaseAdapter implements SectionIndexer {
         // 如果当前位置等于该分类首字母的Char的位置 ，则认为是第一次出现
         if (position == getPositionForSection(section)) {
             holder.tag_tv.setVisibility(View.VISIBLE);
+            holder.tag_tv.setVisibility(View.GONE);
             holder.tag_tv.setText(mSortFriends.get(position).getFirstLetter());
         } else {
             holder.tag_tv.setVisibility(View.GONE);
@@ -135,7 +136,7 @@ public class UUFriendSortAdapter extends BaseAdapter implements SectionIndexer {
             }
         }
         /*昵称*/
-        String name = friend.getShowName();
+        String name = friend.getNickName();
         holder.name_tv.setText(name);
         /*个性签名*/
         holder.sub_tv.setText((StringUtils.isEmpty(friend.getDepart()) ? "" : (friend.getDepart() + ">"))

WeiChat/src/main/java/com/xzjmyk/pm/activity/helper/FriendHelper.java

@@ -14,6 +14,7 @@ import com.xzjmyk.pm.activity.db.dao.ChatMessageDao;
 import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.sp.TableVersionSp;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.FastVolley;
@@ -123,10 +124,11 @@ public class FriendHelper {
      * 添加常用
      */
     public static void addGoodFriend(Friend friend) {
-        if (friend.getClickNum() < 10) {
+//        if (friend.getClickNum() < 10) {
             friend.setClickNum(friend.getClickNum() + 1);
             boolean b = FriendDao.getInstance().createOrUpdateFriend(friend);
-        }
+            LogUtil.i("b="+b);
+//        }
     }
 
     /**

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/contact/MyFriendActivity.java

@@ -56,6 +56,7 @@ import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -267,11 +268,11 @@ public class MyFriendActivity extends BaseActivity {
                 long startTime = System.currentTimeMillis();
                 if (mLoginUserId == null)
                     mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
-                if (isPeculiar) {
-                    friends = FriendDao.getInstance().getFriends(mLoginUserId, "clickNum", 10);
-                } else {
-                    friends = FriendDao.getInstance().getFriends(mLoginUserId);
-                }
+//                if (isPeculiar) {
+//                    friends = FriendDao.getInstance().getFriends(mLoginUserId, "clickNum", 10);
+//                } else {
+                    friends = FriendDao.getInstance().getFriends(mLoginUserId);// 取所有好友
+//                }
                 if (friends != null)
                     Log.i("wang", "friends size()=" + friends.size());
                 long delayTime = 200 - (startTime - System.currentTimeMillis());// 保证至少200ms的刷新过程
@@ -283,6 +284,7 @@ public class MyFriendActivity extends BaseActivity {
                     @Override
                     public void run() {
                         handlerFriends(friends);
+                        LogUtil.prinlnLongMsg("hifriends",JSON.toJSONString(friends));
                     }
                 }, delayTime);
             }
@@ -339,6 +341,7 @@ public class MyFriendActivity extends BaseActivity {
                     friends.add(friend);
                 }
                 handlerFriends(friends);
+                LogUtil.prinlnLongMsg("hifriends",JSON.toJSONString(friend));
             }
 
             @Override
@@ -366,9 +369,28 @@ public class MyFriendActivity extends BaseActivity {
                 mSortFriends.add(mode);
                 allFriends.add(mode);
             }
-            Collections.sort(mSortFriends, mBaseComparator);
-            Collections.sort(allFriends, mBaseComparator);
+            Collections.sort(mSortFriends, new Comparator<BaseSortModel<Friend>>() {
+                @Override
+                public int compare(BaseSortModel<Friend> o1, BaseSortModel<Friend> o2) {
+                    Friend f1 = o1.getBean();
+                    Friend f2 = o2.getBean();
+                    return f2.getClickNum()-f1.getClickNum();
+                }
+            });
+            LogUtil.prinlnLongMsg("mSortFriends",JSON.toJSONString(mSortFriends));
+            Collections.sort(allFriends, new Comparator<BaseSortModel<Friend>>() {
+                @Override
+                public int compare(BaseSortModel<Friend> o1, BaseSortModel<Friend> o2) {
+                    Friend f1 = o1.getBean();
+                    Friend f2 = o2.getBean();
+                    return f2.getClickNum()-f1.getClickNum();
+                }
+            });
+            LogUtil.prinlnLongMsg("allFriends",JSON.toJSONString(allFriends));
+//            Collections.sort(mSortFriends, mBaseComparator);
+//            Collections.sort(allFriends, mBaseComparator);
         }
+        mAdapter = new UUFriendSortAdapter(MyFriendActivity.this, mSortFriends);
         this.friends = friends;
         mAdapter.notifyDataSetInvalidated();
         mPullToRefreshListView.onRefreshComplete();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/ProcessMsgActivity.java

@@ -582,7 +582,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     }
                     ;
 //                    model.status.setText(jp_status);
-                    model.status.setTextColor(getResources().getColor(R.color.orange));
+                    model.status.setTextColor(getResources().getColor(R.color.vpi__bright_foreground_inverse_holo_light));
                     model.status.setText("等待我审批");
                     model.JP_NODEID = JP_NODEID;
                     model.typecode = jp_typecode;
@@ -664,7 +664,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                         String codename = jsonArray.getJSONObject(position).getString("JP_NODENAME");
                         if (!StringUtils.isEmpty(status)) {
                             if (status.equals("待审批")) {
-                                model.status.setTextColor(getResources().getColor(R.color.orange));
+                                model.status.setTextColor(getResources().getColor(R.color.vpi__bright_foreground_inverse_holo_light));
                                 nodename = nodename == null ? "" : nodename;
                                 status = "等待" + nodename + "(" + codename + ")" + getString(R.string.approvel);
                             } else if (status.equals("未通过")) {

WeiChat/src/main/res/layout/contact_item.xml

@@ -9,7 +9,8 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="2px"
-        android:background="@color/item_line" />
+        android:background="@color/item_line"
+        android:visibility="gone"/>
 
     <TextView
         android:id="@+id/tag_tv"
@@ -24,7 +25,9 @@
         android:layout_width="match_parent"
         android:layout_height="2px"
         android:layout_below="@id/tag_tv"
-        android:background="@color/item_line" />
+        android:background="@color/item_line"
+        android:visibility="visible"
+        />
 
     <ImageView
         android:id="@+id/header_img"
@@ -34,6 +37,7 @@
         android:layout_marginLeft="10dp"
         android:layout_marginTop="10dp"
         android:adjustViewBounds="true"
+        android:src="@drawable/common_header_boy"
         />
 <LinearLayout
     android:id="@+id/em_ll"

WeiChat/src/main/res/layout/fragment_contact_friend.xml

@@ -40,5 +40,6 @@
         android:layout_alignParentRight="true"
         android:layout_gravity="right|center"
         android:layout_marginBottom="10dp"
-        android:layout_marginTop="120dp" />
+        android:layout_marginTop="120dp"
+         android:visibility="gone"/>
 </RelativeLayout>

WeiChat/src/main/res/raw/versionconfiguration.properties

@@ -1,3 +1,3 @@
 #发布版本状态改为true,测试版本状态为false
-#release_version = true
-release_version=true
+release_version = false
+#release_version=true