直播

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.izouma.yuanqijjc" version="1.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.izouma.yuanqijjc" ios-CFBundleVersion="1" version="1.0.2" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>元气竞技场</name>
     <description>        A sample Apache Cordova application that responds to the deviceready event.    </description>
     <author email="dev@cordova.apache.org" href="http://cordova.io">        Apache Cordova Team    </author>

distribute.js

@@ -0,0 +1,78 @@
+const ora = require('ora');
+const request = require("request");
+const fs = require("fs");
+const path = require("path");
+const ProgressBar = require('progress');
+const spawn = require('cross-spawn');
+
+let spinner;
+function exec(cmd, args, options) {
+    return new Promise((resolve, reject) => {
+        var s = spawn(cmd, args, options)
+        s.stdout.on('data', function (s) {
+        })
+        s.stderr.on('data', function (s) {
+            console.error(s.toString())
+            reject(s.toString())
+        })
+        s.on('close', code => {
+            if (code == 0) {
+                resolve()
+            } else {
+                reject()
+            }
+        })
+    })
+}
+
+const vueDir = path.resolve(__dirname, 'vue');
+const apkDir = path.resolve(
+    __dirname,
+    "platforms",
+    "android",
+    "app",
+    "build",
+    "outputs",
+    "apk",
+    "release",
+    "app-release.apk"
+);
+spinner = ora('running webpack build').start();
+exec('npm', ['run', 'build'], { cwd: vueDir }).then(res => {
+    spinner.succeed('webpack build success');
+    spinner.start('building android apk');
+    return exec('cordova', ['build', 'android', '--release', '--', `--keystore=${path.resolve(__dirname), 'zouma.jks'}`, '--storePassword=zouma123', '--password=zouma123', '--alias=zouma'], { cwd: './' })
+}).then(res => {
+    return new Promise((resolve, reject) => {
+        spinner.succeed('apk build success');
+        console.log();
+        var bar = new ProgressBar('  uploading apk [:bar] :rate/bps :percent :etas', {
+            complete: '=',
+            incomplete: ' ',
+            width: 20,
+            total: fs.statSync(apkDir).size
+        });
+        request.post({
+            url: "https://www.pgyer.com/apiv2/app/upload",
+            formData: {
+                _api_key: "35efa7161ada3352813c0edc1e375286",
+                file: fs.createReadStream(apkDir).on('data', (chunk) => {
+                    bar.tick(chunk.length);
+                })
+            }
+        }, (err, httpResponse, body) => {
+            if (err) {
+                reject(err);
+            } else {
+                resolve(JSON.parse(body));
+            }
+        });
+    })
+}).then(res => {
+    spinner.succeed('apk upload success');
+    console.log(res);
+}).catch(e => {
+    console.log(e);
+    spinner.fail('fail');
+    spinner.stop();
+})

package-lock.json

@@ -25,6 +25,14 @@
             "resolved": "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-2.1.1.tgz",
             "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
         },
+        "ansi-styles": {
+            "version": "3.2.1",
+            "resolved": "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-3.2.1.tgz",
+            "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
+            "requires": {
+                "color-convert": "^1.9.0"
+            }
+        },
         "aproba": {
             "version": "1.2.0",
             "resolved": "http://registry.npm.taobao.org/aproba/download/aproba-1.2.0.tgz",
@@ -108,11 +116,39 @@
             "resolved": "http://registry.npm.taobao.org/caseless/download/caseless-0.12.0.tgz",
             "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
         },
+        "chalk": {
+            "version": "2.4.2",
+            "resolved": "http://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz",
+            "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+            "requires": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+            }
+        },
         "chownr": {
             "version": "1.1.1",
             "resolved": "http://registry.npm.taobao.org/chownr/download/chownr-1.1.1.tgz",
             "integrity": "sha1-VHJri4//TfBTxCGH6AH7RBLfFJQ="
         },
+        "cli-cursor": {
+            "version": "2.1.0",
+            "resolved": "http://registry.npm.taobao.org/cli-cursor/download/cli-cursor-2.1.0.tgz",
+            "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+            "requires": {
+                "restore-cursor": "^2.0.0"
+            }
+        },
+        "cli-spinners": {
+            "version": "1.3.1",
+            "resolved": "http://registry.npm.taobao.org/cli-spinners/download/cli-spinners-1.3.1.tgz",
+            "integrity": "sha1-ACwZkJEtDVlYDJO9NsBW3pnkJZo="
+        },
+        "clone": {
+            "version": "1.0.4",
+            "resolved": "http://registry.npm.taobao.org/clone/download/clone-1.0.4.tgz",
+            "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
+        },
         "co": {
             "version": "4.6.0",
             "resolved": "http://registry.npm.taobao.org/co/download/co-4.6.0.tgz",
@@ -745,6 +781,18 @@
             "resolved": "http://registry.npm.taobao.org/core-util-is/download/core-util-is-1.0.2.tgz",
             "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
         },
+        "cross-spawn": {
+            "version": "6.0.5",
+            "resolved": "http://registry.npm.taobao.org/cross-spawn/download/cross-spawn-6.0.5.tgz",
+            "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=",
+            "requires": {
+                "nice-try": "^1.0.4",
+                "path-key": "^2.0.1",
+                "semver": "^5.5.0",
+                "shebang-command": "^1.2.0",
+                "which": "^1.2.9"
+            }
+        },
         "dashdash": {
             "version": "1.14.1",
             "resolved": "http://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz",
@@ -766,6 +814,14 @@
             "resolved": "http://registry.npm.taobao.org/deep-extend/download/deep-extend-0.6.0.tgz",
             "integrity": "sha1-xPp8lUBKF6nD6Mp+FTcxK3NjMKw="
         },
+        "defaults": {
+            "version": "1.0.3",
+            "resolved": "http://registry.npm.taobao.org/defaults/download/defaults-1.0.3.tgz",
+            "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+            "requires": {
+                "clone": "^1.0.2"
+            }
+        },
         "delayed-stream": {
             "version": "1.0.0",
             "resolved": "http://registry.npm.taobao.org/delayed-stream/download/delayed-stream-1.0.0.tgz",
@@ -798,6 +854,11 @@
                 "once": "^1.4.0"
             }
         },
+        "escape-string-regexp": {
+            "version": "1.0.5",
+            "resolved": "http://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz",
+            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+        },
         "expand-template": {
             "version": "1.1.1",
             "resolved": "http://registry.npm.taobao.org/expand-template/download/expand-template-1.1.1.tgz",
@@ -898,6 +959,11 @@
                 "har-schema": "^2.0.0"
             }
         },
+        "has-flag": {
+            "version": "3.0.0",
+            "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-3.0.0.tgz",
+            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+        },
         "has-unicode": {
             "version": "2.0.1",
             "resolved": "http://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz",
@@ -946,6 +1012,11 @@
             "resolved": "http://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz",
             "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
         },
+        "isexe": {
+            "version": "2.0.0",
+            "resolved": "http://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz",
+            "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+        },
         "isstream": {
             "version": "0.1.2",
             "resolved": "http://registry.npm.taobao.org/isstream/download/isstream-0.1.2.tgz",
@@ -987,6 +1058,14 @@
                 "verror": "1.10.0"
             }
         },
+        "log-symbols": {
+            "version": "2.2.0",
+            "resolved": "http://registry.npm.taobao.org/log-symbols/download/log-symbols-2.2.0.tgz",
+            "integrity": "sha1-V0Dhxdbw39pK2TI7UzIQfva0xAo=",
+            "requires": {
+                "chalk": "^2.0.1"
+            }
+        },
         "mime-db": {
             "version": "1.36.0",
             "resolved": "http://registry.npm.taobao.org/mime-db/download/mime-db-1.36.0.tgz",
@@ -1000,6 +1079,11 @@
                 "mime-db": "~1.36.0"
             }
         },
+        "mimic-fn": {
+            "version": "1.2.0",
+            "resolved": "http://registry.npm.taobao.org/mimic-fn/download/mimic-fn-1.2.0.tgz",
+            "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI="
+        },
         "mimic-response": {
             "version": "1.0.1",
             "resolved": "http://registry.npm.taobao.org/mimic-response/download/mimic-response-1.0.1.tgz",
@@ -1047,6 +1131,11 @@
             "resolved": "http://registry.npm.taobao.org/nan/download/nan-2.11.1.tgz",
             "integrity": "sha1-kOIrzLjKV+pM03zIPTgZtS7qZ2Y="
         },
