1：红点功能合并修复；

.idea/workspace.xml

@@ -188,95 +188,11 @@
     <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="FriendDao" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="cd19ad0c-18db-4018-9a76-0eb9b1df954d" name="Default" comment="1：完成全部功能的迁移；下次进行百度推送的配置以及信息的界面更新；&#10;">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/CompanyContactsActivity.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/CompanyContactsActivity.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/db/dao/FriendDao$1$1.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/db/dao/FriendDao$1$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/db/dao/FriendDao$1.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/db/dao/FriendDao$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/db/dao/FriendDao$2$1.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/db/dao/FriendDao$2$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/db/dao/FriendDao$2.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/db/dao/FriendDao$2.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/db/dao/FriendDao.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/db/dao/FriendDao.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/InformActivity$1.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/InformActivity$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/InformActivity$2.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/InformActivity$2.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/InformActivity$3.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/InformActivity$3.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/InformActivity$4.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/InformActivity$4.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/InformActivity$afterEventOnclik.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/InformActivity$afterEventOnclik.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/InformActivity$getallprocess_run.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/InformActivity$getallprocess_run.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/InformActivity.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/InformActivity.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/LeaveActivity$1.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/LeaveActivity$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/LeaveActivity$2.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/LeaveActivity$2.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/LeaveActivity$3.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/LeaveActivity$3.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/LeaveActivity$4.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/LeaveActivity$4.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/LeaveActivity$5.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/LeaveActivity$5.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/LeaveActivity.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/LeaveActivity.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$1.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$2.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$2.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$3.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$3.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$4.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$4.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$5.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$5.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$6$1.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$6$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$6.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$6.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$7$1.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$7$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$7.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$7.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$8.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$8.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$9.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$9.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$NearlyMessageAdapter$1.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$NearlyMessageAdapter$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$NearlyMessageAdapter.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment$NearlyMessageAdapter.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/MessageFragment.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NewsTwoActivity$1.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NewsTwoActivity$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NewsTwoActivity$2.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NewsTwoActivity$2.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NewsTwoActivity$CardItemAdapter$ItemModel.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NewsTwoActivity$CardItemAdapter$ItemModel.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NewsTwoActivity$CardItemAdapter.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NewsTwoActivity$CardItemAdapter.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NewsTwoActivity.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NewsTwoActivity.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NoticesActivity$1.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NoticesActivity$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NoticesActivity$2.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NoticesActivity$2.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NoticesActivity$CardItemAdapter$ItemModel.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NoticesActivity$CardItemAdapter$ItemModel.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NoticesActivity$CardItemAdapter.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NoticesActivity$CardItemAdapter.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NoticesActivity.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/NoticesActivity.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/ScheduleActivity$1.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/ScheduleActivity$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/ScheduleActivity$2$1.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/ScheduleActivity$2$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/ScheduleActivity$2.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/ScheduleActivity$2.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/ScheduleActivity$3.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/ScheduleActivity$3.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/ScheduleActivity$getallprocess_run.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/ScheduleActivity$getallprocess_run.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/ScheduleActivity.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/ScheduleActivity.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$1.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$2$1$1.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$2$1$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$2$1.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$2$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$2.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$2.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$3.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$3.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$4.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$4.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$5.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$5.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$6.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$6.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$7.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$7.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$8.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$8.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$9.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$9.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$getallprocess_run.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity$getallprocess_run.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/activity/TaskActivity.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/util/ViewUtil$1.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/util/ViewUtil$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/util/ViewUtil$2.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/util/ViewUtil$2.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/util/ViewUtil$3.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/util/ViewUtil$3.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/util/ViewUtil.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/erp/util/ViewUtil.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/xmpp/XChatManager$4.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/xmpp/XChatManager$4.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/xmpp/XChatManager$5.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/xmpp/XChatManager$5.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/xmpp/XChatManager$6.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/xmpp/XChatManager$6.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/xmpp/XChatManager.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/xmpp/XChatManager.class" />
