权限划分

4dbd236f · wangqinghua · 3ad121ac · 4dbd236f · 4dbd236f · 4dbd236f
Commit 4dbd236f authored Jun 13, 2019 by wangqinghua
65 changed files
--- a/config.xml
+++ b/config.xml
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.partyCloud.starter.test" version="0.5.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.partyCloud.starter.test" version="0.5.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
    <name>部机关党建云(测试)</name>
    <description>An awesome Ionic/Cordova app.</description>
    <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>

--- a/platforms/android/.gradle/4.1/fileHashes/fileHashes.bin
+++ b/platforms/android/.gradle/4.1/fileHashes/fileHashes.bin
--- a/platforms/android/.gradle/4.1/fileHashes/fileHashes.lock
+++ b/platforms/android/.gradle/4.1/fileHashes/fileHashes.lock
--- a/platforms/android/.gradle/4.1/javaCompile/classAnalysis.bin
+++ b/platforms/android/.gradle/4.1/javaCompile/classAnalysis.bin
--- a/platforms/android/.gradle/4.1/javaCompile/javaCompile.lock
+++ b/platforms/android/.gradle/4.1/javaCompile/javaCompile.lock
--- a/platforms/android/.gradle/4.1/javaCompile/taskHistory.bin
+++ b/platforms/android/.gradle/4.1/javaCompile/taskHistory.bin
--- a/platforms/android/.gradle/4.1/taskHistory/fileSnapshots.bin
+++ b/platforms/android/.gradle/4.1/taskHistory/fileSnapshots.bin
--- a/platforms/android/.gradle/4.1/taskHistory/taskHistory.bin
+++ b/platforms/android/.gradle/4.1/taskHistory/taskHistory.bin
--- a/platforms/android/.gradle/4.1/taskHistory/taskHistory.lock
+++ b/platforms/android/.gradle/4.1/taskHistory/taskHistory.lock
--- a/platforms/android/app/build/generated/source/buildConfig/debug/io/ionic/partyCloud/starter/test/BuildConfig.java
+++ b/platforms/android/app/build/generated/source/buildConfig/debug/io/ionic/partyCloud/starter/test/BuildConfig.java
@@ -8,6 +8,6 @@ public final class BuildConfig {
  public static final String APPLICATION_ID = "io.ionic.partyCloud.starter.test";
  public static final String BUILD_TYPE = "debug";
  public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 501;
+  public static final int VERSION_CODE = 502;
-  public static final String VERSION_NAME = "0.5.1";
+  public static final String VERSION_NAME = "0.5.2";
 }
--- a/platforms/android/app/build/generated/source/buildConfig/release/io/ionic/partyCloud/starter/test/BuildConfig.java
+++ b/platforms/android/app/build/generated/source/buildConfig/release/io/ionic/partyCloud/starter/test/BuildConfig.java
@@ -8,6 +8,6 @@ public final class BuildConfig {
  public static final String APPLICATION_ID = "io.ionic.partyCloud.starter.test";
  public static final String BUILD_TYPE = "release";
  public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 501;
+  public static final int VERSION_CODE = 505;
-  public static final String VERSION_NAME = "0.5.1";
+  public static final String VERSION_NAME = "0.5.5";
 }
