Skip to content

H
hls-xcmg-vue-app
Commit 4b200448 authored by 14699's avatar 14699
Browse files
Options

登录去掉隐私协议

parent 0bd9bf42
Expand all Show whitespace changes
Inline Side-by-side
Showing with 109 additions and 153 deletions
config.xml
View file @ 4b200448
...@@ -128,8 +128,4 @@ ...@@ -128,8 +128,4 @@
</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>
config/prod.env.js
View file @ 4b200448
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
module.exports = { module.exports = {
NODE_ENV: '"production"', NODE_ENV: '"production"',
CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV), CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
debug: true, debug: false,
isMobilePlatform: true, isMobilePlatform: true,
loginPath: '"http://210.12.156.64:9090/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ', loginPath: '"http://210.12.156.64:9090/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
basePath: '"http://210.12.156.64:9090/r/api/interface?sysName=XCMG_UAT&apiName="', basePath: '"http://210.12.156.64:9090/r/api/interface?sysName=XCMG_UAT&apiName="',
...@@ -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.8"' currentVersion: '"3.7.0"'
} }
plugins/android.json
View file @ 4b200448
...@@ -14,6 +14,11 @@ ...@@ -14,6 +14,11 @@
"PACKAGE_NAME": "com.hls.app" "PACKAGE_NAME": "com.hls.app"
}, },
"cordova-plugin-crosswalk-webview": { "cordova-plugin-crosswalk-webview": {
"XWALK_VERSION": "22+",
"XWALK_LITEVERSION": "xwalk_core_library_canary:17+",
"XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect",
"XWALK_MODE": "embedded",
"XWALK_MULTIPLEAPK": "true",
"PACKAGE_NAME": "com.hls.app" "PACKAGE_NAME": "com.hls.app"
}, },
"cordova-plugin-datepicker": { "cordova-plugin-datepicker": {
......
plugins/cordova-plugin-crosswalk-webview/README.md
View file @ 4b200448
...@@ -109,6 +109,17 @@ You can also set user agent with the preference of xwalkUserAgent. ...@@ -109,6 +109,17 @@ 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
......
plugins/cordova-plugin-crosswalk-webview/hooks/update_config.js
View file @ 4b200448
...@@ -25,6 +25,8 @@ module.exports = function(context) { ...@@ -25,6 +25,8 @@ 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",
...@@ -32,7 +34,7 @@ module.exports = function(context) { ...@@ -32,7 +34,7 @@ module.exports = function(context) {
specificVersion = false; specificVersion = false;
/** Init */ /** Init */
var CordovaConfig = new ConfigParser(projectConfigurationFile); var CordovaConfig = new ConfigParser(platformConfigurationFile);
var addPermission = function() { var addPermission = function() {
var projectManifestXmlRoot = XmlHelpers.parseElementtreeSync(projectManifestFile); var projectManifestXmlRoot = XmlHelpers.parseElementtreeSync(projectManifestFile);
...@@ -111,29 +113,27 @@ module.exports = function(context) { ...@@ -111,29 +113,27 @@ 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 (xwalkVariables['xwalkMode'] == 'shared') { if (CordovaConfig.getGlobalPreference('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,6 +189,11 @@ module.exports = function(context) { ...@@ -189,6 +189,11 @@ 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();
......
plugins/cordova-plugin-crosswalk-webview/package.json
View file @ 4b200448
{ {
"name": "cordova-plugin-crosswalk-webview", "name": "cordova-plugin-crosswalk-webview",
"version": "1.8.0", "version": "2.2.0",
"description": "Changes the default WebView to CrossWalk", "description": "Changes the default WebView to CrossWalk",
"cordova": { "cordova": {
"id": "cordova-plugin-crosswalk-webview", "id": "cordova-plugin-crosswalk-webview",
...@@ -21,16 +21,25 @@ ...@@ -21,16 +21,25 @@
"ecosystem:cordova", "ecosystem:cordova",
"cordova-android" "cordova-android"
], ],
"engines": [ "engines": {
{ "cordovaDependencies": {
"name": "cordova-android", "2.0.0": {
"version": ">=4" "cordova": ">=5.2.0",
"cordova-android": "4 - 5"
}, },
{ "2.1.0": {
"name": "cordova-plugman", "cordova": ">=5.2.0",
"version": ">=4.2.0" "cordova-android": "4 - 5"
},
"2.2.0": {
"cordova": ">=5.2.0",
"cordova-android": ">=6"
},
"3.0.0": {
"cordova": ">100"
} }
], }
},
"author": "", "author": "",
"license": "Apache 2.0", "license": "Apache 2.0",
"bugs": { "bugs": {
......
plugins/cordova-plugin-crosswalk-webview/plugin.xml
View file @ 4b200448
...@@ -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="1.8.0"> version="2.2.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,19 +13,25 @@ ...@@ -13,19 +13,25 @@
<issue>https://crosswalk-project.org/jira</issue> <issue>https://crosswalk-project.org/jira</issue>
<engines> <engines>
<engine name="cordova-android" version=">=4"/> <engine name="cordova-android" version=">=6"/>
<engine name="cordova-plugman" version=">=4.2.0"/><!-- needed for gradleReference support --> <engine name="cordova-plugman" version=">=5.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" default="19+"/> <preference name="xwalkVersion" value="$XWALK_VERSION"/>
<preference name="xwalkLiteVersion" default="xwalk_core_library_canary:17+"/> <preference name="xwalkLiteVersion" value="$XWALK_LITEVERSION"/>
<preference name="xwalkCommandLine" default="--disable-pull-to-refresh-effect"/> <preference name="xwalkCommandLine" value="$XWALK_COMMANDLINE"/>
<preference name="xwalkMode" default="embedded" /> <preference name="xwalkMode" value="$XWALK_MODE" />
<preference name="xwalkMultipleApk" default="true" /> <preference name="xwalkMultipleApk" value="$XWALK_MULTIPLEAPK" />
<preference name="android-minSdkVersion" value="16" />
</config-file> </config-file>
<config-file target="AndroidManifest.xml" parent="/*"> <config-file target="AndroidManifest.xml" parent="/*">
...@@ -49,4 +55,10 @@ ...@@ -49,4 +55,10 @@
<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>
plugins/fetch.json
View file @ 4b200448
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
"cordova-plugin-crosswalk-webview": { "cordova-plugin-crosswalk-webview": {
"source": { "source": {
"type": "registry", "type": "registry",
"id": "cordova-plugin-crosswalk-webview@1.8.0" "id": "cordova-plugin-crosswalk-webview@2.2.0"
}, },
"is_top_level": true, "is_top_level": true,
"variables": {} "variables": {}
......
src/pages/login.vue
View file @ 4b200448
<template> <template>
<scroll id="login"> <scroll id="login">
<transition name="trans"> <!-- <transition name="trans">-->
<div v-show="downNum" class="modal-show"> <!-- <div v-show="downNum" class="modal-show">-->
<div class="down"> <!-- <div class="down">-->
<div class="policy"> <!-- <div class="policy">-->
<p>隐私政策</p> <!-- <p>隐私政策</p>-->
<span>演示demo遵守隐私相关的法律规范，在使用演示demo前，请先阅读《演示demo隐私政策》</span> <!-- <span>演示demo遵守隐私相关的法律规范，在使用演示demo前，请先阅读《演示demo隐私政策》</span>-->
<button @click="downNum=false;privacyPolicy()">立即查看</button> <!-- <button @click="downNum=false;privacyPolicy()">立即查看</button>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</transition> <!-- </transition>-->
<div class="bird-icon"> <div class="bird-icon">
<h2>欢迎使用</h2> <h2>欢迎使用</h2>
<h3>中煤科工金租租赁通</h3> <h3>中煤科工金租租赁通</h3>
......
yarn.lock
View file @ 4b200448
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