+    <list default="true" id="cd19ad0c-18db-4018-9a76-0eb9b1df954d" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.4/taskArtifacts/cache.properties.lock" afterPath="$PROJECT_DIR$/.gradle/2.4/taskArtifacts/cache.properties.lock" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/dex/debug/classes.dex" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/dex/debug/classes.dex" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.4/taskArtifacts/fileHashes.bin" afterPath="$PROJECT_DIR$/.gradle/2.4/taskArtifacts/fileHashes.bin" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.4/taskArtifacts/fileSnapshots.bin" afterPath="$PROJECT_DIR$/.gradle/2.4/taskArtifacts/fileSnapshots.bin" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/outputs/apk/skWeiChatBaidu-debug-unaligned.apk" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/outputs/apk/skWeiChatBaidu-debug-unaligned.apk" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/outputs/apk/skWeiChatBaidu-debug.apk" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/outputs/apk/skWeiChatBaidu-debug.apk" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.4/taskArtifacts/taskArtifacts.bin" afterPath="$PROJECT_DIR$/.gradle/2.4/taskArtifacts/taskArtifacts.bin" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/CompanyContactsActivity.java" afterPath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/CompanyContactsActivity.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/db/dao/FriendDao.java" afterPath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/db/dao/FriendDao.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/InformActivity.java" afterPath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/InformActivity.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/LeaveActivity.java" afterPath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/LeaveActivity.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/message/MessageFragment.java" afterPath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/message/MessageFragment.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/NewsTwoActivity.java" afterPath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/NewsTwoActivity.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/NoticesActivity.java" afterPath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/NoticesActivity.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/ScheduleActivity.java" afterPath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/ScheduleActivity.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/TaskActivity.java" afterPath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/TaskActivity.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/util/ViewUtil.java" afterPath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/util/ViewUtil.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/xmpp/XChatManager.java" afterPath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/xmpp/XChatManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="SkWeiChat-Baidu.iws" />
@@ -390,8 +306,8 @@
       <file leaf-file-name="CompanyContactsActivity.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/CompanyContactsActivity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.495702">
-              <caret line="94" column="43" selection-start-line="94" selection-start-column="43" selection-end-line="94" selection-end-column="43" />
+            <state vertical-scroll-proportion="0.56160456">
+              <caret line="95" column="36" selection-start-line="95" selection-start-column="36" selection-end-line="95" selection-end-column="36" />
               <folding />
             </state>
           </provider>
@@ -7119,7 +7035,13 @@
       <option name="project" value="LOCAL" />
       <updated>1456392508897</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="1：完成全部功能的迁移；下次进行百度推送的配置以及信息的界面更新；&#10;">
+      <created>1457086164725</created>
+      <option name="number" value="00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1457086164725</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="TodoView" selected-index="2">
@@ -7153,7 +7075,7 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16490166" sideWeight="0.76175547" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.0075642965" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22163388" sideWeight="0.5040431" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22163388" sideWeight="0.5040431" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38395905" sideWeight="0.5173979" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" x="866" y="690" width="201" height="280" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -7455,6 +7377,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.28809524">
           <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -7513,6 +7436,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.9444444">
           <caret line="66" column="40" selection-start-line="66" selection-start-column="40" selection-end-line="66" selection-end-column="40" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -7551,6 +7475,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.65">
           <caret line="24" column="18" selection-start-line="24" selection-start-column="18" selection-end-line="24" selection-end-column="18" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -7643,6 +7568,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="163" column="84" selection-start-line="163" selection-start-column="84" selection-end-line="163" selection-end-column="84" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -7650,6 +7576,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="98" column="88" selection-start-line="96" selection-start-column="7" selection-end-line="98" selection-end-column="88" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -7685,6 +7612,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6895075">
           <caret line="565" column="120" selection-start-line="563" selection-start-column="10" selection-end-line="565" selection-end-column="120" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -7692,6 +7620,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-10.464286">
           <caret line="62" column="86" selection-start-line="60" selection-start-column="8" selection-end-line="62" selection-end-column="86" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -7857,8 +7786,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/CompanyContactsActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.495702">
-          <caret line="94" column="43" selection-start-line="94" selection-start-column="43" selection-end-line="94" selection-end-column="43" />
+        <state vertical-scroll-proportion="0.56160456">
+          <caret line="95" column="36" selection-start-line="95" selection-start-column="36" selection-end-line="95" selection-end-column="36" />
           <folding />
         </state>
       </provider>