update

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.smart19.starter" version="4.3.2 " xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.smart19.starter" version="4.3.2" 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>

platforms/android/app/build/generated/source/buildConfig/debug/io/ionic/smart19/starter/BuildConfig.java

@@ -8,6 +8,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "io.ionic.smart19.starter";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 40301;
-  public static final String VERSION_NAME = "4.3.1";
+  public static final int VERSION_CODE = 40302;
+  public static final String VERSION_NAME = "4.3.2 ";
 }

platforms/android/app/build/generated/source/buildConfig/release/io/ionic/smart19/starter/BuildConfig.java

@@ -8,6 +8,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "io.ionic.smart19.starter";
   public static final String BUILD_TYPE = "release";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 40301;
-  public static final String VERSION_NAME = "4.3.1";
+  public static final int VERSION_CODE = 40302;
+  public static final String VERSION_NAME = "4.3.2 ";
 }

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",
-                        "endOffsets": "151"
+                        "endColumns": "102",
+                        "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",
-                        "endOffsets": "153"
+                        "endColumns": "100",
+                        "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",
-                        "endOffsets": "116"
+                        "endColumns": "100",
+                        "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",
-                        "endOffsets": "151"
+                        "endColumns": "65",
+                        "endOffsets": "116"
                     }
                 }
             ]

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",
-        "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-mdpi-v4_notification_bg_low_normal.9.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"
     },
     {
         "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",
-        "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/drawable-port-mdpi_screen.png.flat",
+        "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",

platforms/android/app/build/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt

-#Sat Jun 22 16:07:54 CST 2019
+#Tue Jun 25 15:32:37 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

platforms/android/app/build/intermediates/incremental/packageRelease/release/dex-renamer-state.txt

-#Thu Jun 20 14:18:51 CST 2019
+#Tue Jun 25 10:46:41 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

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.smart19.starter"
     android:hardwareAccelerated="true"
-    android:versionCode="40301"
-    android:versionName="4.3.1" >
+    android:versionCode="40302"
+    android:versionName="4.3.2 " >
 
     <uses-sdk
         android:minSdkVersion="16"

platforms/android/app/build/intermediates/manifests/full/debug/output.json

-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40301},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40302},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

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.smart19.starter"
     android:hardwareAccelerated="true"
-    android:versionCode="40301"
-    android:versionName="4.3.1" >
+    android:versionCode="40302"
+    android:versionName="4.3.2 " >
 
     <uses-sdk
         android:minSdkVersion="16"

platforms/android/app/build/intermediates/manifests/full/release/output.json

-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40301},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40302},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/intermediates/manifests/instant-run/debug/output.json

-[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40301},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40302},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/intermediates/manifests/instant-run/release/output.json

-[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40301},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40302},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/intermediates/res/debug/output.json

-[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40301},"path":"resources-debug.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40302},"path":"resources-debug.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/intermediates/res/release/output.json

-[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40301},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40302},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

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

platforms/android/app/build/intermediates/transforms/dexMerger/debug/__content__.json

-[{"name":"main","index":0,"scopes":["PROJECT","EXTERNAL_LIBRARIES","SUB_PROJECTS"],"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

platforms/android/app/src/main/AndroidManifest.xml

 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="40301" android:versionName="4.3.1" package="io.ionic.smart19.starter" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="40302" android:versionName="4.3.2 " package="io.ionic.smart19.starter" 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">

platforms/android/app/src/main/res/xml/config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.smart19.starter" version="4.3.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.smart19.starter" version="4.3.2 " 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>

src/app/app.component.ts

@@ -70,6 +70,8 @@ export class MyApp {
     checkVersion(){
         //检测是否需要更新
         this.appVersion.getVersionNumber().then((version: string) => {
+            alert(version);
+            console.log(version)
             this.appUpdateService.compariVersion().subscribe(res => {
                 let data = res.json();
                 if (data.code == 200) {

src/pages/discover-pages/publish/publish.ts

@@ -80,10 +80,6 @@ export class PublishPage {
     }
 
     ionViewWillLeave(){
-        console.log(this.actionSheet_publish);
-        console.log(this.actionSheet_image);
-        console.log(this.actionSheet_video);
-
         if(this.actionSheet_image !== undefined){
             this.actionSheet_image.dismiss();
         }
@@ -277,7 +273,7 @@ export class PublishPage {
             return false;
         }
         let attachmentsArr = [];   //附件
-        let content = this.obj.content;
+        let content = this.obj.content.replace(/\r?\n/g, "<br />");
         if (this.fileList.length > 0) {
             if (this.type == 'image') {
                 attachmentsArr.push(this.fileList[0]); //将第一张图片作为标题图片，放在附件中 ,后面的图片 作为文章里面的图片
@@ -310,7 +306,6 @@ export class PublishPage {
         this.commonSer.alert(message, () => {
             this.tabSer.stuffSave(data).subscribe(
                 (res) => {
-
                     this.commonSer.toast(toast);
                     setTimeout(() => {
                         this.navCtrl.pop()
@@ -354,7 +349,7 @@ export class PublishPage {
                 }
                 const obj = {
                     title: this.obj.title,
-                    source: '上海市委组织部',
+                    source: this.orgName,
                     publishTime: new Date().getTime(),
                     content: `&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;` + content,
                     attachments: this.fileList,

src/pages/mine-pages/verify-edit/verify-edit.ts

@@ -61,6 +61,7 @@ export class VerifyEditPage {
 
     stuffId;
     source;  //verify 审核  publish  发布
+    orgName;
 
     constructor(public navCtrl: NavController, public navParams: NavParams, public storage: Storage,
                 public camera: Camera, public actionSheetCtrl: ActionSheetController,
@@ -74,6 +75,7 @@ export class VerifyEditPage {
         this.source = this.navParams.get('source');
         this.getStuff();
         this.getRole();
+        this.getOrg();
         this.storage.get("userLoginInfo").then((value) => {
             this.userid = value.userid;
         });
@@ -97,6 +99,15 @@ export class VerifyEditPage {
         )
     }
 
+    //获取部门
+    getOrg() {
+        this.tabSer.getUserIntegral().subscribe(
+            (res) => {
+                this.orgName = res.data.orgName;
+            }
+        );
+    }
+
     //获取权限
     //返回值int ：3-管理员，2-处室领导，1-内勤人员，0-普通用户
     getRole() {
@@ -270,7 +281,7 @@ export class VerifyEditPage {
             return false;
         }
         let attachmentsArr = [];   //附件
-        let content = this.obj.content;
+        let content = this.obj.content.replace(/\r?\n/g, "<br />");
         if (this.fileList.length > 0) {
             if (this.type == 'image') {
                 attachmentsArr.push(this.fileList[0]); //将第一张图片作为标题图片，放在附件中 ,后面的图片 作为文章里面的图片
@@ -293,7 +304,7 @@ export class VerifyEditPage {
             id: this.stuffId,
             title: this.obj.title,   //标题
             plateType: this.obj.plateType,  //分类
-            source: '上海市委组织部',   //来源
+            source: this.orgName,   //来源
             publishStatus: status,  //已提交  退回1 发布3
             content: `&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;` + content,  //内容
             publishRangeFlag: this.obj.publishRangeFlag,   //范围
@@ -348,7 +359,7 @@ export class VerifyEditPage {
                 }
                 const obj = {
                     title: this.obj.title,
-                    source: '上海市委组织部',
+                    source: this.orgName,
                     publishTime: new Date().getTime(),
                     content: `&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;` + content,
                     attachments: this.fileList,