发布5.5.0版本；

WeiChat/build.gradle

@@ -8,7 +8,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="54"
-    android:versionName="5.4">
+    android:versionCode="55"
+    android:versionName="5.5.0">
 
     <uses-sdk
         android:minSdkVersion="11"

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

@@ -64,6 +64,7 @@ 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;
 import com.xzjmyk.pm.activity.ui.nearby.UserSearchActivity;
@@ -104,7 +105,8 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
     private PullToRefreshListView mPullToRefreshListView;
     private TextView mTextDialog;
     private SideBar mSideBar;
-    private ProgressDialog mProgressDialog;
+    private  ProgressDialog mProgressDialog;
+    private CustomProgressDialog mcProgressDialog;
     private List<BaseSortModel<Friend>> mSortFriends;
     private List<BaseSortModel<Friend>> sortFrientSeach;
     private BaseComparator<Friend> mBaseComparator;
@@ -180,6 +182,7 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
         inputFilter = new IntentFilter("com.app.home.update");
         getActivity().registerReceiver(receiver, inputFilter);
         setHasOptionsMenu(true);
+        
     }
 
     @Override
@@ -291,6 +294,9 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
     };
 
     private void initView() {
+        mcProgressDialog=CustomProgressDialog.createDialog(ct);
+        mcProgressDialog.show();
+
         mBind = getActivity().bindService(CoreService.getIntent(), mServiceConnection, Activity.BIND_AUTO_CREATE);
         headview = LayoutInflater.from(ct).inflate(R.layout.headview_cantacts_menus, null);
         mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.pull_refresh_list);
@@ -495,6 +501,7 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
                         }
                         mAdapter.notifyDataSetInvalidated();
                         mPullToRefreshListView.onRefreshComplete();
+                        mcProgressDialog.dismiss();
                     }
                 }, delayTime);
             }

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

@@ -3,8 +3,6 @@ package com.xzjmyk.pm.activity.ui.erp.fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,7 +10,6 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.AppConstant;
@@ -26,16 +23,11 @@ import com.xzjmyk.pm.activity.ui.erp.activity.crm.ClientActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAMainActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 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.StringUtils;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.FastVolley;
 
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 /**
  * @desc:工作
  * @author：Administrator on 2016/1/30 16:15
@@ -161,15 +153,15 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
         }
     }
 
-    
-    private void isStartNewApp(int what){
+    private  String falg="1";
+   /* private void isStartNewApp(int what){
         String url =Constants.getAppBaseUrl(ct)+"mobile/crm/openNewVision.action";
         Map<String, Object> params = new HashMap<>();
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params,mhandler, headers, Constants.HTTP_SUCCESS_INIT, null, null, "post");
-    }
-    private  String falg="1";
+    }*/
+   /* private  String falg="1";
     private Handler mhandler=new Handler(){
         @Override
         public void handleMessage(Message msg) {
@@ -193,5 +185,5 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                     break;
             }
         }
-    };
+    };*/
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -81,6 +81,11 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     private RelativeLayout rl_master_change;
     @ViewInject(R.id.app_scan_code_rl)
     private RelativeLayout rl_scan_code;
+    @ViewInject(R.id.app_drafts_rl)
+    private RelativeLayout  app_drafts_rl;
+
+    @ViewInject(R.id.app_friend_rl)
+    private RelativeLayout   app_friend_rl;
 
     private Context ct;
     public MasterDialog mDialog;
@@ -201,6 +206,8 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         rl_master_change.setOnClickListener(this);
         rl_info.setOnClickListener(this);
         rl_scan_code.setOnClickListener(this);
+        app_drafts_rl.setOnClickListener(this);
+        app_friend_rl.setOnClickListener(this);
 
         mAvatarImg = (ImageView) findViewById(R.id.avatar_img);
         mNickNameTv = (TextView) findViewById(R.id.nick_name_tv);
@@ -350,6 +357,13 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                         return false;
                     }
                 });
+                break;
+            case R.id.app_drafts_rl:
+                ToastUtil.showToast(getActivity(),"新功能未上线！请期待！");
+                break;
+            case  R.id.app_friend_rl:
+                
+                break;
         }
     }
 

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

@@ -82,7 +82,7 @@
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
-        <RelativeLayout
+     <!--   <RelativeLayout
             android:id="@+id/setting_rl"
             style="@style/IMTbleLine"
             android:layout_marginTop="9dp">
@@ -105,7 +105,7 @@
                 android:layout_centerVertical="true"
                 android:background="@drawable/set_list_next"
                 android:contentDescription="@string/app_name" />
