Commit 0bd9bf42 authored by 14699's avatar 14699

调整弹窗位置

parent c74c7dbe
...@@ -128,4 +128,8 @@ ...@@ -128,4 +128,8 @@
</plugin> </plugin>
<engine name="ios" spec="^4.5.5" /> <engine name="ios" spec="^4.5.5" />
<engine name="android" spec="^6.2.3" /> <engine name="android" spec="^6.2.3" />
<preference name="xwalkVersion" value="19+" />
<preference name="xwalkCommandLine" value="--disable-pull-to-refresh-effect" />
<preference name="xwalkMode" value="embedded" />
<preference name="xwalkMultipleApk" value="true" />
</widget> </widget>
...@@ -11,5 +11,5 @@ module.exports = { ...@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://210.12.156.64:9090/r/api"', ocrPath:'"http://210.12.156.64:9090/r/api"',
fileUploadSvcPath:'"http://210.12.156.64:9090/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="', fileUploadSvcPath:'"http://210.12.156.64:9090/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
appId: '"com.xcmg.app.dev"', appId: '"com.xcmg.app.dev"',
currentVersion: '"3.6.7"' currentVersion: '"3.6.8"'
} }
...@@ -12,6 +12,45 @@ ...@@ -12,6 +12,45 @@
}, },
"cordova-plugin-camera": { "cordova-plugin-camera": {
"PACKAGE_NAME": "com.hls.app" "PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-crosswalk-webview": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-datepicker": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-device": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-dialogs": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-file": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-file-transfer": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-image-picker": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-media-capture": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-network-information": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-splashscreen": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-statusbar": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-whitelist": {
"PACKAGE_NAME": "com.hls.app"
},
"ionic-plugin-keyboard": {
"PACKAGE_NAME": "com.hls.app"
} }
}, },
"dependent_plugins": { "dependent_plugins": {
...@@ -20,6 +59,15 @@ ...@@ -20,6 +59,15 @@
}, },
"cordova-plugin-contacts": { "cordova-plugin-contacts": {
"PACKAGE_NAME": "com.hls.app" "PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-themeablebrowser": {
"PACKAGE_NAME": "com.hls.app"
},
"cordova-plugin-x-toast": {
"PACKAGE_NAME": "com.hls.app"
},
"es6-promise-plugin": {
"PACKAGE_NAME": "com.hls.app"
} }
} }
} }
\ No newline at end of file
...@@ -109,17 +109,6 @@ You can also set user agent with the preference of xwalkUserAgent. ...@@ -109,17 +109,6 @@ You can also set user agent with the preference of xwalkUserAgent.
### Release Notes ### Release Notes
#### 2.2.0 (November 4, 2016)
* Uses the latest Crosswalk 22 stable version by default
* Keep compatible for Cordova-android 6.0 with evaluating Javascript bridge
#### 2.1.0 (September 9, 2016)
* Uses the latest Crosswalk 21 stable version by default
#### 2.0.0 (August 17, 2016)
* Uses the latest Crosswalk 20 stable version by default
* Discontinue support for Android 4.0 (ICS) in Crosswalk starting with version 20
#### 1.8.0 (June 30, 2016) #### 1.8.0 (June 30, 2016)
* Uses the latest Crosswalk 19 stable version by default * Uses the latest Crosswalk 19 stable version by default
......
...@@ -25,8 +25,6 @@ module.exports = function(context) { ...@@ -25,8 +25,6 @@ module.exports = function(context) {
'platforms', 'android'), 'platforms', 'android'),
projectConfigurationFile = path.join(context.opts.projectRoot, projectConfigurationFile = path.join(context.opts.projectRoot,
'config.xml'), 'config.xml'),
platformConfigurationFile = path.join(androidPlatformDir,
'res', 'xml', 'config.xml'),
projectManifestFile = path.join(androidPlatformDir, projectManifestFile = path.join(androidPlatformDir,
'AndroidManifest.xml'), 'AndroidManifest.xml'),
xwalk64bit = "xwalk64bit", xwalk64bit = "xwalk64bit",
...@@ -34,7 +32,7 @@ module.exports = function(context) { ...@@ -34,7 +32,7 @@ module.exports = function(context) {
specificVersion = false; specificVersion = false;
/** Init */ /** Init */
var CordovaConfig = new ConfigParser(platformConfigurationFile); var CordovaConfig = new ConfigParser(projectConfigurationFile);
var addPermission = function() { var addPermission = function() {
var projectManifestXmlRoot = XmlHelpers.parseElementtreeSync(projectManifestFile); var projectManifestXmlRoot = XmlHelpers.parseElementtreeSync(projectManifestFile);
...@@ -113,27 +111,29 @@ module.exports = function(context) { ...@@ -113,27 +111,29 @@ module.exports = function(context) {
/** Add preference */ /** Add preference */
this.addPreferences = function() { this.addPreferences = function() {
// Pick the xwalk variables with the cli preferences // Pick the xwalk variables with the cli preferences
// parseCliPreference(); parseCliPreference();
// Add the permission of writing external storage when using shared mode // Add the permission of writing external storage when using shared mode
if (CordovaConfig.getGlobalPreference('xwalkMode') == 'shared') { if (xwalkVariables['xwalkMode'] == 'shared') {
addPermission(); addPermission();
} else if (xwalkVariables['xwalkMode'] == 'lite' && specificVersion == false) {
xwalkVariables['xwalkVersion'] = xwalkLiteVersion;
} }
// Configure the final value in the config.xml // Configure the final value in the config.xml
// var configXmlRoot = XmlHelpers.parseElementtreeSync(projectConfigurationFile); var configXmlRoot = XmlHelpers.parseElementtreeSync(projectConfigurationFile);
// var preferenceUpdated = false; var preferenceUpdated = false;
// for (var name in xwalkVariables) { for (var name in xwalkVariables) {
// var child = configXmlRoot.find('./preference[@name="' + name + '"]'); var child = configXmlRoot.find('./preference[@name="' + name + '"]');
// if(!child) { if(!child) {
// preferenceUpdated = true; preferenceUpdated = true;
// child = et.XML('<preference name="' + name + '" value="' + xwalkVariables[name] + '" />'); child = et.XML('<preference name="' + name + '" value="' + xwalkVariables[name] + '" />');
// XmlHelpers.graftXML(configXmlRoot, [child], '/*'); XmlHelpers.graftXML(configXmlRoot, [child], '/*');
// } }
// } }
// if(preferenceUpdated) { if(preferenceUpdated) {
// fs.writeFileSync(projectConfigurationFile, configXmlRoot.write({indent: 4}), 'utf-8'); fs.writeFileSync(projectConfigurationFile, configXmlRoot.write({indent: 4}), 'utf-8');
// } }
} }
/** Remove preference*/ /** Remove preference*/
...@@ -143,14 +143,14 @@ module.exports = function(context) { ...@@ -143,14 +143,14 @@ module.exports = function(context) {
removePermission(); removePermission();
} }
// var configXmlRoot = XmlHelpers.parseElementtreeSync(projectConfigurationFile); var configXmlRoot = XmlHelpers.parseElementtreeSync(projectConfigurationFile);
// for (var name in xwalkVariables) { for (var name in xwalkVariables) {
// var child = configXmlRoot.find('./preference[@name="' + name + '"]'); var child = configXmlRoot.find('./preference[@name="' + name + '"]');
// if (child) { if (child) {
// XmlHelpers.pruneXML(configXmlRoot, [child], '/*'); XmlHelpers.pruneXML(configXmlRoot, [child], '/*');
// } }
// } }
// fs.writeFileSync(projectConfigurationFile, configXmlRoot.write({indent: 4}), 'utf-8'); fs.writeFileSync(projectConfigurationFile, configXmlRoot.write({indent: 4}), 'utf-8');
} }
var build64bit = function() { var build64bit = function() {
...@@ -189,11 +189,6 @@ module.exports = function(context) { ...@@ -189,11 +189,6 @@ module.exports = function(context) {
fs.writeFileSync(projectConfigurationFile, configXmlRoot.write({indent: 4}), 'utf-8'); fs.writeFileSync(projectConfigurationFile, configXmlRoot.write({indent: 4}), 'utf-8');
} }
} }
console.log("Crosswalk info:");
console.log(" After much discussion and analysis of the market,");
console.log(" we have decided to discontinue support for Android 4.0 (ICS) in Crosswalk starting with version 20,");
console.log(" so the minSdkVersion of Cordova project is configured to 16 by default. \n");
} }
xwalkVariables = defaultPreferences(); xwalkVariables = defaultPreferences();
......
{ {
"_from": "cordova-plugin-crosswalk-webview@2.2.0", "name": "cordova-plugin-crosswalk-webview",
"_id": "cordova-plugin-crosswalk-webview@2.2.0", "version": "1.8.0",
"_inBundle": false, "description": "Changes the default WebView to CrossWalk",
"_integrity": "sha512-qShYPyUhfxw/vZ4D56LQPWiO5XOaLVw7W0DM+f4Q0kUP8GtedvwIRUuSsQqETXSwEGoFLB0fiVRdN4r2Kb9/rQ==",
"_location": "/cordova-plugin-crosswalk-webview",
"_phantomChildren": {},
"_requested": {
"type": "version",
"registry": true,
"raw": "cordova-plugin-crosswalk-webview@2.2.0",
"name": "cordova-plugin-crosswalk-webview",
"escapedName": "cordova-plugin-crosswalk-webview",
"rawSpec": "2.2.0",
"saveSpec": null,
"fetchSpec": "2.2.0"
},
"_requiredBy": [
"#DEV:/",
"#USER"
],
"_resolved": "https://registry.npmjs.org/cordova-plugin-crosswalk-webview/-/cordova-plugin-crosswalk-webview-2.2.0.tgz",
"_shasum": "b5b7781e3a913b018005657d347cdb726fd92e53",
"_spec": "cordova-plugin-crosswalk-webview@2.2.0",
"_where": "/Volumes/work/APP/hls-xcmg-vue-app",
"author": "",
"bugs": {
"url": "https://crosswalk-project.org/jira"
},
"bundleDependencies": false,
"cordova": { "cordova": {
"id": "cordova-plugin-crosswalk-webview", "id": "cordova-plugin-crosswalk-webview",
"platforms": [ "platforms": [
"android" "android"
] ]
}, },
"deprecated": false, "repository": {
"description": "Changes the default WebView to CrossWalk", "type": "git",
"engines": { "url": "https://github.com/crosswalk-project/cordova-plugin-crosswalk-webview.git"
"cordovaDependencies": {
"2.0.0": {
"cordova": ">=5.2.0",
"cordova-android": "4 - 5"
},
"2.1.0": {
"cordova": ">=5.2.0",
"cordova-android": "4 - 5"
},
"2.2.0": {
"cordova": ">=5.2.0",
"cordova-android": ">=6"
},
"3.0.0": {
"cordova": ">100"
}
}
}, },
"homepage": "https://github.com/crosswalk-project/cordova-plugin-crosswalk-webview",
"keywords": [ "keywords": [
"cordova", "cordova",
"chromium", "chromium",
...@@ -65,11 +21,20 @@ ...@@ -65,11 +21,20 @@
"ecosystem:cordova", "ecosystem:cordova",
"cordova-android" "cordova-android"
], ],
"engines": [
{
"name": "cordova-android",
"version": ">=4"
},
{
"name": "cordova-plugman",
"version": ">=4.2.0"
}
],
"author": "",
"license": "Apache 2.0", "license": "Apache 2.0",
"name": "cordova-plugin-crosswalk-webview", "bugs": {
"repository": { "url": "https://crosswalk-project.org/jira"
"type": "git",
"url": "git+https://github.com/crosswalk-project/cordova-plugin-crosswalk-webview.git"
}, },
"version": "2.2.0" "homepage": "https://github.com/crosswalk-project/cordova-plugin-crosswalk-webview"
} }
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
id="cordova-plugin-crosswalk-webview" id="cordova-plugin-crosswalk-webview"
version="2.2.0"> version="1.8.0">
<name>Crosswalk WebView Engine</name> <name>Crosswalk WebView Engine</name>
<description>Changes the default WebView to CrossWalk</description> <description>Changes the default WebView to CrossWalk</description>
...@@ -13,25 +13,19 @@ ...@@ -13,25 +13,19 @@
<issue>https://crosswalk-project.org/jira</issue> <issue>https://crosswalk-project.org/jira</issue>
<engines> <engines>
<engine name="cordova-android" version=">=6"/> <engine name="cordova-android" version=">=4"/>
<engine name="cordova-plugman" version=">=5.2.0"/><!-- needed for gradleReference support --> <engine name="cordova-plugman" version=">=4.2.0"/><!-- needed for gradleReference support -->
</engines> </engines>
<!-- android --> <!-- android -->
<platform name="android"> <platform name="android">
<preference name="XWALK_VERSION" default="22+"/>
<preference name="XWALK_LITEVERSION" default="xwalk_core_library_canary:17+"/>
<preference name="XWALK_COMMANDLINE" default="--disable-pull-to-refresh-effect"/>
<preference name="XWALK_MODE" default="embedded" />
<preference name="XWALK_MULTIPLEAPK" default="true" />
<config-file target="res/xml/config.xml" parent="/*"> <config-file target="res/xml/config.xml" parent="/*">
<preference name="webView" value="org.crosswalk.engine.XWalkWebViewEngine"/> <preference name="webView" value="org.crosswalk.engine.XWalkWebViewEngine"/>
<preference name="xwalkVersion" value="$XWALK_VERSION"/> <preference name="xwalkVersion" default="19+"/>
<preference name="xwalkLiteVersion" value="$XWALK_LITEVERSION"/> <preference name="xwalkLiteVersion" default="xwalk_core_library_canary:17+"/>
<preference name="xwalkCommandLine" value="$XWALK_COMMANDLINE"/> <preference name="xwalkCommandLine" default="--disable-pull-to-refresh-effect"/>
<preference name="xwalkMode" value="$XWALK_MODE" /> <preference name="xwalkMode" default="embedded" />
<preference name="xwalkMultipleApk" value="$XWALK_MULTIPLEAPK" /> <preference name="xwalkMultipleApk" default="true" />
<preference name="android-minSdkVersion" value="16" />
</config-file> </config-file>
<config-file target="AndroidManifest.xml" parent="/*"> <config-file target="AndroidManifest.xml" parent="/*">
...@@ -55,10 +49,4 @@ ...@@ -55,10 +49,4 @@
<hook type="after_build" src="hooks/after_build/000-build_64_bit.js"/> <hook type="after_build" src="hooks/after_build/000-build_64_bit.js"/>
<hook type="before_build" src="hooks/before_build/000-build_64_bit.js"/> <hook type="before_build" src="hooks/before_build/000-build_64_bit.js"/>
</platform> </platform>
<info>
After much discussion and analysis of the market, we have decided to discontinue support for Android 4.0 (ICS) in Crosswalk starting with version 20.
So the minSdkVersion of Cordova project is configured to 16 by default.
</info>
</plugin> </plugin>
{ {
"cordova-plugin-whitelist": { "cordova-plugin-whitelist": {
"source": { "source": {
"type": "registry", "type": "registry",
"id": "cordova-plugin-whitelist@1.3.2" "id": "cordova-plugin-whitelist@1.3.2"
}, },
"is_top_level": true, "is_top_level": true,
"variables": {} "variables": {}
}, },
"cordova-plugin-dialogs": { "cordova-plugin-dialogs": {
"source": { "source": {
"type": "registry", "type": "registry",
"id": "cordova-plugin-dialogs" "id": "cordova-plugin-dialogs"
}, },
"is_top_level": true, "is_top_level": true,
"variables": {} "variables": {}
}, },
"ionic-plugin-keyboard": { "ionic-plugin-keyboard": {
"source": { "source": {
"type": "registry", "type": "registry",
"id": "ionic-plugin-keyboard@2.2.0" "id": "ionic-plugin-keyboard@2.2.0"
}, },
"is_top_level": true, "is_top_level": true,
"variables": {} "variables": {}
}, },
"cordova-plugin-device": { "cordova-plugin-device": {
"source": { "source": {
"type": "registry", "type": "registry",
"id": "cordova-plugin-device@2.0.2" "id": "cordova-plugin-device@2.0.2"
}, },
"is_top_level": true, "is_top_level": true,
"variables": {} "variables": {}
}, },
"cordova-plugin-network-information": { "cordova-plugin-network-information": {
"source": { "source": {
"type": "registry", "type": "registry",
"id": "cordova-plugin-network-information" "id": "cordova-plugin-network-information"
}, },
"is_top_level": true, "is_top_level": true,
"variables": {} "variables": {}
}, },
"cordova-plugin-datepicker": { "cordova-plugin-datepicker": {
"source": { "source": {
"type": "registry", "type": "registry",
"id": "cordova-plugin-datepicker" "id": "cordova-plugin-datepicker"
}, },
"is_top_level": true, "is_top_level": true,
"variables": {} "variables": {}
}, },
"es6-promise-plugin": { "es6-promise-plugin": {
"source": { "source": {
"type": "registry", "type": "registry",
"id": "es6-promise-plugin" "id": "es6-promise-plugin"
}, },
"is_top_level": false, "is_top_level": false,
"variables": {} "variables": {}
}, },
"cordova-plugin-compat": { "cordova-plugin-compat": {
"source": { "source": {
"type": "registry", "type": "registry",
"id": "cordova-plugin-compat@^1.1.0" "id": "cordova-plugin-compat@^1.1.0"
}, },
"is_top_level": false, "is_top_level": false,
"variables": {} "variables": {}
}, },
"cordova-plugin-statusbar": { "cordova-plugin-statusbar": {
"source": { "source": {
"type": "registry", "type": "registry",
"id": "cordova-plugin-statusbar@2.4.2" "id": "cordova-plugin-statusbar@2.4.2"
}, },
"is_top_level": true, "is_top_level": true,
"variables": {} "variables": {}
}, },
"cordova-plugin-splashscreen": { "cordova-plugin-splashscreen": {
"source": { "source": {
"type": "registry", "type": "registry",
"id": "cordova-plugin-splashscreen@5.0.2" "id": "cordova-plugin-splashscreen@5.0.2"
}, },
"is_top_level": true, "is_top_level": true,
"variables": {} "variables": {}
}, },
"cordova-plugin-camera": { "cordova-plugin-camera": {
"source": { "source": {
"type": "registry", "type": "registry",
"id": "cordova-plugin-camera@2.4.0" "id": "cordova-plugin-camera@2.4.0"
}, },
"is_top_level": true, "is_top_level": true,
"variables": { "variables": {
"CAMERA_USAGE_DESCRIPTION": "我们将在拍照模块使用您的相机" "CAMERA_USAGE_DESCRIPTION": "我们将在拍照模块使用您的相机"
}
},
"cordova-plugin-inappbrowser": {
"source": {
"type": "registry",
"id": "cordova-plugin-inappbrowser@2.0.2"
},
"is_top_level": true,
"variables": {}
},
"cordova-plugin-media-capture": {
"source": {
"type": "local",
"path": "C:\\Users\\晓兵\\Desktop\\cordova-plugin-media-capture"
},
"is_top_level": true,
"variables": {
"CAMERA_USAGE_DESCRIPTION": " ",
"MICROPHONE_USAGE_DESCRIPTION": " ",
"PHOTOLIBRARY_USAGE_DESCRIPTION": " "
}
},
"cordova-plugin-file": {
"source": {
"type": "registry",
"id": "cordova-plugin-file@4.3.3"
},
"is_top_level": true,
"variables": {}
},
"cordova-plugin-file-transfer": {
"source": {
"type": "registry",
"id": "cordova-plugin-file-transfer@1.6.3"
},
"is_top_level": true,
"variables": {}
},
"cordova-plugin-ionic-webview": {
"source": {
"type": "local",
"path": "/Volumes/work/APP/xugon/cordova-plugin-ionic-webview"
},
"is_top_level": true,
"variables": {}
},
"cordova-plugin-image-picker": {
"source": {
"type": "local",
"path": "/Volumes/work/APP/xugon/cordova-plugin-image-picker"
},
"is_top_level": true,
"variables": {}
},
"com.handmobile.cordovaplugin.hotpatch": {
"source": {
"type": "git",
"url": "https://github.com/nature2104/hls-cordova-plugin-hotpatch.git",
"subdir": "."
},
"is_top_level": true,
"variables": {}
},
"cordova-plugin-crosswalk-webview": {
"source": {
"type": "registry",
"id": "cordova-plugin-crosswalk-webview@1.8.0"
},
"is_top_level": true,
"variables": {}
} }
}, }
"cordova-plugin-inappbrowser": { \ No newline at end of file
"source": {
"type": "registry",
"id": "cordova-plugin-inappbrowser@2.0.2"
},
"is_top_level": true,
"variables": {}
},
"cordova-plugin-media-capture": {
"source": {
"type": "local",
"path": "C:\\Users\\晓兵\\Desktop\\cordova-plugin-media-capture"
},
"is_top_level": true,
"variables": {
"CAMERA_USAGE_DESCRIPTION": " ",
"MICROPHONE_USAGE_DESCRIPTION": " ",
"PHOTOLIBRARY_USAGE_DESCRIPTION": " "
}
},
"cordova-plugin-crosswalk-webview": {
"source": {
"type": "registry",
"id": "cordova-plugin-crosswalk-webview@2.2.0"
},
"is_top_level": true,
"variables": {}
},
"cordova-plugin-file": {
"source": {
"type": "registry",
"id": "cordova-plugin-file@4.3.3"
},
"is_top_level": true,
"variables": {}
},
"cordova-plugin-file-transfer": {
"source": {
"type": "registry",
"id": "cordova-plugin-file-transfer@1.6.3"
},
"is_top_level": true,
"variables": {}
},
"cordova-plugin-ionic-webview": {
"source": {
"type": "local",
"path": "/Volumes/work/APP/xugon/cordova-plugin-ionic-webview"
},
"is_top_level": true,
"variables": {}
},
"cordova-plugin-image-picker": {
"source": {
"type": "local",
"path": "/Volumes/work/APP/xugon/cordova-plugin-image-picker"
},
"is_top_level": true,
"variables": {}
},
"com.handmobile.cordovaplugin.hotpatch": {
"source": {
"type": "git",
"url": "https://github.com/nature2104/hls-cordova-plugin-hotpatch.git",
"subdir": "."
},
"is_top_level": true,
"variables": {}
}
}
...@@ -64,7 +64,7 @@ export default { ...@@ -64,7 +64,7 @@ export default {
//overflow-scrolling: touch; //overflow-scrolling: touch;
} }
.weui-dialog { //.weui-dialog {
top: 45vh !important; // top: 45vh !important;
} //}
</style> </style>
This diff is collapsed.
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