+        "nice-try": {
+            "version": "1.0.5",
+            "resolved": "http://registry.npm.taobao.org/nice-try/download/nice-try-1.0.5.tgz",
+            "integrity": "sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y="
+        },
         "node-abi": {
             "version": "2.4.5",
             "resolved": "http://registry.npm.taobao.org/node-abi/download/node-abi-2.4.5.tgz",
@@ -1094,11 +1183,52 @@
                 "wrappy": "1"
             }
         },
+        "onetime": {
+            "version": "2.0.1",
+            "resolved": "http://registry.npm.taobao.org/onetime/download/onetime-2.0.1.tgz",
+            "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+            "requires": {
+                "mimic-fn": "^1.0.0"
+            }
+        },
+        "ora": {
+            "version": "3.0.0",
+            "resolved": "http://registry.npm.taobao.org/ora/download/ora-3.0.0.tgz",
+            "integrity": "sha1-gXnjUluar9mSQtY8wgb9ZHMnQdA=",
+            "requires": {
+                "chalk": "^2.3.1",
+                "cli-cursor": "^2.1.0",
+                "cli-spinners": "^1.1.0",
+                "log-symbols": "^2.2.0",
+                "strip-ansi": "^4.0.0",
+                "wcwidth": "^1.0.1"
+            },
+            "dependencies": {
+                "ansi-regex": {
+                    "version": "3.0.0",
+                    "resolved": "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz",
+                    "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+                },
+                "strip-ansi": {
+                    "version": "4.0.0",
+                    "resolved": "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz",
+                    "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+                    "requires": {
+                        "ansi-regex": "^3.0.0"
+                    }
+                }
+            }
+        },
         "os-homedir": {
             "version": "1.0.2",
             "resolved": "http://registry.npm.taobao.org/os-homedir/download/os-homedir-1.0.2.tgz",
             "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
         },
+        "path-key": {
+            "version": "2.0.1",
+            "resolved": "http://registry.npm.taobao.org/path-key/download/path-key-2.0.1.tgz",
+            "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+        },
         "pdfviewer": {
             "version": "git+https://github.com/x1ongzhu/cordova-plugin-pdfviewer.git#872a8c600e506d8bfba964728a17a695e2330968",
             "from": "git+https://github.com/x1ongzhu/cordova-plugin-pdfviewer.git"
@@ -1140,6 +1270,11 @@
             "resolved": "http://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.0.tgz",
             "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o="
         },
+        "progress": {
+            "version": "2.0.3",
+            "resolved": "http://registry.npm.taobao.org/progress/download/progress-2.0.3.tgz",
+            "integrity": "sha1-foz42PW48jnBvGi+tOt4Vn1XLvg="
+        },
         "psl": {
             "version": "1.1.29",
             "resolved": "http://registry.npm.taobao.org/psl/download/psl-1.1.29.tgz",
@@ -1216,6 +1351,15 @@
                 "uuid": "^3.3.2"
             }
         },
+        "restore-cursor": {
+            "version": "2.0.0",
+            "resolved": "http://registry.npm.taobao.org/restore-cursor/download/restore-cursor-2.0.0.tgz",
+            "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+            "requires": {
+                "onetime": "^2.0.0",
+                "signal-exit": "^3.0.2"
+            }
+        },
         "safe-buffer": {
             "version": "5.1.2",
             "resolved": "http://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz",
@@ -1253,6 +1397,19 @@
                 "tunnel-agent": "^0.6.0"
             }
         },
+        "shebang-command": {
+            "version": "1.2.0",
+            "resolved": "http://registry.npm.taobao.org/shebang-command/download/shebang-command-1.2.0.tgz",
+            "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+            "requires": {
+                "shebang-regex": "^1.0.0"
+            }
+        },
+        "shebang-regex": {
+            "version": "1.0.0",
+            "resolved": "http://registry.npm.taobao.org/shebang-regex/download/shebang-regex-1.0.0.tgz",
+            "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+        },
         "signal-exit": {
             "version": "3.0.2",
             "resolved": "http://registry.npm.taobao.org/signal-exit/download/signal-exit-3.0.2.tgz",
@@ -1328,6 +1485,14 @@
             "resolved": "http://registry.npm.taobao.org/strip-json-comments/download/strip-json-comments-2.0.1.tgz",
             "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
         },
+        "supports-color": {
+            "version": "5.5.0",
+            "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz",
+            "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+            "requires": {
+                "has-flag": "^3.0.0"
+            }
+        },
         "tar": {
             "version": "4.4.6",
             "resolved": "http://registry.npm.taobao.org/tar/download/tar-4.4.6.tgz",
@@ -1425,6 +1590,22 @@
                 "extsprintf": "^1.2.0"
             }
         },