-        </RelativeLayout>
+        </RelativeLayout>-->
         
         <!--<FrameLayout-->
             <!--android:id="@+id/frame_friend_list"-->

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

@@ -16,6 +16,7 @@
                 android:id="@+id/avatar_img"
                 android:layout_width="60dp"
                 android:layout_height="60dp"
+               
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
                 android:contentDescription="@string/app_name"
@@ -62,10 +63,7 @@
                 android:alpha="0.26"
                 />
         </RelativeLayout>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
+
         <RelativeLayout
             android:id="@+id/my_data_rl"
             android:visibility="gone"
@@ -93,12 +91,6 @@
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:visibility="gone"
-            android:background="@color/item_line" />
-
         <RelativeLayout
             android:id="@+id/my_friend_rl"
             android:visibility="gone"
@@ -125,12 +117,6 @@
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:visibility="gone"
-            android:background="@color/item_line" />
-
         <RelativeLayout
             android:id="@+id/my_space_rl"
             android:visibility="gone"
@@ -166,11 +152,6 @@
                 android:layout_alignParentEnd="true"></LinearLayout>
         </RelativeLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-
         <RelativeLayout
             android:id="@+id/local_video_rl"
             style="@style/IMTbleLine_UP_Me"
@@ -197,10 +178,52 @@
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
+        <RelativeLayout
+            android:id="@+id/app_friend_rl"
+            style="@style/IMTbleLine_UP_Me"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/friend_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/icon_uu_circle"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="朋友圈"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <TextView
+                android:id="@+id/tv_friend_login"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/friend_arrow_img"
+                android:layout_toRightOf="@+id/friend_text"
+                android:text="未登录"
+                android:textColor="@color/text_hine"
+                android:textSize="@dimen/text_hine"
+                android:visibility="gone"/>
+
+            <ImageView
+                android:id="@+id/friend_arrow_img"
+                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"
+                android:visibility="gone"/>
+        </RelativeLayout>
+
+    
+
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
             android:background="@color/item_line" />
+        
         <!--公司-->
         <RelativeLayout
             android:id="@+id/rl_company_change"
@@ -212,7 +235,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/my_company"
+                android:drawableLeft="@drawable/icon_uu_company"
                 android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="@string/change_company"
@@ -253,7 +276,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/zhang_dao"
+                android:drawableLeft="@drawable/icon_uu_master"
                 android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="@string/change_master"
@@ -285,6 +308,7 @@
             android:background="@color/item_line" />
 
         <RelativeLayout
+            android:visibility="gone"
             android:id="@+id/app_scan_code_rl"
             style="@style/IMTbleLine_UP_Me">
 
@@ -296,7 +320,7 @@
                 android:drawableLeft="@drawable/ic_scan_code_icon"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="App二维码"
+                android:text="二维码"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -322,11 +346,49 @@
                 android:visibility="gone"/>
         </RelativeLayout>
 
+        <RelativeLayout
+            android:id="@+id/app_drafts_rl"
+            
+            style="@style/IMTbleLine_UP_Me">
+
+            <TextView
+                android:id="@+id/drafts_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/icon_uu_draft"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="草稿箱"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <TextView
+                android:id="@+id/tv_drafts_login"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/drafts_arrow_img"
+                android:layout_toRightOf="@+id/drafts_text"
+                android:text="未登录"
+                android:textColor="@color/text_hine"
+                android:textSize="@dimen/text_hine"
+                android:visibility="gone"/>
+
+            <ImageView
+                android:id="@+id/drafts_arrow_img"
+                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"
+                android:visibility="gone"/>
+        </RelativeLayout>
+
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
             android:background="@color/item_line" />
-
         <RelativeLayout
             android:id="@+id/my_b2b_rl"
             style="@style/IMTbleLine_UP_Me"
@@ -338,7 +400,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/btob"
+            
                 android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="@string/my_b2b"
@@ -366,16 +428,6 @@
         </RelativeLayout>
 
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp" />
-
-
-        <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_UP_Me"
@@ -385,7 +437,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/title_set"
+                android:drawableLeft="@drawable/icon_uu_setting"
                 android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="@string/setting"

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

@@ -116,11 +116,6 @@
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--android:padding="9dp"-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/linear_top_menu"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -260,7 +259,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/title_set"
+        
             android:drawablePadding="10dp"
             android:gravity="center"
             android:text="常用联系人"

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

@@ -183,7 +183,7 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">@dimen/item_height</item>
         <item name="android:minHeight">60dp</item>
-        <item name="android:paddingLeft">20dp</item>
+        <item name="android:paddingLeft">10dp</item>
         <item name="android:paddingRight">0dp</item>
     </style>