--- a/platforms/android/app/build/intermediates/blame/res/debug/multi-v2/debug.json
+++ b/platforms/android/app/build/intermediates/blame/res/debug/multi-v2/debug.json
 {
    "logs": [
        {
-            "outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-in_values-in.arsc.flat",
+            "outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-iw_values-iw.arsc.flat",
            "map": [
                {
-                    "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-in/values-in.xml",
+                    "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-iw/values-iw.xml",
                    "from": {
                        "startLines": "2",
                        "startColumns": "4",
                        "startOffsets": "55",
-                        "endColumns": "100",
+                        "endColumns": "102",
-                        "endOffsets": "151"
+                        "endOffsets": "153"
                    }
                }
            ]
        },
        {
-            "outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-iw_values-iw.arsc.flat",
+            "outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-in_values-in.arsc.flat",
            "map": [
                {
-                    "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-iw/values-iw.xml",
+                    "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-in/values-in.xml",
                    "from": {
                        "startLines": "2",
                        "startColumns": "4",
                        "startOffsets": "55",
-                        "endColumns": "102",
+                        "endColumns": "100",
-                        "endOffsets": "153"
+                        "endOffsets": "151"
                    }
                }
            ]
@@ -46,31 +46,31 @@
            ]
        },
        {
-            "outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-v16_values-v16.arsc.flat",
+            "outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-bs_values-bs.arsc.flat",
            "map": [
                {
-                    "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-v16/values-v16.xml",
+                    "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-bs/values-bs.xml",
                    "from": {
                        "startLines": "2",
                        "startColumns": "4",
                        "startOffsets": "55",
-                        "endColumns": "65",
+                        "endColumns": "100",
-                        "endOffsets": "116"
+                        "endOffsets": "151"
                    }
                }
            ]
        },
        {
-            "outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-bs_values-bs.arsc.flat",
+            "outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-v16_values-v16.arsc.flat",
            "map": [
                {
-                    "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-bs/values-bs.xml",
+                    "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-v16/values-v16.xml",
                    "from": {
                        "startLines": "2",
                        "startColumns": "4",
                        "startOffsets": "55",
-                        "endColumns": "100",
+                        "endColumns": "65",
-                        "endOffsets": "151"
+                        "endOffsets": "116"
                    }
                }
            ]

--- a/platforms/android/app/build/intermediates/blame/res/debug/single/debug.json
+++ b/platforms/android/app/build/intermediates/blame/res/debug/single/debug.json
@@ -40,16 +40,16 @@
        "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action_tombstone.xml"
    },
    {
-        "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-mdpi_screen.png.flat",
+        "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-mdpi-v4_notification_bg_low_normal.9.png.flat",
-        "source": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-mdpi/screen.png"
+        "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-mdpi-v4/notification_bg_low_normal.9.png"
    },
    {
        "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_media_action.xml.flat",
        "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_media_action.xml"
    },
    {
-        "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-mdpi-v4_notification_bg_low_normal.9.png.flat",
+        "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-mdpi_screen.png.flat",
-        "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-mdpi-v4/notification_bg_low_normal.9.png"
+        "source": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-mdpi/screen.png"
    },
    {
        "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable_notification_bg.xml.flat",

--- a/platforms/android/app/build/intermediates/classes/debug/io/ionic/partyCloud/starter/test/BuildConfig.class
+++ b/platforms/android/app/build/intermediates/classes/debug/io/ionic/partyCloud/starter/test/BuildConfig.class
--- a/platforms/android/app/build/intermediates/classes/release/io/ionic/partyCloud/starter/test/BuildConfig.class
+++ b/platforms/android/app/build/intermediates/classes/release/io/ionic/partyCloud/starter/test/BuildConfig.class
--- a/platforms/android/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/platforms/android/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
-#Sun Jun 09 11:29:01 CST 2019
+#Sun Jun 09 16:46:28 CST 2019
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-xhdpi-v4/notification_bg_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_notification_bg_normal.9.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notification_bg_low_pressed.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-hdpi-v4_notification_bg_low_pressed.9.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_action_tombstone.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_action_tombstone.xml.flat
@@ -35,17 +35,17 @@
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/xml/opener_paths.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/xml_opener_paths.xml.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-ldpi/icon.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/mipmap-ldpi_icon.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_template_part_time.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_part_time.xml.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action_tombstone.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout-v21_notification_action_tombstone.xml.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xxhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-land-xxhdpi_screen.png.flat
-/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-xhdpi_screen.png.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action_tombstone.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout-v21_notification_action_tombstone.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media_narrow.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_big_media_narrow.xml.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout-v21_notification_action.xml.flat
+/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-xhdpi_screen.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_template_icon_group.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout-v21_notification_template_icon_group.xml.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media_custom.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_big_media_custom.xml.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout-v21_notification_action.xml.flat
-/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-land-xhdpi_screen.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_template_part_chronometer.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_part_chronometer.xml.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-v21/notification_action_background.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-v21_notification_action_background.xml.flat
+/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-land-xhdpi_screen.png.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media_custom.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_big_media_custom.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_media.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_media.xml.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-v21/notification_action_background.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-v21_notification_action_background.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-xhdpi-v4/notification_bg_low_pressed.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_notification_bg_low_pressed.9.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-mdpi-v4/notify_panel_notification_icon_bg.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-mdpi-v4_notify_panel_notification_icon_bg.png.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-hdpi/icon.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/mipmap-hdpi_icon.png.flat
@@ -53,10 +53,10 @@
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-xxhdpi/icon.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/mipmap-xxhdpi_icon.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_action.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-xhdpi-v4/notification_bg_low_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_notification_bg_low_normal.9.png.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notification_bg_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-hdpi-v4_notification_bg_normal.9.png.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xxxhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-land-xxxhdpi_screen.png.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notification_bg_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-hdpi-v4_notification_bg_normal.9.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_media_cancel_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_media_cancel_action.xml.flat
-/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-hdpi_screen.png.flat
-/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-land-hdpi_screen.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v16/notification_template_custom_big.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout-v16_notification_template_custom_big.xml.flat
+/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-land-hdpi_screen.png.flat
+/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-hdpi_screen.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-hdpi-v4_notify_panel_notification_icon_bg.png.flat
--- a/platforms/android/app/build/intermediates/incremental/mergeReleaseResources/compile-file-map.properties
+++ b/platforms/android/app/build/intermediates/incremental/mergeReleaseResources/compile-file-map.properties
-#Thu Jun 06 13:40:17 CST 2019
+#Mon Jun 10 16:08:07 CST 2019
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-xhdpi-v4/notification_bg_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-xhdpi-v4_notification_bg_normal.9.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notification_bg_low_pressed.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-hdpi-v4_notification_bg_low_pressed.9.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_action_tombstone.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_action_tombstone.xml.flat
@@ -35,17 +35,17 @@
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/xml/opener_paths.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/xml_opener_paths.xml.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-ldpi/icon.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/mipmap-ldpi_icon.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_template_part_time.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_part_time.xml.flat
-/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xxhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-xxhdpi_screen.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action_tombstone.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout-v21_notification_action_tombstone.xml.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media_narrow.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_big_media_narrow.xml.flat
+/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xxhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-xxhdpi_screen.png.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-port-xhdpi_screen.png.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_template_icon_group.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout-v21_notification_template_icon_group.xml.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media_narrow.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_big_media_narrow.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout-v21_notification_action.xml.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_template_part_chronometer.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_part_chronometer.xml.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_template_icon_group.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout-v21_notification_template_icon_group.xml.flat
-/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-xhdpi_screen.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media_custom.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_big_media_custom.xml.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_media.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_media.xml.flat
+/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-xhdpi_screen.png.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_template_part_chronometer.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_part_chronometer.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-v21/notification_action_background.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-v21_notification_action_background.xml.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_media.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_media.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-xhdpi-v4/notification_bg_low_pressed.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-xhdpi-v4_notification_bg_low_pressed.9.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-mdpi-v4/notify_panel_notification_icon_bg.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-mdpi-v4_notify_panel_notification_icon_bg.png.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-hdpi/icon.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/mipmap-hdpi_icon.png.flat
@@ -53,10 +53,10 @@
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-xxhdpi/icon.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/mipmap-xxhdpi_icon.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_action.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-xhdpi-v4/notification_bg_low_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-xhdpi-v4_notification_bg_low_normal.9.png.flat
-/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xxxhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-xxxhdpi_screen.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notification_bg_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-hdpi-v4_notification_bg_normal.9.png.flat
+/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xxxhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-xxxhdpi_screen.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_media_cancel_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_media_cancel_action.xml.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v16/notification_template_custom_big.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout-v16_notification_template_custom_big.xml.flat
-/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-hdpi_screen.png.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-port-hdpi_screen.png.flat
+/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-hdpi_screen.png.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v16/notification_template_custom_big.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout-v16_notification_template_custom_big.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-hdpi-v4_notify_panel_notification_icon_bg.png.flat
--- a/platforms/android/app/build/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt
+++ b/platforms/android/app/build/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt
-#Sun Jun 09 12:01:30 CST 2019
+#Sun Jun 09 17:12:27 CST 2019
 base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0
 renamed.0=classes.dex
 file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex
--- a/platforms/android/app/build/intermediates/incremental/packageDebug/debug/file-input-save-data.txt
+++ b/platforms/android/app/build/intermediates/incremental/packageDebug/debug/file-input-save-data.txt
 #Internal package file, do not edit.
-#Sun Jun 09 12:01:31 CST 2019
+#Sun Jun 09 17:12:28 CST 2019
 20.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 143.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 439.set=ANDROID_RESOURCE
@@ -392,7 +392,7 @@
 139.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/wdzb.png
 489.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/19.js
 140.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
-49.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/mipmap-hdpi-v4/icon.png
+49.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout-v17/notification_template_big_media_narrow.xml
 409.set=ASSET
 392.set=ASSET
 36.set=ASSET
@@ -585,7 +585,7 @@
 412.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/fonts/noto-sans-bold.woff
 151.set=ANDROID_RESOURCE
 248.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-274.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-hdpi-v4/notification_bg_normal_pressed.9.png
+274.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/mipmap-xxhdpi-v4/icon.png
 5.set=ASSET
 445.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/learn/rank_title.png
 196.set=ASSET
@@ -1006,7 +1006,7 @@
 174.set=ASSET
 138.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/home/signBgc.png
 488.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/notice/notice-srzf.png
-48.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout-v17/notification_template_big_media_narrow.xml
+48.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/mipmap-hdpi-v4/icon.png
 382.set=ASSET
 26.set=ANDROID_RESOURCE
 82.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
@@ -1430,7 +1430,7 @@ count=490
 413.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/home/edu_banner.png
 161.set=ASSET
 249.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
-275.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/mipmap-xxhdpi-v4/icon.png
+275.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-hdpi-v4/notification_bg_normal_pressed.9.png
 446.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/jwplayer/jwplayer.html5.js
 479.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/cordova.plugins.diagnostic/www/android/diagnostic.notifications.js
 309.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/9.js.map

--- a/platforms/android/app/build/intermediates/incremental/packageDebug/debug/zip-cache/RO9ATzdBWnMwA5dv+APa+UrjmmE=
+++ b/platforms/android/app/build/intermediates/incremental/packageDebug/debug/zip-cache/RO9ATzdBWnMwA5dv+APa+UrjmmE=
--- a/platforms/android/app/build/intermediates/incremental/packageRelease/release/dex-renamer-state.txt
+++ b/platforms/android/app/build/intermediates/incremental/packageRelease/release/dex-renamer-state.txt
-#Sun Jun 09 13:35:17 CST 2019
+#Mon Jun 10 16:49:34 CST 2019
 base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0
 renamed.0=classes.dex
 file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0/classes.dex
--- a/platforms/android/app/build/intermediates/incremental/packageRelease/release/file-input-save-data.txt
+++ b/platforms/android/app/build/intermediates/incremental/packageRelease/release/file-input-save-data.txt
 #Internal package file, do not edit.
-#Sun Jun 09 13:35:17 CST 2019
+#Mon Jun 10 16:49:34 CST 2019
 20.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_
 143.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_
 340.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/plugins/cordova-plugin-file/www/resolveLocalFileSystemURI.js
@@ -236,7 +236,7 @@
 295.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
 214.set=ASSET
 125.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
-142.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-land-hdpi-v4/screen.png
+142.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png
 169.set=ASSET
 158.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
 52.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/layout-v17/notification_template_lines_media.xml
@@ -966,7 +966,7 @@
 224.set=ASSET
 126.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
 20.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-xhdpi-v4/notification_bg_normal.9.png
-143.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png
+143.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-land-hdpi-v4/screen.png
 102.set=ASSET
 159.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
 53.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/assets/imgs/home/icon-tips.png

--- a/platforms/android/app/build/intermediates/incremental/packageRelease/release/zip-cache/CPcHyYq9_Z_ZPS1H_yN9s59IYFQ=
+++ b/platforms/android/app/build/intermediates/incremental/packageRelease/release/zip-cache/CPcHyYq9_Z_ZPS1H_yN9s59IYFQ=
--- a/platforms/android/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
+++ b/platforms/android/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="io.ionic.partyCloud.starter.test"
    android:hardwareAccelerated="true"
-    android:versionCode="501"
+    android:versionCode="502"
-    android:versionName="0.5.1" >
+    android:versionName="0.5.2" >
    <uses-sdk
        android:minSdkVersion="16"

--- a/platforms/android/app/build/intermediates/manifests/full/debug/output.json
+++ b/platforms/android/app/build/intermediates/manifests/full/debug/output.json
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":501},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":502},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
--- a/platforms/android/app/build/intermediates/manifests/full/release/AndroidManifest.xml
+++ b/platforms/android/app/build/intermediates/manifests/full/release/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="io.ionic.partyCloud.starter.test"
    android:hardwareAccelerated="true"
-    android:versionCode="501"
+    android:versionCode="505"
-    android:versionName="0.5.1" >
+    android:versionName="0.5.5" >
    <uses-sdk
        android:minSdkVersion="16"

--- a/platforms/android/app/build/intermediates/manifests/full/release/output.json
+++ b/platforms/android/app/build/intermediates/manifests/full/release/output.json
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":501},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":505},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
--- a/platforms/android/app/build/intermediates/manifests/instant-run/debug/output.json
+++ b/platforms/android/app/build/intermediates/manifests/instant-run/debug/output.json
-[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":501},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":502},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
--- a/platforms/android/app/build/intermediates/manifests/instant-run/release/output.json
+++ b/platforms/android/app/build/intermediates/manifests/instant-run/release/output.json
-[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":501},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":505},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
--- a/platforms/android/app/build/intermediates/res/debug/output.json
+++ b/platforms/android/app/build/intermediates/res/debug/output.json
-[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":501},"path":"resources-debug.ap_","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":502},"path":"resources-debug.ap_","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
--- a/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
+++ b/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
--- a/platforms/android/app/build/intermediates/res/merged/debug/xml_config.xml.flat
+++ b/platforms/android/app/build/intermediates/res/merged/debug/xml_config.xml.flat
--- a/platforms/android/app/build/intermediates/res/merged/release/xml_config.xml.flat
+++ b/platforms/android/app/build/intermediates/res/merged/release/xml_config.xml.flat
--- a/platforms/android/app/build/intermediates/res/release/output.json
+++ b/platforms/android/app/build/intermediates/res/release/output.json
-[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":501},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":505},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
--- a/platforms/android/app/build/intermediates/res/release/resources-release.ap_
+++ b/platforms/android/app/build/intermediates/res/release/resources-release.ap_
--- a/platforms/android/app/build/intermediates/transforms/desugar/debug/1/io/ionic/partyCloud/starter/test/BuildConfig.class
+++ b/platforms/android/app/build/intermediates/transforms/desugar/debug/1/io/ionic/partyCloud/starter/test/BuildConfig.class
--- a/platforms/android/app/build/intermediates/transforms/desugar/release/1/io/ionic/partyCloud/starter/test/BuildConfig.class
+++ b/platforms/android/app/build/intermediates/transforms/desugar/release/1/io/ionic/partyCloud/starter/test/BuildConfig.class
--- a/platforms/android/app/build/intermediates/transforms/dex/release/0/classes.dex
+++ b/platforms/android/app/build/intermediates/transforms/dex/release/0/classes.dex
--- a/platforms/android/app/build/intermediates/transforms/dex/release/__content__.json
+++ b/platforms/android/app/build/intermediates/transforms/dex/release/__content__.json
-[{"name":"main","index":0,"scopes":["SUB_PROJECTS","PROJECT","EXTERNAL_LIBRARIES"],"types":["DEX"],"format":"DIRECTORY","present":true}]
+[{"name":"main","index":0,"scopes":["EXTERNAL_LIBRARIES","PROJECT","SUB_PROJECTS"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file
--- a/platforms/android/app/build/intermediates/transforms/dexBuilder/debug/0/io/ionic/partyCloud/starter/test/BuildConfig.dex
+++ b/platforms/android/app/build/intermediates/transforms/dexBuilder/debug/0/io/ionic/partyCloud/starter/test/BuildConfig.dex
--- a/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex
+++ b/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex
--- a/platforms/android/app/build/intermediates/transforms/dexMerger/debug/__content__.json
+++ b/platforms/android/app/build/intermediates/transforms/dexMerger/debug/__content__.json
-[{"name":"main","index":0,"scopes":["PROJECT","SUB_PROJECTS","EXTERNAL_LIBRARIES"],"types":["DEX"],"format":"DIRECTORY","present":true}]
+[{"name":"main","index":0,"scopes":["SUB_PROJECTS","EXTERNAL_LIBRARIES","PROJECT"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file
--- a/platforms/android/app/build/intermediates/transforms/preDex/release/0.jar
+++ b/platforms/android/app/build/intermediates/transforms/preDex/release/0.jar
--- a/platforms/android/app/build/outputs/apk/debug/app-debug.apk
+++ b/platforms/android/app/build/outputs/apk/debug/app-debug.apk
--- a/platforms/android/app/build/outputs/apk/debug/output.json
+++ b/platforms/android/app/build/outputs/apk/debug/output.json
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":501},"path":"app-debug.apk","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":502},"path":"app-debug.apk","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
--- a/platforms/android/app/build/outputs/apk/release/output.json
+++ b/platforms/android/app/build/outputs/apk/release/output.json
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":501},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":505},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
--- a/platforms/android/app/build/reports/lint-results-release-fatal.html
+++ b/platforms/android/app/build/reports/lint-results-release-fatal.html
@@ -176,7 +176,7 @@ document.getElementById(id).style.display = 'none';
      <span class="mdl-layout-title">Lint Report: 1 error</span>
      <div class="mdl-layout-spacer"></div>
      <nav class="mdl-navigation mdl-layout--large-screen-only">
-Check performed at Sun Jun 09 13:35:25 CST 2019      </nav>
+Check performed at Mon Jun 10 16:49:36 CST 2019      </nav>
    </div>
  </header>
  <div class="mdl-layout__drawer">

--- a/platforms/android/app/src/main/AndroidManifest.xml
+++ b/platforms/android/app/src/main/AndroidManifest.xml
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="501" android:versionName="0.5.1" package="io.ionic.partyCloud.starter.test" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="505" android:versionName="0.5.5" package="io.ionic.partyCloud.starter.test" xmlns:android="http://schemas.android.com/apk/res/android">
    <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
    <application android:hardwareAccelerated="true" android:icon="@mipmap/icon" android:label="@string/app_name" android:supportsRtl="true">
        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:theme="@android:style/Theme.DeviceDefault.NoActionBar" android:windowSoftInputMode="adjustResize">

--- a/platforms/android/app/src/main/res/xml/config.xml
+++ b/platforms/android/app/src/main/res/xml/config.xml
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.partyCloud.starter.test" version="0.5.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.partyCloud.starter.test" version="0.5.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
    <feature name="Keyboard">
        <param name="android-package" onload="true" value="io.ionic.keyboard.IonicKeyboard" />
    </feature>

--- a/src/components/swiper/swiper.ts
+++ b/src/components/swiper/swiper.ts
@@ -23,7 +23,6 @@ export class SwiperComponent implements OnChanges {
    initSwiper() {
        let that = this;
-        console.log(that);
        that.swiper = new Swiper('#swiper-component', {
            speed: 1000,
            autoplay:{

--- a/src/pages/discover-pages/publish/publish.ts
+++ b/src/pages/discover-pages/publish/publish.ts
@@ -28,12 +28,15 @@ export class PublishPage {
        // {name: '纪检提示', id: '10'},
        // {name: '风险排查', id: '11'},
        // {name: '警示教育', id: '12'},
-        {name: '支部风采', id: '13'},
+        {name: '支部活动', id: '13'},
+        {name: '党建联建', id: '14'},
+        {name: '结对帮扶', id: '15'},
+        {name: '学思践悟', id: '21'},
        // {name: '党建联建', id: '14'},
        // {name: '结对帮扶', id: '15'},
    ];
    obj = {
-        type: '1',
+        type: '13',
        title: '',
        content: '',
        publishRange: '',
@@ -48,15 +51,18 @@ export class PublishPage {
    type;   //视频文章or图片文章
    caroul;  //轮播图
+    role;  //权限级别
    constructor(public navCtrl: NavController, public navParams: NavParams, public storage: Storage,
                public camera: Camera, public actionSheetCtrl: ActionSheetController,
                public loadingCtrl: LoadingController, public transfer: FileTransfer,
+                private tabsSer: TabsService,
                public commonSer: CommonService, public tabSer: TabsService) {
    }
    ionViewDidLoad() {
        this.type = this.navParams.get('type');
+        this.getRole();
        this.storage.get("userLoginInfo").then((value) => {
            this.userid = value.userid;
        })
@@ -68,6 +74,16 @@ export class PublishPage {
        )
    }
+    //获取权限
+    //返回值int ：3-管理员，2-处室领导，1-内勤人员，0-普通用户
+    getRole() {
+        this.tabsSer.getRoles().subscribe(
+            (res) => {
+                this.role = res;
+            }
+        )
+    }
    tackePic(resourceType) {
        const actionSheet = this.actionSheetCtrl.create({
@@ -276,58 +292,69 @@ export class PublishPage {
    //选择发布或者预览
    handle() {
-        const actionSheet = this.actionSheetCtrl.create({
+        const preview = {
-            title: '',
+            text: '预览',
-            cssClass: 'stuffAction',
+            role: 'preview',
-            buttons: [
+            handler: () => {
-                {
+                let content = this.obj.content;
-                    text: '预览',
+                if (this.fileList.length > 0) {
-                    handler: () => {
+                    if (this.type == 'image') {    //将第一张图片作为标题图片  ,后面的图片 作为文章里面的图片
-                        let content = this.obj.content;
+                        let arr = this.fileList.slice(1);  //2.....
-                        if (this.fileList.length > 0) {
+                        arr.forEach(e => {
-                            if (this.type == 'image') {    //将第一张图片作为标题图片  ,后面的图片 作为文章里面的图片
+                            content += `<br><img src="${this.pictrue}${e.path} " alt="图片">`;
-                                let arr = this.fileList.slice(1);  //2.....
-                                arr.forEach(e => {
-                                    content += `<br><img src="${this.pictrue}${e.path} " alt="图片">`;
-                                });
-                            }
-                        }
-                        if (this.type == 'video') {
-                            this.fileList.forEach(e => {
-                                e.resourceType = 3;
-                            })
-                        }
-                        const obj = {
-                            title: this.obj.title,
-                            source: '上海市委组织部',
-                            publishTime: new Date().getTime(),
-                            content: `&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;` + content,
-                            attachments: this.fileList,
-                        }
-                        this.navCtrl.push('PreviewPage', {
-                            stuff: obj
                        });
                    }
-                }, {
-                    text: '直接发布',
-                    role: 'fromPhoto',
-                    handler: () => {
-                        this.publish(3);
-                    }
-                }, {
-                    text: '提交审核',
-                    role: 'fromPhoto',
-                    handler: () => {
-                        this.publish(2);
-                    }
-                }, {
-                    text: '取消',
-                    role: 'cancel',
-                    handler: () => {
-                        console.log('Cancel clicked');
-                    }
                }
-            ]
+                if (this.type == 'video') {
+                    this.fileList.forEach(e => {
+                        e.resourceType = 3;
+                    })
+                }
+                const obj = {
+                    title: this.obj.title,
+                    source: '上海市委组织部',
+                    publishTime: new Date().getTime(),
+                    content: `&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;` + content,
+                    attachments: this.fileList,
+                }
+                this.navCtrl.push('PreviewPage', {
+                    stuff: obj
+                });
+            }
+        };
+        const cancel = {
+            text: '取消',
+            role: 'cancel',
+            handler: () => {
+                console.log('Cancel clicked');
+            }
+        };
+        const publish = {
+            text: '直接发布',
+            role: 'publish',
+            handler: () => {
+                this.publish(3);
+            }
+        };
+        const submit = {
+            text: '提交审核',
+            role: 'submit',
+            handler: () => {
+                this.publish(2);
+            }
+        };
+        let buttonArr = [];
+        buttonArr.push(preview);
+        if (this.role == 3) {
+            buttonArr.push(publish);
+        } else {
+            buttonArr.push(submit);
+        }
+        buttonArr.push(cancel);
+        const actionSheet = this.actionSheetCtrl.create({
+            title: '',
+            cssClass: 'stuffAction',
+            buttons: buttonArr
        });
        actionSheet.present();
    }

--- a/src/pages/home-pages/stuff-detail/stuff-detail.scss
+++ b/src/pages/home-pages/stuff-detail/stuff-detail.scss
@@ -159,7 +159,8 @@ page-stuff-detail {
    .comment-item {
      .contact-img{
        border-radius: 50%;
-        width: 75%;
+        width: 50px;
+        height: 50px;
        text-align: center;
        margin-top: 8px;
      }

--- a/src/pages/home/more-app/more-app.ts
+++ b/src/pages/home/more-app/more-app.ts
@@ -73,6 +73,7 @@ export class MoreAppPage {
    }
    //获取权限
+    // 返回值int 。3-管理员，2-处室领导，1-内勤人员，0-普通用户
    getRole() {
        this.appService.ObserverHttpGet("/wisdomgroup/app/getRoles", null).subscribe((res: Response) => {
            this.role = res.json();

--- a/src/pages/mine-pages/verify/verify.html
+++ b/src/pages/mine-pages/verify/verify.html
+<ion-header>
+    <ion-navbar>
+        <ion-title>我的审核</ion-title>
+    </ion-navbar>
+</ion-header>
+<ion-content class="bgc-e7e8ed">
+    <ion-refresher (ionRefresh)="doRefresh($event)">
+        <ion-refresher-content pullingText="下拉刷新"
+                               refreshingSpinner="bubbles">
+        </ion-refresher-content>
+    </ion-refresher>
+    <div class="duty">
+        <div class="dutyItem" (click)="change(1)">
+            <span class="{{changeType == 1?'duty-title':''}}">待审核</span>
+        </div>
+        <div class="dutyItem" (click)="change(2)">
+            <span class="{{changeType == 2?'duty-title':''}}">已审核</span>
+        </div>
+    </div>
+    <ng-container *ngIf="changeType == 1">
+        <div class="main-news">
+            <ng-container *ngFor="let new of collectionList;">
+                <ng-container *ngIf="new.imgUrl">
+                    <ion-row class="news-item" (click)="goToDetail(new)">
+                        <ion-col col-8 class="news-left">
+                            <p class="news-title">
+                                {{new.title}}
+                            </p>
+                            <p class="news-end">
+                                <!--              <span>收藏时间：</span><span>{{new.publishTime | date:'yyyy-MM-dd'}}</span>-->
+                            </p>
+                        </ion-col>
+                        <ion-col col-4 class="news-right">
+                            <img src="{{picture+new.imgUrl}}">
+                        </ion-col>
+                    </ion-row>
+                </ng-container>
+                <ng-container *ngIf="!new.imgUrl">
+                    <ion-row class="news-item" (click)="goToDetail(new)">
+                        <ion-col col-12 class="news-left">
+                            <p class="news-title">
+                                {{new.title}}
+                            </p>
+                            <p class="news-end">
+                                <!--              <span>收藏时间：</span><span>{{new.publishTime | date:'yyyy-MM-dd'}}</span>-->
+                            </p>
+                        </ion-col>
+                    </ion-row>
+                </ng-container>
+            </ng-container>
+            <ion-list text-center style="margin-top: 10rem" *ngIf="!isLoad && collectionList.length == 0">
+                <img style="width: 20%;" src="./assets/imgs/no-info.png" alt="">
+                <p text-center>
+                    暂无收藏
+                </p>
+            </ion-list>
+        </div>
+    </ng-container>
+    <ng-container *ngIf="changeType == 2">
+        <div class="duty-content">
+            <ion-list *ngIf="historyDuty.length > 0">
+                <ion-item class="dutyItem" class="margin-top-10" *ngFor="let item of nowDuty">
+                    <div class="margin-bottom-15">
+                        <span>{{item.dutyDate | date:'yyyy-MM-dd'}}</span>
+                        <span *ngIf="item.type == 0">白班</span>
+                        <span *ngIf="item.type == 1">夜班</span>
+                        <span float-right class="duty-state">待值班</span>
+                    </div>
+                    <div>
+                            <span class="color-666" style="font-size: 1.5rem">
+                                <span *ngIf="item.type == 1">工作日</span>
+                                <span *ngIf="item.type == 2">节假日</span>
+                                <span *ngIf="item.type == 3">调休</span>
+                                <span *ngIf="item.type == 4">调班</span>
+                            </span>
+                        <span class="span-btn" float-right (click)="dutyDetail(item)" *ngIf="item.applyId">查看详情</span>
+                        <span class="span-btn" float-right (click)="dutyApply(item)" *ngIf="!item.applyId">申请换班</span>
+                    </div>
+                </ion-item>
+            </ion-list>
+            <ion-list text-center style="margin-top: 10rem" *ngIf="historyDuty.length == 0">
+                <img style="width: 20%;" src="./assets/imgs/no-info.png" alt="">
+                <p text-center>
+                    暂无值班
+                </p>
+            </ion-list>
+        </div>
+    </ng-container>
+    <ion-infinite-scroll (ionInfinite)="doInfinite($event)">
+        <ion-infinite-scroll-content
+                loadingSpinner="bubbles"
+                loadingText="加载中"></ion-infinite-scroll-content>
+    </ion-infinite-scroll>
+</ion-content>
--- a/src/pages/mine-pages/verify/verify.module.ts
+++ b/src/pages/mine-pages/verify/verify.module.ts
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { VerifyPage } from './verify';
+@NgModule({
+  declarations: [
+    VerifyPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(VerifyPage),
+  ],
+})
+export class VerifyPageModule {}
--- a/src/pages/mine-pages/verify/verify.scss
+++ b/src/pages/mine-pages/verify/verify.scss
+page-verify {
+  //新闻区
+  .main-news {
+    padding: 0 1rem;
+    text-align: left;
+    .news-item {
+      padding: .8rem 0;
+      .news-left {
+        display: flex;
+        flex-flow: row wrap;
+        min-height: 100%;
+        .news-title {
+          align-self: flex-start;
+          font-weight: bold;
+          width: 100%;
+          margin-bottom: .6rem;
+          color: #333333;
+          font-size: 1.6rem;
+          font-family: SourceHanSans-Bold;
+          position: relative;
+          .icon-fire {
+            position: absolute;
+            top: 3px;
+            left: -14px;
+            font-size: 1.5rem;
+            color: #e42417;
+          }
+        }
+        .news-end {
+          color: #989898;
+        }
+      }
+      .news-right {
+        text-align: center;
+        img {
+          border-radius: .5rem;
+          height: 60px;
+        }
+      }
+    }
+    .news-item + .news-item {
+      border-top: 1px solid #eeeeee;
+    }
+  }
+}
--- a/src/pages/mine-pages/verify/verify.ts
+++ b/src/pages/mine-pages/verify/verify.ts
+import {Component, ViewChild} from '@angular/core';
+import {InfiniteScrollContent, IonicPage, NavController, NavParams} from 'ionic-angular';
+import {AppGlobal, AppService} from "../../../service/http.service";
+import {MineService} from "../mine.service";
+import {CommonService} from "../../../provide/common.service";
+import {StuffDetailPage} from "../../home-pages/stuff-detail/stuff-detail";
+@IonicPage()
+@Component({
+    selector: 'page-verify',
+    templateUrl: 'verify.html',
+})
+export class VerifyPage {
+    @ViewChild(InfiniteScrollContent) infiniteScrollContent:InfiniteScrollContent;
+    changeType = 1;
+    pageNum = 1;
+    pageCount = 10;
+    collectionList = [];
+    picture: string = AppGlobal.domain + '/wisdomgroup';
+    isLoad = true;
+    loadMore = true;
+    totalNum;  //总条数
+    constructor(public navCtrl: NavController, public navParams: NavParams,
+                public mineSer: MineService, public commonSer: CommonService) {
+    }
+    ionViewDidEnter() {
+        this.getList();
+    }
+    change(type){
+    }
+    getList() {
+        const data = {
+            pageNum: this.pageNum,
+            pageCount: this.pageCount
+        };
+        this.mineSer.myCollection(data).subscribe(
+            (res) => {
+                this.collectionList = res.data.list;
+                this.isLoad = false;
+                this.totalNum = res.data.total;
+            }
+        )
+    }
+    //下拉刷新
+    doRefresh(e) {
+        this.loadMore = true;
+        this.infiniteScrollContent.inf.enable(true);
+        const data = {
+            pageNum: 1,
+            pageCount: this.pageCount
+        };
+        this.mineSer.myCollection(data).subscribe(
+            (res) => {
+                this.collectionList = res.data.list;
+                this.totalNum = res.data.total;
+                setTimeout(() => {
+                    this.commonSer.toast('刷新成功');
+                    e.complete()
+                }, 800);
+            }
+        )
+    }
+    //加载更多
+    doInfinite(e) {
+        if (this.totalNum == this.collectionList.length) {
+            this.loadMore = false;
+            e.enable(false);
+            return false;
+        }
+        this.pageNum++;
+        const data = {
+            pageNum: this.pageNum,
+            pageCount: this.pageCount
+        };
+        this.mineSer.myCollection(data).subscribe(
+            (res) => {
+                this.totalNum = res.data.total;
+                res.data.list.forEach(e => {
+                    this.collectionList.push(e);
+                });
+                setTimeout(() => {
+                    e.complete()
+                }, 800);
+            }
+        )
+    }
+    //查看文章详情
+    goToDetail(item) {
+        this.navCtrl.push(StuffDetailPage, {
+            id: item.id
+        })
+    }
+}
--- a/src/pages/mine/my-duty/my-duty.ts
+++ b/src/pages/mine/my-duty/my-duty.ts
-import { Component } from '@angular/core';
+import {Component} from '@angular/core';
-import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import {IonicPage, NavController, NavParams} from 'ionic-angular';
 import {AppService} from "../../../service/http.service";
 @IonicPage()
 @Component({
-  selector: 'page-my-duty',
+    selector: 'page-my-duty',
-  templateUrl: 'my-duty.html',
+    templateUrl: 'my-duty.html',
 })
 export class MyDutyPage {
    changeType = 1;
    nowDuty = [];
    historyDuty = [];
-  constructor(public navCtrl: NavController, public navParams: NavParams,
-              public appService: AppService) {
-  }
-  ionViewDidLoad() {
+    constructor(public navCtrl: NavController, public navParams: NavParams,
-    this.getDuty();
+                public appService: AppService) {
-  }
+    }
+    ionViewDidLoad() {
+        this.getDuty();
+    }
-    change(type){
+    change(type) {
        this.changeType = type;
    }
-    getDuty(){
+    getDuty() {
        const data = {
-            type:0
+            type: 0
        };
-        this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/app/getMySchedule',data)
+        this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/app/getMySchedule', data)
-            .subscribe((res)=>{
+            .subscribe((res) => {
                this.nowDuty = res.json();
            });
        const data1 = {
-            type:1
+            type: 1
        };
-        this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/app/getMySchedule',data1)
+        this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/app/getMySchedule', data1)
-            .subscribe((res)=>{
+            .subscribe((res) => {
                this.historyDuty = res.json();
            });
    }
    //提交申请
-    dutyApply(item){
+    dutyApply(item) {
-      let nowTime = new Date().getTime();
+        let nowTime = new Date().getTime();
-      if(nowTime > item.dutyDate){
+        if (nowTime > item.dutyDate) {
-          this.appService.popToastView('该条值班已过期','middle',1500);
+            this.appService.popToastView('该条值班已过期', 'middle', 1500);
-          return false;
+            return false;
-      }
+        }
-        this.navCtrl.push('DutyApplyPage',{
+        this.navCtrl.push('DutyApplyPage', {
-            id:item.id,
+            id: item.id,
-            date:item.dutyDate
+            date: item.dutyDate
        })
    }
    //申请详情
-    dutyDetail(item){
+    dutyDetail(item) {
-        this.navCtrl.push('DutyDetailPage',{
+        this.navCtrl.push('DutyDetailPage', {
-            "id":item.applyId,
+            "id": item.applyId,
-            'time':item.dutyDate
+            'time': item.dutyDate
        })
    }

--- a/src/pages/mine/person/personInfo/personInfo.scss
+++ b/src/pages/mine/person/personInfo/personInfo.scss
@@ -21,6 +21,7 @@ page-personInfo {
  .img {
    width: 50px;
+    height: 50px;
    border-radius: 50%;
  }

--- a/src/pages/tabs/discover/discover.html
+++ b/src/pages/tabs/discover/discover.html
@@ -238,9 +238,9 @@
        <div class="image" (click)="goToPublish('image')">
            <ion-icon class="icon iconfont icon-shipin-tianchong"></ion-icon>
            <span>发图文</span></div>
-        <div class="video" (click)="goToPublish('video')">
+<!--        <div class="video" (click)="goToPublish('video')">-->
-            <ion-icon class="icon-tupian iconfont"></ion-icon>
+<!--            <ion-icon class="icon-tupian iconfont"></ion-icon>-->
-            <span>发视频</span></div>
+<!--            <span>发视频</span></div>-->
    </div>
 </div>

--- a/src/pages/tabs/discover/discover.scss
+++ b/src/pages/tabs/discover/discover.scss
@@ -202,7 +202,7 @@ page-discover {
      background-color: #ffffff;
      transition: all 500ms;
      .tabs-children{
-        width: 90px;
+        //width: 90px;
      }
    }

--- a/src/pages/tabs/discover/discover.ts
+++ b/src/pages/tabs/discover/discover.ts
@@ -245,13 +245,15 @@ export class DiscoverPage {
    }
    ionViewDidLoad() {
-        this.itemWidth = window.screen.width / 4;
-        this.spanWidth = this.tabSpan.nativeElement.offsetWidth;   //文字宽度
        this.initSwiper();
        this.getBanner();
        this.slideList.length = 7;
        this.scrollHeight();
-        timer(20).subscribe(()=>this.changeParent(this.tabsList[0]));
+        timer(20).subscribe(()=>{
+            this.itemWidth = window.screen.width / 4;
+            this.spanWidth = this.tabSpan.nativeElement.offsetWidth;   //文字宽度
+            this.changeParent(this.tabsList[0])
+        });
    }

--- a/src/pages/tabs/mine/mine.html
+++ b/src/pages/tabs/mine/mine.html
@@ -87,6 +87,15 @@
                    <ion-icon name="ios-arrow-forward"></ion-icon>
                </ion-col>
            </ion-row>
+            <ion-row (click)="goTo('VerifyPage')">
+                <ion-col class="group-left" col-2>
+                    <img src="./assets/imgs/mine/wdfb.png" >
+                </ion-col>
+                <ion-col class="group-right" col-10>
+                    <span>我的审核</span>
+                    <ion-icon name="ios-arrow-forward"></ion-icon>
+                </ion-col>
+            </ion-row>
            <ion-row (click)="goTo('MyCollectionPage')">
                <ion-col class="group-left" col-2>
                    <img src="./assets/imgs/mine/wdsc.png" >

--- a/src/pages/tabs/mine/mine.scss
+++ b/src/pages/tabs/mine/mine.scss
@@ -11,6 +11,7 @@ page-mine {
      img{
        border-radius: 50%;
        width: 70px;
+        height: 70px;
      }
    }

--- a/src/pages/tabs/serve/serve.ts
+++ b/src/pages/tabs/serve/serve.ts
@@ -139,19 +139,6 @@ export class ServePage {
        }
    }
-    //获取权限
-    getRole() {
-        this.tabsSer.getRoles().subscribe(
-            (res) => {
-                this.role = res
-            },
-            error => {
-                this.appService.alert('系统错误！');
-            }
-        )
-    }
    go(item) {
        if (item.type == 1) {
            this.getActivity(item.id);