代码冲突

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

WeiChat/src/main/AndroidManifest.xml

@@ -258,7 +258,7 @@
         <activity android:name=".ui.erp.activity.NewsTwoActivity" />
         <activity android:name=".ui.erp.activity.NoticesActivity" />
         <activity android:name=".ui.erp.activity.InformActivity" />
-        <activity android:name=".ui.platform.task.TaskActivity" >
+        <activity android:name=".ui.platform.task.TaskActivity">
             <intent-filter>
                 <action android:name="com.modular.task.TaskActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -918,7 +918,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".ui.platform.task.TaskB2BActivity" >
+        <activity android:name=".ui.platform.task.TaskB2BActivity">
             <intent-filter>
                 <action android:name="com.modular.task.TaskB2BActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1046,15 +1046,17 @@
         <activity android:name=".ui.erp.activity.datainquiry.activity.ReportQuerySearchActivity" />
 
         <activity android:name="com.core.widget.view.selectcalendar.SelectCalendarActivity" />
-        <activity android:name=".ui.erp.activity.oa.NavigationActivity"
+        <activity
+            android:name=".ui.erp.activity.oa.NavigationActivity"
             android:label="@string/navigation">
             <intent-filter>
                 <action android:name="com.modular.appworks.NavigationActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name="com.modular.appmessages.activity.UUSportActivity"
-            android:label="@string/set_sport"/>
+        <activity
+            android:name="com.modular.appmessages.activity.UUSportActivity"
+            android:label="@string/set_sport" />
 
     </application>