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

WeiChat/src/main/AndroidManifest.xml

@@ -373,34 +373,6 @@
             android:name="com.ipaulpro.afilechooser.FileReceiverActivity"
             android:screenOrientation="portrait" />
 
-        <!-- baidu  push service start -->
-        <!-- 用于接收系统消息以保证PushService正常运行 -->
-        <!-- push富媒体，使用富媒体推送必须声明 -->
-        <!--   <activity
-               android:name="com.baidu.android.pushservice.richmedia.MediaViewActivity"
-               android:configChanges="orientation|keyboardHidden"
-               android:label="MediaViewActivity" >
-           </activity>
-           <activity
-               android:name="com.baidu.android.pushservice.richmedia.MediaListActivity"
-               android:configChanges="orientation|keyboardHidden"
-               android:label="MediaListActivity"
-               android:launchMode="singleTask" >
-           </activity>-->
-        <!-- push富媒体结束 -->
-
-        <!-- push应用定义消息receiver声明 -->
-        <receiver android:name=".ui.PushNetMessageReceiver">
-            <intent-filter android:priority="1000">
-
-                <!-- 接收push消息 -->
-                <action android:name="com.baidu.android.pushservice.action.MESSAGE" />
-                <!-- 接收bind,unbind,fetch,delete等反馈消息 -->
-                <action android:name="com.baidu.android.pushservice.action.RECEIVE" />
-                <action android:name="com.baidu.android.pushservice.action.notification.CLICK" />
-            </intent-filter>
-        </receiver>
-
         <!-- oA模块提醒功能本地推送 -->
         <receiver android:name=".ui.erp.util.alarm.AlarmReceiver">
             <intent-filter>
@@ -768,6 +740,35 @@
             android:protectionLevel="signature"
             android:writePermission="baidu.push.permission.WRITE_PUSHINFOPROVIDER.com.xzjmyk.pm.activity" />
 
+        <!-- baidu  push service start -->
+        <!-- 用于接收系统消息以保证PushService正常运行 -->
+        <!-- push富媒体，使用富媒体推送必须声明 -->
+        <!--   <activity
+               android:name="com.baidu.android.pushservice.richmedia.MediaViewActivity"
+               android:configChanges="orientation|keyboardHidden"
+               android:label="MediaViewActivity" >
+           </activity>
+           <activity
+               android:name="com.baidu.android.pushservice.richmedia.MediaListActivity"
+               android:configChanges="orientation|keyboardHidden"
+               android:label="MediaListActivity"
+               android:launchMode="singleTask" >
+           </activity>-->
+        <!-- push富媒体结束 -->
+
+        <!-- push应用定义消息receiver声明 -->
+        <receiver android:name=".ui.PushNetMessageReceiver">
+            <intent-filter android:priority="1000">
+
+                <!-- 接收push消息 -->
+                <action android:name="com.baidu.android.pushservice.action.MESSAGE" />
+                <!-- 接收bind,unbind,fetch,delete等反馈消息 -->
+                <action android:name="com.baidu.android.pushservice.action.RECEIVE" />
+                <action android:name="com.baidu.android.pushservice.action.notification.CLICK" />
+            </intent-filter>
+        </receiver>
+
+
         <!-- 在百度开发者中心查询应用的API Key -->
         <meta-data
             android:name="api_key"