+        "wcwidth": {
+            "version": "1.0.1",
+            "resolved": "http://registry.npm.taobao.org/wcwidth/download/wcwidth-1.0.1.tgz",
+            "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
+            "requires": {
+                "defaults": "^1.0.3"
+            }
+        },
+        "which": {
+            "version": "1.3.1",
+            "resolved": "http://registry.npm.taobao.org/which/download/which-1.3.1.tgz",
+            "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=",
+            "requires": {
+                "isexe": "^2.0.0"
+            }
+        },
         "which-pm-runs": {
             "version": "1.0.0",
             "resolved": "http://registry.npm.taobao.org/which-pm-runs/download/which-pm-runs-1.0.0.tgz",

package.json

@@ -27,8 +27,11 @@
         "cordova-plugin-whitelist": "^1.3.3",
         "cordova-plugin-wkwebview-engine": "^1.1.4",
         "cordova-plugin-x-toast": "^2.6.2",
+        "cross-spawn": "^6.0.5",
         "jpush-phonegap-plugin": "^3.5.1",
+        "ora": "^3.0.0",
         "pdfviewer": "git+https://github.com/x1ongzhu/cordova-plugin-pdfviewer.git",
+        "progress": "^2.0.3",
         "request": "^2.88.0",
         "sharp": "^0.20.2"
     },

platforms/android/android.json

@@ -10,35 +10,35 @@
           "/*": [
             {
               "xml": "<uses-permission android:name=\"android.permission.INTERNET\" />",
-              "count": 86
+              "count": 110
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\" />",
-              "count": 43
+              "count": 55
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\" />",
-              "count": 43
+              "count": 55
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\" />",
-              "count": 44
+              "count": 56
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\" />",
-              "count": 43
+              "count": 55
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />",
-              "count": 44
+              "count": 56
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\" />",
-              "count": 43
+              "count": 55
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\" />",
-              "count": 43
+              "count": 55
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",

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

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="10001" android:versionName="1.0.1" package="com.izouma.yuanqijjc" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="10002" android:versionName="1.0.2" package="com.izouma.yuanqijjc" 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" />
     <uses-permission android:name="android.permission.INTERNET" />
     <application android:hardwareAccelerated="true" android:icon="@mipmap/icon" android:label="@string/app_name" android:supportsRtl="true">

platforms/android/app/src/main/assets/www/dianjing.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=format-detection content="telephone=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=viewport content="initial-scale=1,width=device-width,viewport-fit=cover,user-scalable=no"><script src=./cordova.js></script><title>dianjing</title><link href=./static/css/app.118566cbae317bbaebc690af71a86117.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.d7f4ac00ee957f6fce9a.js></script><script type=text/javascript src=./static/js/app.9b08d06fa6616f6ed70e.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=format-detection content="telephone=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=viewport content="initial-scale=1,width=device-width,viewport-fit=cover,user-scalable=no"><script src=./cordova.js></script><title>dianjing</title><link href=./static/css/app.463870bc03f1a87705812935e5b512bc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.d7f4ac00ee957f6fce9a.js></script><script type=text/javascript src=./static/js/app.9894e400ee8ef2d9f252.js></script></body></html>

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

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.izouma.yuanqijjc" version="1.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.izouma.yuanqijjc" ios-CFBundleVersion="1" version="1.0.2" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <feature name="Camera">
         <param name="android-package" value="org.apache.cordova.camera.CameraLauncher" />
     </feature>

platforms/ios/ios.json

@@ -10,31 +10,31 @@
           "CFBundleLocalizations": [
             {
               "xml": "<array><string>zh_CN</string></array>",
-              "count": 27
+              "count": 36
             }
           ],
           "NSCameraUsageDescription": [
             {
               "xml": "<string>需要相机权限才能继续使用</string>",
-              "count": 27
+              "count": 36
             }
           ],
           "NSPhotoLibraryUsageDescription": [
             {
               "xml": "<string>需要相册权限才能继续使用</string>",
-              "count": 27
+              "count": 36
             }
           ],
           "NSLocationWhenInUseUsageDescription": [
             {
               "xml": "<string>您的当前位置将会在地图上显示，并且用于获取周边的园区数据</string>",
-              "count": 27
+              "count": 36
             }
           ],
           "ITSAppUsesNonExemptEncryption": [
             {
               "xml": "<false />",
-              "count": 27
+              "count": 36
             }
           ],
           "UIBackgroundModes": [

platforms/ios/www/dianjing.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=format-detection content="telephone=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=viewport content="initial-scale=1,width=device-width,viewport-fit=cover,user-scalable=no"><script src=./cordova.js></script><title>dianjing</title><link href=./static/css/app.118566cbae317bbaebc690af71a86117.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.d7f4ac00ee957f6fce9a.js></script><script type=text/javascript src=./static/js/app.9b08d06fa6616f6ed70e.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=format-detection content="telephone=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=viewport content="initial-scale=1,width=device-width,viewport-fit=cover,user-scalable=no"><script src=./cordova.js></script><title>dianjing</title><link href=./static/css/app.463870bc03f1a87705812935e5b512bc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.d7f4ac00ee957f6fce9a.js></script><script type=text/javascript src=./static/js/app.9894e400ee8ef2d9f252.js></script></body></html>

platforms/ios/元气竞技场.xcodeproj/project.pbxproj

@@ -5,7 +5,6 @@
 	};
 	objectVersion = 46;
 	objects = {
-
 /* Begin PBXBuildFile section */
 		0207DA581B56EA530066E2B4 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0207DA571B56EA530066E2B4 /* Images.xcassets */; };
 		026E2EB8E48D422C8F5CF95B /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E0A9190800D419497F0568C /* AdSupport.framework */; settings = {ATTRIBUTES = (Weak, ); }; };

platforms/ios/元气竞技场/config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.izouma.yuanqijjc" version="1.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.izouma.yuanqijjc" ios-CFBundleVersion="1" version="1.0.2" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <feature name="LocalStorage">
         <param name="ios-package" value="CDVLocalStorage" />
     </feature>

platforms/ios/元气竞技场/元气竞技场-Info.plist

@@ -1,75 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleDisplayName</key>
-	<string>元气竞技场</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIcons</key>
-	<dict/>
-	<key>CFBundleIcons~ipad</key>
-	<dict/>
-	<key>CFBundleIdentifier</key>
-	<string>com.izouma.yuanqijjc</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleLocalizations</key>
-	<array>
-		<string>zh_CN</string>
-	</array>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>4</string>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
-	<key>NSCameraUsageDescription</key>
-	<string>需要相机权限才能继续使用</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>您的当前位置将会在地图上显示，并且用于获取周边的园区数据</string>
-	<key>NSMainNibFile</key>
-	<string></string>
-	<key>NSMainNibFile~ipad</key>
-	<string></string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>需要相册权限才能继续使用</string>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>remote-notification</string>
-	</array>
-	<key>UIInterfaceOrientation</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-	</array>
-	<key>UILaunchStoryboardName</key>
-	<string>CDVLaunchScreen</string>
-	<key>UIRequiresFullScreen</key>
-	<true/>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-	</array>
-</dict>
-</plist>
+  <dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+    <key>CFBundleDisplayName</key>
+    <string>元气竞技场</string>
+    <key>CFBundleExecutable</key>
+    <string>${EXECUTABLE_NAME}</string>
+    <key>CFBundleIcons</key>
+    <dict/>
+    <key>CFBundleIcons~ipad</key>
+    <dict/>
+    <key>CFBundleIdentifier</key>
+    <string>com.izouma.yuanqijjc</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleLocalizations</key>
+    <array>
+      <string>zh_CN</string>
+    </array>
+    <key>CFBundleName</key>
+    <string>${PRODUCT_NAME}</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>1.0.2</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleVersion</key>
+    <string>1</string>
+    <key>ITSAppUsesNonExemptEncryption</key>
+    <false/>
+    <key>LSRequiresIPhoneOS</key>
+    <true/>
+    <key>NSAppTransportSecurity</key>
+    <dict>
+      <key>NSAllowsArbitraryLoads</key>
+      <true/>
+    </dict>
+    <key>NSCameraUsageDescription</key>
+    <string>需要相机权限才能继续使用</string>
+    <key>NSLocationWhenInUseUsageDescription</key>
+    <string>您的当前位置将会在地图上显示，并且用于获取周边的园区数据</string>
+    <key>NSMainNibFile</key>
+    <string/>
+    <key>NSMainNibFile~ipad</key>
+    <string/>
+    <key>NSPhotoLibraryUsageDescription</key>
+    <string>需要相册权限才能继续使用</string>
+    <key>UIBackgroundModes</key>
+    <array>
+      <string>remote-notification</string>
+    </array>
+    <key>UIInterfaceOrientation</key>
+    <array>
+      <string>UIInterfaceOrientationPortrait</string>
+    </array>
+    <key>UILaunchStoryboardName</key>
+    <string>CDVLaunchScreen</string>
+    <key>UIRequiresFullScreen</key>
+    <true/>
+    <key>UISupportedInterfaceOrientations</key>
+    <array>
+      <string>UIInterfaceOrientationPortrait</string>
+      <string>UIInterfaceOrientationPortraitUpsideDown</string>
+    </array>
+    <key>UISupportedInterfaceOrientations~ipad</key>
+    <array>
+      <string>UIInterfaceOrientationPortrait</string>
+      <string>UIInterfaceOrientationPortraitUpsideDown</string>
+    </array>
+  </dict>
+</plist>

prepareios.sh

@@ -1,2 +0,0 @@
-node vue/build/build.js
-cordova prepare ios

releaseAndroid.sh

@@ -1,6 +0,0 @@
-cd vue
-node build/build.js
-cd ../
-cordova clean android
-cordova prepare
-cordova build android --release -- --keystore="./zouma.jks" --storePassword=zouma123 --password=zouma123 --alias=zouma

runandroid.sh

@@ -1,3 +0,0 @@
-node vue/build/build.js
-
-cordova run android

vue/src/pages/MatchDetail.vue

@@ -4,7 +4,8 @@
         <div class="card" style="margin-top:35px;padding-top:36px;">
             <img class="game-icon" :src="matchInfo.gameInfo?matchInfo.gameInfo.logo:''">
             <div class="name">{{matchInfo.name}}</div>
-            <div class="row">
+            <div style="margin-top:8px;text-align:center"><span v-if="matchInfo.liveUrl" class="live" @click="openLive">查看直播</span></div>
+            <div class="row" style="margin-top:16px">
                 <div class="item">
                     <div class="label">游戏</div>
                     <div class="value">{{matchInfo.gameInfo?matchInfo.gameInfo.name:''}}</div>
@@ -203,6 +204,11 @@ export default {
             }
             return '手动开启';
         },
+    },
+    methods: {
+        openLive() {
+            window.open(this.matchInfo.liveUrl, '_system')
+        }
     }
 }
 </script>
@@ -278,7 +284,20 @@ export default {
         font-weight: 700;
         margin: 0 20px;
         text-align: center;
-        margin-block-end: 30px;
+    }
+    .live {
+        width: 66px;
+        height: 27px;
+        background: rgba(5, 194, 179, 0.12);
+        border-radius: 4px;
+        border: 1px solid rgba(5, 194, 179, 1);
+        font-size: 12px;
+        font-weight: 400;
+        color: rgba(5, 194, 179, 1);
+        line-height: 25px;
+        display: inline-block;
+        box-sizing: border-box;
+        text-align: center;
     }
     .row {
         display: flex;

www/dianjing.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=format-detection content="telephone=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=viewport content="initial-scale=1,width=device-width,viewport-fit=cover,user-scalable=no"><script src=./cordova.js></script><title>dianjing</title><link href=./static/css/app.118566cbae317bbaebc690af71a86117.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.d7f4ac00ee957f6fce9a.js></script><script type=text/javascript src=./static/js/app.9b08d06fa6616f6ed70e.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=format-detection content="telephone=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=viewport content="initial-scale=1,width=device-width,viewport-fit=cover,user-scalable=no"><script src=./cordova.js></script><title>dianjing</title><link href=./static/css/app.463870bc03f1a87705812935e5b512bc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.d7f4ac00ee957f6fce9a.js></script><script type=text/javascript src=./static/js/app.9894e400ee8ef2d9f252.js></script></body></html>