代码冲突

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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
#	app_core/common/src/main/java/com/common/data/StringUtil.java

app_core/common/src/main/res/drawable/select_weixin_list_item.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/item_color1" android:state_pressed="true" />
-    <item android:drawable="@color/item_color1" android:state_selected="true"/>
+    <item android:drawable="@color/antionbarcolor" android:state_pressed="true" />
+    <item android:drawable="@color/antionbarcolor" android:state_selected="true"/>
     <item android:drawable="@color/item_color2" />
 </selector>

app_core/common/src/main/res/layout/item_pop_list_select.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+  
+    <TextView
+        android:id="@+id/tv_item_name"
+        android:paddingLeft="2dp"
+        android:paddingRight="2dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:textSize="14sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/selector_me_menu_item_bg"
+        android:gravity="center"
+        android:text="xxx" />
+</RelativeLayout>

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServicesActivity.java

@@ -488,6 +488,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                 @Override
                 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                     popupWindow.dismiss();
+                    pageSize=1;
                     switch (position) {
                         case 0:
                            loadSeachData("500",pageSize);
@@ -496,6 +497,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                             loadSeachData("1000",pageSize);
                             break;
                         case 2:
+                            
                             loadSeachData("2000",pageSize);
                             break;
                         case 3: