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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java

@@ -69,9 +69,9 @@ import java.util.regex.Pattern;
 
 /**
  * 聊天点头像查看个人基本资料
- * 
+ *
  * @author Dean Tao
- * 
+ *
  */
 public class BasicInfoActivity extends BaseActivity implements NewFriendListener {
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleActivity.java

@@ -167,7 +167,7 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView{
 		});
 		mPullToRefreshListView.getRefreshableView().addHeaderView(mMyCoverView, null, false);
 		mAdapter = new PublicMessageAdapter(this, mMessages);
-		  setListenerAudio(mAdapter);//设置借口回调
+		  setListenerAudio(mAdapter); //设置借口回调
 		mPullToRefreshListView.getRefreshableView().setAdapter(mAdapter);
 
 		mPullToRefreshListView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/StringUtils.java

@@ -28,9 +28,9 @@ public class StringUtils {
 	}
 
 	static Pattern phoneNumberPat = Pattern.compile("^((13[0-9])|(147)|(15[0-3,5-9])|(17[0,6-8])|(18[0-9]))\\d{8}$");
-	static Pattern nickNamePat = Pattern.compile("^[\u4e00-\u9fa5_a-zA-Z0-9_]{3,15}$");// 3-10个字符
+	static Pattern nickNamePat = Pattern.compile("^[\u4e00-\u9fa5_a-zA-Z0-9_]{0,15}$");// 3-10个字符
 	static Pattern searchNickNamePat = Pattern.compile("^[\u4e00-\u9fa5_a-zA-Z0-9_]*$");// 不限制长度，可以为空字符串
-	static Pattern companyNamePat = Pattern.compile("^[\u4e00-\u9fa5_a-zA-Z0-9_]{3,50}$");// 3-50个字符
+	static Pattern companyNamePat = Pattern.compile("^[\u4e00-\u9fa5_a-zA-Z0-9_]{0,50}$");// 3-50个字符
 
 	/* 是否是手机号 */
 	public static boolean isMobileNumber(String mobiles) {

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

@@ -36,7 +36,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="40dip"
                         android:background="#F2F2F2"
-                        android:orientation="horizontal"></RadioGroup>
+                        android:orientation="horizontal"/>
                 </RelativeLayout>
             </HorizontalScrollView>
 

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

@@ -179,7 +179,6 @@
 
         <com.xzjmyk.pm.activity.view.DataLoadView
             android:id="@+id/data_load_view"
-
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
     </RelativeLayout>