Merge branch 'developer_master' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer_master

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/FriendDao.java

@@ -99,16 +99,16 @@ public class FriendDao {
 				Log.i("FriendDao","创建系统菜单........");
 				friendDao.create(friend);
 				// 添加一条新朋友提示，更新到好友表中
-				ChatMessage chatMessage = new ChatMessage();
-				chatMessage.setType(XmppMessage.TYPE_TIP);
-				chatMessage.setPacketId(UUID.randomUUID().toString().replaceAll("-", ""));// 随机产生一个PacketId
-				chatMessage.setFromUserId(Friend.ID_NEW_FRIEND_MESSAGE);
-				chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
-				chatMessage.setTimeSend(TimeUtils.sk_time_current_time());
-				chatMessage.setContent("");
-				chatMessage.setMySend(false);// 表示不是自己发的
-				// 更新消息记录
-				updateLastChatMessage(ownerId, Friend.ID_NEW_FRIEND_MESSAGE, chatMessage);
+//				ChatMessage chatMessage = new ChatMessage();
+//				chatMessage.setType(XmppMessage.TYPE_TIP);
+//				chatMessage.setPacketId(UUID.randomUUID().toString().replaceAll("-", ""));// 随机产生一个PacketId
+//				chatMessage.setFromUserId(Friend.ID_NEW_FRIEND_MESSAGE);
+//				chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
+//				chatMessage.setTimeSend(TimeUtils.sk_time_current_time());
+//				chatMessage.setContent("");
+//				chatMessage.setMySend(false);// 表示不是自己发的
+//				// 更新消息记录
+//				updateLastChatMessage(ownerId, Friend.ID_NEW_FRIEND_MESSAGE, chatMessage);
 			}
 
 			// 系统消息10000号
@@ -119,21 +119,21 @@ public class FriendDao {
 			if (friendsList == null || friendsList.size() <= 0) {// 添加这个系统消息10000号
 				friendDao.create(friend);
 				// 添加一条系统提示
-				ChatMessage chatMessage = new ChatMessage();
-				chatMessage.setType(XmppMessage.TYPE_TIP);
-				chatMessage.setPacketId(UUID.randomUUID().toString().replaceAll("-", ""));// 随机产生一个PacketId
-				chatMessage.setFromUserId(Friend.ID_SYSTEM_MESSAGE);
-				chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
-				// 为了使得初始生成的系统消息排在新朋友前面，所以在时间节点上延迟一点 1s
-				chatMessage.setTimeSend(TimeUtils.sk_time_current_time() + 1);
-				chatMessage.setContent(MyApplication.getInstance().getString(R.string.welcome_user_software));
-				chatMessage.setMySend(false);// 表示不是自己发的
-				// 往消息表里插入一条记录
-				ChatMessageDao.getInstance().saveNewSingleChatMessage(ownerId, Friend.ID_SYSTEM_MESSAGE, chatMessage);
-				// 往朋友表里面插入一条未读记录
-				markUserMessageUnRead(ownerId, Friend.ID_SYSTEM_MESSAGE);
-				// 更新消息记录
-				updateLastChatMessage(ownerId, Friend.ID_SYSTEM_MESSAGE, chatMessage);
+//				ChatMessage chatMessage = new ChatMessage();
+//				chatMessage.setType(XmppMessage.TYPE_TIP);
+//				chatMessage.setPacketId(UUID.randomUUID().toString().replaceAll("-", ""));// 随机产生一个PacketId
+//				chatMessage.setFromUserId(Friend.ID_SYSTEM_MESSAGE);
+//				chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
+//				// 为了使得初始生成的系统消息排在新朋友前面，所以在时间节点上延迟一点 1s
+//				chatMessage.setTimeSend(TimeUtils.sk_time_current_time() + 1);
+//				chatMessage.setContent(MyApplication.getInstance().getString(R.string.welcome_user_software));
+//				chatMessage.setMySend(false);// 表示不是自己发的
+//				// 往消息表里插入一条记录
+//				ChatMessageDao.getInstance().saveNewSingleChatMessage(ownerId, Friend.ID_SYSTEM_MESSAGE, chatMessage);
+//				// 往朋友表里面插入一条未读记录
+//				markUserMessageUnRead(ownerId, Friend.ID_SYSTEM_MESSAGE);
+//				// 更新消息记录
+//				updateLastChatMessage(ownerId, Friend.ID_SYSTEM_MESSAGE, chatMessage);
 			}
 
 			// 商务圈消息10002

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

@@ -131,6 +131,7 @@ public class LoginHelper {
 						userStatus = STATUS_USER_NO_UPDATE;
 					}
 				} else {// Token过期
+					//STATUS_USER_TOKEN_OVERDUE
 					userStatus = STATUS_USER_TOKEN_OVERDUE;
 				}
 			}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -251,6 +251,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         }
         HashMap<String, String> params = new HashMap<String, String>();
         params.put("access_token", MyApplication.getInstance().mAccessToken);
+
         final BaseActivity mContext = MainActivity.this;
         StringJsonArrayRequest<CircleMessage> request = new StringJsonArrayRequest<CircleMessage>(
                 config.MSG_LIST, new Response.ErrorListener() {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/SplashActivity.java

@@ -126,6 +126,7 @@ public class SplashActivity extends BaseActivity {
 		case LoginHelper.STATUS_USER_FULL:
 		case LoginHelper.STATUS_USER_NO_UPDATE:
 		case LoginHelper.STATUS_USER_TOKEN_OVERDUE:
+			//状态，进入主mainactivity
 			intent.setClass(mContext, MainActivity.class);
 			break;
 		case LoginHelper.STATUS_USER_SIMPLE_TELPHONE:

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

@@ -59,6 +59,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.CompanyContactsActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.MyFriendActivity;
 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.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;
@@ -293,6 +294,8 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
         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);
         Log.i("wang", "headview:" + headview);
         mPullToRefreshListView.getRefreshableView().addHeaderView(headview);
@@ -302,6 +305,7 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
         my_friends_rl = (RelativeLayout) headview.findViewById(R.id.my_friends_rl);
         local_video_rl = (RelativeLayout) headview.findViewById(R.id.local_video_rl);
         chat_manage_rl=(RelativeLayout) headview.findViewById(R.id.my_friend_manage);
+
 //        ViewAlphaUtil.setViewAlpha(my_data_rl);
 //        ViewAlphaUtil.setViewAlpha(my_friend_rl);
 
@@ -489,6 +493,8 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
                 mHandler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
+                        isHideManageChatMenu();
+
                         mSortFriends.clear();
                         mSideBar.clearExist();
                         mSideBar.addExist("↑");
@@ -511,6 +517,20 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
         }).start();
     }
 
+    private void isHideManageChatMenu() {
+        //判断隐藏或者显示管理群
+        DBManager db=new DBManager(ct);
+        String master= CommonUtil.getSharedPreferences(ct, "erp_master");
+        String emCode=CommonUtil.getSharedPreferences(ct,"erp_username");
+        //查找本地数据库，管理群存在，则不创建
+        List<HrorgsEntity> hlist=db.queryHrorgList(new String[]{master,emCode}, "whichsys=? and or_headmancode=?");
+        if (hlist.isEmpty()){
+            chat_manage_rl.setVisibility(View.GONE);
+        }else{
+            chat_manage_rl.setVisibility(View.VISIBLE);
+        }
+    }
+
     private final void setSortCondition(BaseSortModel<Friend> mode) {
         Friend friend = mode.getBean();
         if (friend == null) {

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

@@ -349,7 +349,6 @@ public class ChatActivity extends ActionBackActivity
 
                 @Override
                 public void run() {
-                    // TODO Auto-generated method stub
                     int messageType = instantMessage.getType();
                     if (messageType == XmppMessage.TYPE_TEXT) {// 转发文字
 
@@ -841,7 +840,7 @@ public class ChatActivity extends ActionBackActivity
                     mChatContentView.setNeedRefresh(false);
                 }
             }
-        }, 1000);
+        }, 1);
     }
 
     /***********************

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

@@ -918,7 +918,7 @@ public class MucChatActivity extends ActionBackActivity
                     mChatContentView.setNeedRefresh(false);
                 }
             }
-        }, 1000);
+        }, 1);
     }
 
     /***********************

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/ChatContentView.java

@@ -229,7 +229,7 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
         if (mChatContentAdapter == null) {
             return;
         }
-        mChatContentAdapter.notifyDataSetInvalidated();
+        mChatContentAdapter.notifyDataSetChanged();
         if (scrollToBottom)
             scrollToBottom();
     }

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

@@ -66,13 +66,15 @@
             android:background="@drawable/set_list_next"
             android:contentDescription="@string/app_name"
             android:visibility="gone" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:layout_alignParentBottom="true"
+            android:background="@color/item_line"
+             />
     </RelativeLayout>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/line"
-        android:background="@color/item_line"
-        android:visibility="gone" />
+
 
     <RelativeLayout
         android:id="@+id/my_friends_rl"
@@ -98,34 +100,30 @@
             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>
 
     <RelativeLayout
-        android:id="@+id/my_friend_rl"
+        android:id="@+id/my_friend_manage"
         style="@style/IMTbleLine_UP">
 
         <ImageView
-            android:id="@+id/avatar_img"
+            android:id="@+id/avatar_img_manage"
             android:layout_width="38dp"
             android:layout_height="38dp"
             android:layout_centerVertical="true"
             android:contentDescription="@string/app_name"
-            android:src="@drawable/qunliao" />
+            android:src="@drawable/icon_manage" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginLeft="12dp"
-            android:layout_toRightOf="@+id/avatar_img"
+            android:layout_toRightOf="@+id/avatar_img_manage"
             android:drawablePadding="10dp"
             android:gravity="center"
-            android:text="商务群"
+            android:text="管理群"
             android:textColor="@color/text_main"
             android:textSize="14sp" />
 
@@ -137,19 +135,21 @@
             android:background="@drawable/set_list_next"
             android:contentDescription="@string/app_name"
             android:visibility="gone" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:layout_alignParentBottom="true"
+            android:background="@color/item_line" />
     </RelativeLayout>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/line"
-        android:background="@color/item_line" />
+
 
     <RelativeLayout
-        android:id="@+id/my_friend_manage"
+        android:id="@+id/my_friend_rl"
         style="@style/IMTbleLine_UP">
 
         <ImageView
-            android:id="@+id/avatar_img_manage"
+            android:id="@+id/avatar_img"
             android:layout_width="38dp"
             android:layout_height="38dp"
             android:layout_centerVertical="true"
@@ -161,10 +161,10 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginLeft="12dp"
-            android:layout_toRightOf="@+id/avatar_img_manage"
+            android:layout_toRightOf="@+id/avatar_img"
             android:drawablePadding="10dp"
             android:gravity="center"
-            android:text="管理群"
+            android:text="商务群"
             android:textColor="@color/text_main"
             android:textSize="14sp" />
 
@@ -176,8 +176,17 @@
             android:background="@drawable/set_list_next"
             android:contentDescription="@string/app_name"
             android:visibility="gone" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:layout_alignParentBottom="true"
+            android:background="@color/item_line" />
     </RelativeLayout>
 
+
+
+
+
     <RelativeLayout
         android:id="@+id/local_video_rl"
         style="@style/IMTbleLine_UP"
@@ -229,11 +238,9 @@
             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" />
+
 </LinearLayout>