Skip to content

P
party-build-cloud
Commit 57a9eb4d authored by wangqinghua's avatar wangqinghua
Browse files
Options

cordova update

parent 613eeaeb
Expand all Show whitespace changes
Inline Side-by-side
Showing with 156 additions and 102 deletions
config.xml
View file @ 57a9eb4d
<?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">
<name>部机关党建云(试运行)</name>
<description>An awesome Ionic/Cordova app.</description>
<widget id="io.ionic.smart19.starter" version="4.3.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>部机关党建云</name>
<description>组织部党建云平台App.</description>
<author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
<content src="index.html" />
<access origin="*" />
......
package.json
View file @ 57a9eb4d
......@@ -66,7 +66,12 @@
"devDependencies": {
"@ionic/app-scripts": "3.1.8",
"node-sass": "^4.12.0",
"typescript": "2.4.2"
"typescript": "2.4.2",
"phonegap-plugin-mobile-accessibility": "~1.0.5-dev",
"cordova-plugin-camera": "~4.0.3",
"cordova-plugin-file-transfer": "~1.7.1",
"cordova-plugin-splashscreen": "~5.0.2",
"com.moust.cordova.videoplayer": "https://github.com/moust/cordova-plugin-videoplayer.git"
},
"description": "An Ionic project",
"cordova": {
......@@ -85,7 +90,12 @@
"cordova-plugin-ionic-keyboard": {},
"cordova-plugin-statusbar": {},
"cordova.plugins.diagnostic": {},
"cordova-plugin-tts": {}
"cordova-plugin-tts": {},
"phonegap-plugin-mobile-accessibility": {},
"cordova-plugin-camera": {},
"cordova-plugin-file-transfer": {},
"cordova-plugin-splashscreen": {},
"com.moust.cordova.videoplayer": {}
},
"platforms": [
"ios",
......
platforms/android/.idea/workspace.xml
View file @ 57a9eb4d
......@@ -3067,7 +3067,7 @@
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<component name="ProjectFrameBounds" extendedState="6">
<option name="y" value="23" />
<option name="width" value="1440" />
<option name="height" value="813" />
......@@ -3087,9 +3087,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane" />
<pane id="Scratches" />
<pane id="PackagesPane" />
<pane id="AndroidView">
<subPane>
<expand>
......@@ -3101,7 +3098,10 @@
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -3287,7 +3287,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="813" extended-state="0" />
<frame x="0" y="23" width="1440" height="812" extended-state="6" />
<layout>
<window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32914925" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
......@@ -3305,7 +3305,7 @@
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25679544" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Build" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4206128" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Build" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.41980475" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22818312" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Device File Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
......@@ -3377,6 +3377,50 @@
</entry>
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="38" column="16" lean-forward="false" selection-start-line="38" selection-start-column="16" selection-end-line="38" selection-end-column="16" />
<folding>
<element signature="e#0#799#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<folding>
<element signature="e#0#858#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/settings.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wrapper.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/CordovaLib/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="57" lean-forward="false" selection-start-line="12" selection-start-column="57" selection-end-line="12" selection-end-column="57" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<caret line="38" column="16" lean-forward="false" selection-start-line="38" selection-start-column="16" selection-end-line="38" selection-end-column="16" />
<folding>
......
platforms/android/app/build/generated/source/buildConfig/debug/io/ionic/smart19/starter/BuildConfig.java
View file @ 57a9eb4d
......@@ -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 = 40302;
public static final String VERSION_NAME = "4.3.2 ";
public static final int VERSION_CODE = 40303;
public static final String VERSION_NAME = "4.3.3";
}
platforms/android/app/build/generated/source/buildConfig/release/io/ionic/smart19/starter/BuildConfig.java
View file @ 57a9eb4d
......@@ -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 = 40302;
public static final String VERSION_NAME = "4.3.2";
public static final int VERSION_CODE = 40303;
public static final String VERSION_NAME = "4.3.3";
}
platforms/android/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
View file @ 57a9eb4d
This source diff could not be displayed because it is too large. You can view the blob instead.
platforms/android/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
View file @ 57a9eb4d
#Tue Jun 25 10:17:14 CST 2019
#Mon Jul 01 13:59:59 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
......
platforms/android/app/build/intermediates/incremental/mergeReleaseAssets/merger.xml
View file @ 57a9eb4d
This source diff could not be displayed because it is too large. You can view the blob instead.
platforms/android/app/build/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt
View file @ 57a9eb4d
#Tue Jun 25 15:32:37 CST 2019
#Mon Jul 01 14:13:16 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
View file @ 57a9eb4d
#Thu Jun 27 16:33:05 CST 2019
#Mon Jul 01 14:21:27 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
View file @ 57a9eb4d
......@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.ionic.smart19.starter"
android:hardwareAccelerated="true"
android:versionCode="40302"
android:versionName="4.3.2 " >
android:versionCode="40303"
android:versionName="4.3.3" >
<uses-sdk
android:minSdkVersion="16"
......
platforms/android/app/build/intermediates/manifests/full/debug/output.json
View file @ 57a9eb4d
[{"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
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40303},"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
View file @ 57a9eb4d
......@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.ionic.smart19.starter"
android:hardwareAccelerated="true"
android:versionCode="40302"
android:versionName="4.3.2" >
android:versionCode="40303"
android:versionName="4.3.3" >
<uses-sdk
android:minSdkVersion="16"
......
platforms/android/app/build/intermediates/manifests/full/release/output.json
View file @ 57a9eb4d
[{"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
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40303},"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
View file @ 57a9eb4d
[{"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
[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40303},"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
View file @ 57a9eb4d
[{"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
[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40303},"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
View file @ 57a9eb4d
[{"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
[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40303},"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
View file @ 57a9eb4d
[{"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
[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40303},"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
View file @ 57a9eb4d
[{"name":"main","index":0,"scopes":["EXTERNAL_LIBRARIES","SUB_PROJECTS","PROJECT"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file
[{"name":"main","index":0,"scopes":["SUB_PROJECTS","PROJECT","EXTERNAL_LIBRARIES"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file
platforms/android/app/build/intermediates/transforms/dexMerger/debug/__content__.json
View file @ 57a9eb4d
[{"name":"main","index":0,"scopes":["EXTERNAL_LIBRARIES","PROJECT","SUB_PROJECTS"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file
[{"name":"main","index":0,"scopes":["SUB_PROJECTS","PROJECT","EXTERNAL_LIBRARIES"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file
platforms/android/app/build/intermediates/transforms/mergeJavaRes/debug/__content__.json
View file @ 57a9eb4d
[{"name":"resources","index":0,"scopes":["PROJECT","SUB_PROJECTS","EXTERNAL_LIBRARIES"],"types":["RESOURCES"],"format":"JAR","present":true}]
\ No newline at end of file
[{"name":"resources","index":0,"scopes":["EXTERNAL_LIBRARIES","SUB_PROJECTS","PROJECT"],"types":["RESOURCES"],"format":"JAR","present":true}]
\ No newline at end of file
platforms/android/app/build/intermediates/transforms/mergeJavaRes/release/__content__.json
View file @ 57a9eb4d
[{"name":"resources","index":0,"scopes":["SUB_PROJECTS","EXTERNAL_LIBRARIES","PROJECT"],"types":["RESOURCES"],"format":"JAR","present":true}]
\ No newline at end of file
[{"name":"resources","index":0,"scopes":["SUB_PROJECTS","PROJECT","EXTERNAL_LIBRARIES"],"types":["RESOURCES"],"format":"JAR","present":true}]
\ No newline at end of file
platforms/android/app/build/outputs/apk/debug/output.json
View file @ 57a9eb4d
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40302},"path":"app-debug.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40303},"path":"app-debug.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/outputs/apk/release/output.json
View file @ 57a9eb4d
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40302},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40303},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/outputs/logs/manifest-merger-debug-report.txt
View file @ 57a9eb4d
......@@ -42,17 +42,17 @@ INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
package
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:103-137
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:102-136
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
android:versionName
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:74-102
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:74-101
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
android:hardwareAccelerated
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:11-45
xmlns:android
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:138-196
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:137-195
android:versionCode
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:46-73
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
......
platforms/android/app/build/reports/lint-results-release-fatal.html
View file @ 57a9eb4d
......@@ -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 Thu Jun 27 16:33:13 CST 2019 </nav>
Check performed at Mon Jul 01 14:21:35 CST 2019 </nav>
</div>
</header>
<div class="mdl-layout__drawer">
......
platforms/android/app/src/main/AndroidManifest.xml
View file @ 57a9eb4d
<?xml version='1.0' encoding='utf-8'?>
<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">
<manifest android:hardwareAccelerated="true" android:versionCode="40303" android:versionName="4.3.3" 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
View file @ 57a9eb4d
<?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.3" 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.scss
View file @ 57a9eb4d
......@@ -191,6 +191,24 @@ ion-navbar .header-ios .toolbar-ios:last-child .toolbar-background-ios {
overflow: hidden;
position: relative;
}
.scroll-tab{
.icon-left{
position: absolute;
left: 1px;
top: 8px;
z-index: 999999;
color: #999;
font-size: 2.5rem;
}
.icon-right{
position: absolute;
right: 1px;
top: 8px;
z-index: 999999;
color: #999;
font-size: 2.5rem;
}
}
.news-content {
overflow-y: hidden;
......
src/assets/json/party.json
View file @ 57a9eb4d
......@@ -84,11 +84,6 @@
"name": "党建联建",
"type": 14,
"indexChildren": "33"
},
{
"name": "结对帮扶",
"type": 15,
"indexChildren": "34"
}
]
},
......@@ -152,12 +147,7 @@
"indexChildren": "61"
},
{
"name": "组工咨询",
"type": 17,
"indexChildren": "62"
},
{
"name": "工具书籍",
"name": "他山之石",
"type": 18,
"indexChildren": "63"
},
......
src/pages/discover-pages/publish/publish.ts
View file @ 57a9eb4d
......@@ -30,7 +30,6 @@ export class PublishPage {
// {name: '警示教育', id: '12'},
{name: '支部活动', id: '13'},
{name: '党建联建', id: '14'},
{name: '结对帮扶', id: '15'},
{name: '学思践悟', id: '21'},
// {name: '党建联建', id: '14'},
// {name: '结对帮扶', id: '15'},
......
src/pages/login/login.ts
View file @ 57a9eb4d
......@@ -81,7 +81,6 @@ export class LoginPage {
enableBackdropDismiss: true //点击页面其他地方则关闭 正在登录
});
loading.present();
console.log(this.user)
this.tabSer.loginpost(this.user).subscribe(
(res)=>{
loading.dismiss();
......
src/pages/mine-pages/verify-edit/verify-edit.ts
View file @ 57a9eb4d
......@@ -31,7 +31,6 @@ export class VerifyEditPage {
// {name: '警示教育', id: '12'},
{name: '支部活动', id: '13'},
{name: '党建联建', id: '14'},
{name: '结对帮扶', id: '15'},
{name: '学思践悟', id: '21'},
// {name: '党建联建', id: '14'},
// {name: '结对帮扶', id: '15'},
......
src/pages/tabs/discover/discover.scss
View file @ 57a9eb4d
......@@ -210,24 +210,6 @@ page-discover {
.parent.tabs-parent {
background-color: #fff1f0;
}
.scroll-tab{
.icon-left{
position: absolute;
left: 1px;
top: 8px;
z-index: 999;
color: #999;
font-size: 2.5rem;
}
.icon-right{
position: absolute;
right: 1px;
top: 8px;
z-index: 999;
color: #999;
font-size: 2.5rem;
}
}
.parent.news-content {
position: relative;
......
src/pages/tabs/discover/discover.ts
View file @ 57a9eb4d
......@@ -110,11 +110,6 @@ export class DiscoverPage {
"name": "党建联建",
"type": 14,
"indexChildren": '33'
},
{
"name": "结对帮扶",
"type": 15,
"indexChildren": '34'
}
]
},
......@@ -163,12 +158,7 @@ export class DiscoverPage {
"indexChildren": '61'
},
{
"name": "组工咨询",
"type": 17,
"indexChildren": '62'
},
{
"name": "工具书籍",
"name": "他山之石",
"type": 18,
"indexChildren": '63'
},
......
src/pages/tabs/home/home.html
View file @ 57a9eb4d
......@@ -89,7 +89,10 @@
</div>
</div>
<!--true 隐藏 false 显示-->
<div [hidden]="isScroll" class="news-content parent">
<div [hidden]="isScroll" class="scroll-tab">
<ion-icon *ngIf="!toRight" class="icon-left" name="arrow-back" style="top: 10px;"></ion-icon>
<ion-icon *ngIf="toRight" class="icon-right" name="arrow-forward" style="top: 10px;"></ion-icon>
<div (scroll)="dragTo($event)" class="news-content parent">
<div #tabsParent class="tabs-parent parent">
<div *ngFor="let item of tabsList;let i = index" (click)="change(item)" class="tabs-children">
<span #tabSpan [ngClass]="{'selectTab':index == i}">{{item.name}}</span>
......@@ -97,9 +100,13 @@
<span #tips class="tips"></span>
</div>
</div>
</div>
<div [hidden]="!isScroll" class="scroll-tab">
<ion-icon *ngIf="!toRight" class="icon-left" name="arrow-back" style="top: 10px;"></ion-icon>
<ion-icon *ngIf="toRight" class="icon-right" name="arrow-forward" style="top: 10px;"></ion-icon>
<!--固定 false -->
<div [hidden]="!isScroll" ion-fixed class="news-content ion-fixed parent">
<div (scroll)="dragTo($event)" ion-fixed class="news-content ion-fixed parent">
<div class="tabs-parent parent">
<div *ngFor="let item of tabsList;let i = index" (click)="change(item)" class="tabs-children">
<span [ngClass]="{'selectTab':index == i}">{{item.name}}</span>
......@@ -107,6 +114,7 @@
<span #tips1 class="tips"></span>
</div>
</div>
</div>
<div id="swiper-article" class="swiper-container">
<div class="swiper-wrapper">
<ng-container *ngIf="slidersItems.length > 0">
......
src/pages/tabs/home/home.scss
View file @ 57a9eb4d
......@@ -275,6 +275,9 @@ page-home {
ion-infinite-scroll {
overflow: hidden;
}
.scroll-tab{
overflow: initial;
}
$slide-height: 220px;
......
src/pages/tabs/home/home.ts
View file @ 57a9eb4d
......@@ -42,11 +42,11 @@ export class HomePage {
//1党章党规,2系列讲话,3中央精神,4本市部署,5通知公告,6党建动态,7工作提示,8党务参考
//9廉政格言,10纪检提示,11风险排查,12警示教育,13支部活动,14党建联建,15结对帮扶
tabsList = [
{name: "系列讲话", type: 2, index: 0},
{name: "党章党规", type: 1, index: 1},
{name: "中央精神", type: 3, index: 2},
{name: "本市部署", type: 4, index: 3}
{name: "本市部署", type: 4, index: 3},
{name: "评论解读", type: 17, index: 4},
];
isSign = false; //签到弹窗
isBir = false; //政治生日弹窗
......@@ -77,6 +77,8 @@ export class HomePage {
mineInfo;
username;
toRight = true;
constructor(public navCtrl: NavController, public datePipe: DatePipe,
public commonSer: CommonService, public emitSer: EmitService,
......@@ -90,7 +92,7 @@ export class HomePage {
this.noReadNum = value;
}
});
this.slideList.length = 4;
this.slideList.length = 5;
}
ionViewDidEnter() {
......@@ -102,6 +104,16 @@ export class HomePage {
);
}
public dragTo(e) {
console.log(e)
if (e.target.scrollLeft > window.screen.width / 4 -4) {
this.toRight = false;
} else {
this.toRight = true;
}
}
//获取积分信息
getInter() {
this.tabSer.getUserIntegral().subscribe(
......
src/service/http.service.ts
View file @ 57a9eb4d
......@@ -15,9 +15,9 @@ export class AppGlobal {
//接口基地址
// static domain = "http://101.89.112.92:80"; //正式环境
// static domain = "http://192.168.2.235:8080"; //测试环境
static domain = "http://47.103.33.196:8080"; //阿里云正式地址
// static domain = "http://47.103.33.196:8080"; //阿里云正式地址
// static domain = "http://47.103.35.216:8080"; //阿里云测试地址
// static domain = ""; //本地环境
static domain = ""; //本地环境
//
//图片地址
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment