From: qiaowei Date: Tue, 14 Apr 2020 09:52:42 +0000 (+0800) Subject: 公安app X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=d727ec407e8fc3518dca6d2284941da9c9753315;p=dali_platform%2Fmobile.git 公安app --- diff --git a/config.xml b/config.xml index 0c356ca..409322b 100644 --- a/config.xml +++ b/config.xml @@ -1,6 +1,6 @@ - dlapp + dlapp A sample Apache Cordova application that responds to the deviceready event. diff --git a/package.json b/package.json index 5a54e09..d267972 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "com.dalicitycard.app", + "name": "com.dalipolice.app", "displayName": "大理市民卡", "version": "1.0.3", "description": "A sample Apache Cordova application that responds to the deviceready event.", diff --git a/platforms/android/app/src/main/assets/www/index.html b/platforms/android/app/src/main/assets/www/index.html index 005362a..ea18141 100644 --- a/platforms/android/app/src/main/assets/www/index.html +++ b/platforms/android/app/src/main/assets/www/index.html @@ -8,7 +8,7 @@ - 大理公安在线 + 大理智警 diff --git a/platforms/android/app/src/main/assets/www/js/index.js b/platforms/android/app/src/main/assets/www/js/index.js index 9e660c1..5f48d1e 100644 --- a/platforms/android/app/src/main/assets/www/js/index.js +++ b/platforms/android/app/src/main/assets/www/js/index.js @@ -27,7 +27,7 @@ var app = { onDeviceReady: function() { debugger; var firstload = window.localStorage.getItem("firstload"); - if(isEmpty(firstload)){ + if(isEmpty(firstload)||firstload!='yes'){ app.toPage("startload.html") return; } diff --git a/platforms/android/app/src/main/assets/www/login.html b/platforms/android/app/src/main/assets/www/login.html index bce7fd5..1406441 100644 --- a/platforms/android/app/src/main/assets/www/login.html +++ b/platforms/android/app/src/main/assets/www/login.html @@ -12,7 +12,7 @@
    diff --git a/platforms/android/app/src/main/assets/www/main.html b/platforms/android/app/src/main/assets/www/main.html index 0d18b69..4aeb95e 100644 --- a/platforms/android/app/src/main/assets/www/main.html +++ b/platforms/android/app/src/main/assets/www/main.html @@ -15,16 +15,16 @@
    -
    +
    - +
    - +
    - +
    @@ -36,13 +36,13 @@
    -
    +
    读码
    -
    +
    扫码
    @@ -50,13 +50,13 @@
    -
    +
    访码
    -
    +
    更多
    diff --git a/platforms/android/app/src/main/res/drawable-hdpi/icon.png b/platforms/android/app/src/main/res/drawable-hdpi/icon.png index cf210c5..9b8c49c 100644 Binary files a/platforms/android/app/src/main/res/drawable-hdpi/icon.png and b/platforms/android/app/src/main/res/drawable-hdpi/icon.png differ diff --git a/platforms/android/app/src/main/res/drawable-ldpi/icon.png b/platforms/android/app/src/main/res/drawable-ldpi/icon.png index 7cfa69b..eb9b7ba 100644 Binary files a/platforms/android/app/src/main/res/drawable-ldpi/icon.png and b/platforms/android/app/src/main/res/drawable-ldpi/icon.png differ diff --git a/platforms/android/app/src/main/res/drawable-mdpi/icon.png b/platforms/android/app/src/main/res/drawable-mdpi/icon.png index 74e4190..b354ab7 100644 Binary files a/platforms/android/app/src/main/res/drawable-mdpi/icon.png and b/platforms/android/app/src/main/res/drawable-mdpi/icon.png differ diff --git a/platforms/android/app/src/main/res/drawable-xhdpi/icon.png b/platforms/android/app/src/main/res/drawable-xhdpi/icon.png index 96b824e..b5f0007 100644 Binary files a/platforms/android/app/src/main/res/drawable-xhdpi/icon.png and b/platforms/android/app/src/main/res/drawable-xhdpi/icon.png differ diff --git a/platforms/android/app/src/main/res/drawable-xxhdpi/icon.png b/platforms/android/app/src/main/res/drawable-xxhdpi/icon.png index 8dea17d..291ff23 100644 Binary files a/platforms/android/app/src/main/res/drawable-xxhdpi/icon.png and b/platforms/android/app/src/main/res/drawable-xxhdpi/icon.png differ diff --git a/platforms/android/app/src/main/res/drawable-xxxhdpi/icon.png b/platforms/android/app/src/main/res/drawable-xxxhdpi/icon.png index d5a2e54..dc1b1a1 100644 Binary files a/platforms/android/app/src/main/res/drawable-xxxhdpi/icon.png and b/platforms/android/app/src/main/res/drawable-xxxhdpi/icon.png differ diff --git a/platforms/android/app/src/main/res/mipmap-hdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-hdpi-v26/ic_launcher_foreground.png index cf210c5..9b8c49c 100644 Binary files a/platforms/android/app/src/main/res/mipmap-hdpi-v26/ic_launcher_foreground.png and b/platforms/android/app/src/main/res/mipmap-hdpi-v26/ic_launcher_foreground.png differ diff --git a/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index cf210c5..9b8c49c 100644 Binary files a/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/platforms/android/app/src/main/res/mipmap-ldpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-ldpi-v26/ic_launcher_foreground.png index 7cfa69b..eb9b7ba 100644 Binary files a/platforms/android/app/src/main/res/mipmap-ldpi-v26/ic_launcher_foreground.png and b/platforms/android/app/src/main/res/mipmap-ldpi-v26/ic_launcher_foreground.png differ diff --git a/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png index 7cfa69b..eb9b7ba 100644 Binary files a/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png differ diff --git a/platforms/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher_foreground.png index 74e4190..b354ab7 100644 Binary files a/platforms/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher_foreground.png and b/platforms/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher_foreground.png differ diff --git a/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 74e4190..b354ab7 100644 Binary files a/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/platforms/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher_foreground.png index 96b824e..9b8c49c 100644 Binary files a/platforms/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher_foreground.png and b/platforms/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher_foreground.png differ diff --git a/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 96b824e..9b8c49c 100644 Binary files a/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/platforms/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher_foreground.png index 8dea17d..9b8c49c 100644 Binary files a/platforms/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher_foreground.png and b/platforms/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher_foreground.png differ diff --git a/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 8dea17d..9b8c49c 100644 Binary files a/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/platforms/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher_foreground.png index d5a2e54..9b8c49c 100644 Binary files a/platforms/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher_foreground.png and b/platforms/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher_foreground.png differ diff --git a/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index d5a2e54..9b8c49c 100644 Binary files a/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/platforms/android/app/src/main/res/values/strings.xml b/platforms/android/app/src/main/res/values/strings.xml index c6e1b7a..6bfd2ab 100644 --- a/platforms/android/app/src/main/res/values/strings.xml +++ b/platforms/android/app/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ dlapp - 大理公安在线 + 大理智警 @string/launcher_name diff --git a/platforms/android/app/src/main/res/xml/config.xml b/platforms/android/app/src/main/res/xml/config.xml index a983c3b..ca7b3a0 100644 --- a/platforms/android/app/src/main/res/xml/config.xml +++ b/platforms/android/app/src/main/res/xml/config.xml @@ -43,7 +43,7 @@ - dlapp + dlapp A sample Apache Cordova application that responds to the deviceready event. diff --git a/platforms/browser/config.xml b/platforms/browser/config.xml index ca652aa..dd220da 100644 --- a/platforms/browser/config.xml +++ b/platforms/browser/config.xml @@ -1,6 +1,6 @@ - dlapp + dlapp A sample Apache Cordova application that responds to the deviceready event. diff --git a/www/img/m1.png b/www/img/m1.png new file mode 100644 index 0000000..2159013 Binary files /dev/null and b/www/img/m1.png differ diff --git a/www/img/m2.png b/www/img/m2.png new file mode 100644 index 0000000..6f6a26a Binary files /dev/null and b/www/img/m2.png differ diff --git a/www/img/m3.png b/www/img/m3.png new file mode 100644 index 0000000..f26cb6b Binary files /dev/null and b/www/img/m3.png differ diff --git a/www/img/m4.png b/www/img/m4.png new file mode 100644 index 0000000..7f850a9 Binary files /dev/null and b/www/img/m4.png differ diff --git a/www/img/p1.png b/www/img/p1.png new file mode 100644 index 0000000..fce415e Binary files /dev/null and b/www/img/p1.png differ diff --git a/www/img/splashscreen.png b/www/img/splashscreen.png index a93b845..87329cb 100644 Binary files a/www/img/splashscreen.png and b/www/img/splashscreen.png differ diff --git a/www/index.html b/www/index.html index 005362a..ea18141 100644 --- a/www/index.html +++ b/www/index.html @@ -8,7 +8,7 @@ - 大理公安在线 + 大理智警 diff --git a/www/js/index.js b/www/js/index.js index 9e660c1..5f48d1e 100644 --- a/www/js/index.js +++ b/www/js/index.js @@ -27,7 +27,7 @@ var app = { onDeviceReady: function() { debugger; var firstload = window.localStorage.getItem("firstload"); - if(isEmpty(firstload)){ + if(isEmpty(firstload)||firstload!='yes'){ app.toPage("startload.html") return; } diff --git a/www/js/startload.js b/www/js/startload.js index 2ac0b7d..2066729 100644 --- a/www/js/startload.js +++ b/www/js/startload.js @@ -7,7 +7,7 @@ var app = { }, toMain:function(){ - window.localStorage.setItem("firstload",'no'); + //window.localStorage.setItem("firstload",'no'); var uid = window.localStorage.getItem("token"); if (isEmpty(uid)) { window.location = "login.html"; diff --git a/www/login.html b/www/login.html index bce7fd5..1406441 100644 --- a/www/login.html +++ b/www/login.html @@ -12,7 +12,7 @@
      diff --git a/www/main.html b/www/main.html index 0d18b69..4aeb95e 100644 --- a/www/main.html +++ b/www/main.html @@ -15,16 +15,16 @@
      -
      +
      - +
      - +
      - +
      @@ -36,13 +36,13 @@
      -
      +
      读码
      -
      +
      扫码
      @@ -50,13 +50,13 @@
      -
      +
      访码
      -
      +
      更多
      diff --git a/www/startload.html b/www/startload.html index 93c1cc1..ae0e039 100644 --- a/www/startload.html +++ b/www/startload.html @@ -8,7 +8,7 @@ - 大理公安在线 + 大理智警