首頁 探索 說明
註冊 登入
baimeng
/
wuliu
1
1
複刻 0
Files 問題管理 0 合併請求 0 Wiki
瀏覽代碼

bug fixed

Mike 9 年之前
父節點
7c20764d25
當前提交
932625f20c
共有 11 個文件被更改，包括 48 次插入 和 38 次删除
分割檢視 顯示文件統計
  1. 2 2
      wl/package.json
  2. 二進制
      wl/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock
  3. 二進制
      wl/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
  4. 二進制
      wl/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
  5. 1 1
      wl/platforms/android/assets/www/index.html
  6. 22 12
      wl/platforms/android/assets/www/js/controllers/my.js
  7. 1 1
      wl/platforms/android/assets/www/templates/account/login.html
  8. 5 5
      wl/platforms/android/res/xml/config.xml
  9. 2 2
      wl/platforms/platforms.json
  10. 14 14
      wl/plugins/android.json
  11. 1 1
      wl/www/js/services/dataservice.js

+ 2 - 2
wl/package.json
查看文件

xqd 
@@ -22,7 +22,7 @@
 
     "ionic-plugin-keyboard"
 
   ],
 
   "cordovaPlatforms": [
 
-    "android",
 
-    "ios"
 
+    "ios",
 
+    "android"
 
   ]
 
 }

二進制
wl/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock
查看文件


二進制
wl/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
查看文件


二進制
wl/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
查看文件


+ 1 - 1
wl/platforms/android/assets/www/index.html
查看文件

xqd 
@@ -7,7 +7,7 @@
 
     <link href="lib/ionic/css/ionic.css" rel="stylesheet">
 
     <link href="css/style.css" rel="stylesheet">
 
 </head>
 
-<body ng-app="app">
 
+<body ng-app="app" class="platform-android platform-cordova platform-webview">
 
     <ion-nav-bar class="bar-positive">
 
         <ion-nav-back-button>
 
         </ion-nav-back-button>

+ 22 - 12
wl/platforms/android/assets/www/js/controllers/my.js
查看文件

xqd xqd xqd 
@@ -122,13 +122,14 @@
 
         }
 
     }]);
 
     
-    app.controller('myTruckCtrl', ['$scope', '$state', 'myService', 'msg', function ($scope, $state, myService, msg) {
 
+    app.controller('myTruckCtrl', ['$scope', '$state', 'myService', 'msg','config', function ($scope, $state, myService, msg,config) {
 
         $scope.filter = {
 
             hasMore: false,
 
             page: 0,
 
             pageSize: 10,
 
         }
 
         $scope.items = [];
 
+        $scope.host = config.server +'/upload/photo/';
 
         $scope.load = function (init) {
 
             if (init) {
 
                 $scope.filter.pageIndex = 1;
 
@@ -205,7 +206,10 @@
 
         { name: '其他', value: '20' }];
 
         $scope.save = function () {
 
             msg.loading('保存中...');
 
+            console.log('id '+$scope.vm.id);
 
             if ($scope.vm.id>0) {
 
+                $scope.vm.photo = null;
 
+                console.log('updateTruck '+ JSON.stringify($scope.vm));
 
                 myService.updateTruck($scope.vm).then(function (result) {
 
                     msg.hide();
 
                     $state.go('wl.my_truck');
 
@@ -233,21 +237,27 @@
 
                 uploadOptions.fileName = "photo.jpg";
 
                 uploadOptions.mimeType = "image/jpeg";
 
                 uploadOptions.httpMethod = 'post';
 
+                var id = '';
 
+                if ($scope.vm.id>0) {
 
+                    id = '/'+$scope.vm.id;
 
+                }
 
                 uploadOptions.chunkedMode = true;
 
                 var token = 'Bearer ' + localStorage['token'];
 
                 uploadOptions.headers = { "Authorization": token };
 
+                
                 var ft = new FileTransfer();
 
-                ft.upload(imageUri, encodeURI(config.server + "api/trucks"), function (sucess) {
 
-                    $timeout(function () {
 
-                        var res = JSON.parse(sucess.response);
 
-                        $scope.vm.photo = res.data.photo;
 
-                    });
 
-                    console.log('上传成功'+JSON.stringify(sucess.response));
 
-                    //alert('上传成功'+JSON.stringify(sucess));
 
-                }, function (fail) {
 
-                    console.log('上传失败'+JSON.stringify(fail));
 
-                    //alert('上传失败'+JSON.stringify(fail));
 
-                }, uploadOptions);
 
+                    ft.upload(imageUri, encodeURI(config.server + "api/trucks" + id), function (sucess) {
 
+                        $timeout(function () {
 
+                            var res = JSON.parse(sucess.response);
 
+                            $scope.vm.id = res.data.id;
 
+                            $scope.vm.photo = res.data.photo;
 
+                        });
 
+                        console.log('上传成功'+JSON.stringify(sucess.response));
 
+                        //alert('上传成功'+JSON.stringify(sucess));
 
+                    }, function (fail) {
 
+                        console.log('上传失败'+JSON.stringify(fail));
 
+                        //alert('上传失败'+JSON.stringify(fail));
 
+                    }, uploadOptions);
 
             }, function (erro) {
 
                 msg.error(erro);
 
             });

+ 1 - 1
wl/platforms/android/assets/www/templates/account/login.html
查看文件

xqd 
@@ -1,5 +1,5 @@
 
 <ion-view view-title="掌上物流网">
 
-    <ion-content scroll="false">
 
+    <ion-content>
 
         <div  style="margin-top:20px">
 
             <img src="img/logo.png"  style="width: 30%;height: auto;margin-left:35%;"/>
 
             <img src="img/sublogo.png" style="width:100%;height:auto" />

+ 5 - 5
wl/platforms/android/res/xml/config.xml
查看文件

xqd xqd xqd 
@@ -17,6 +17,10 @@
 
     <feature name="FileTransfer">
 
         <param name="android-package" value="org.apache.cordova.filetransfer.FileTransfer" />
 
     </feature>
 
+    <feature name="SplashScreen">
 
+        <param name="android-package" value="org.apache.cordova.splashscreen.SplashScreen" />
 
+        <param name="onload" value="true" />
 
+    </feature>
 
     <feature name="StatusBar">
 
         <param name="android-package" value="org.apache.cordova.statusbar.StatusBar" />
 
         <param name="onload" value="true" />
 
@@ -32,10 +36,6 @@
 
     <feature name="RareloopAppVersion">
 
         <param name="android-package" value="com.rareloop.cordova.appversion.RareloopAppVersion" />
 
     </feature>
 
-    <feature name="SplashScreen">
 
-        <param name="android-package" value="org.apache.cordova.splashscreen.SplashScreen" />
 
-        <param name="onload" value="true" />
 
-    </feature>
 
     <icon density="ldpi" src="resources/android/icon/icon.png" />
 
     <icon density="mdpi" src="resources/android/icon/icon.png" />
 
     <icon density="hdpi" src="resources/android/icon/icon.png" />
 
@@ -47,7 +47,7 @@
 
     <author email="you@example.com" href="http://example.com.com/">
 
       Your Name Here
 
     </author>
 
-    <content src="index.html" />
 
+    <content original-src="index.html" src="http://192.168.1.101:8100" />
 
     <access launch-external="yes" origin="tel:*" />
 
     <access origin="*" />
 
     <allow-navigation href="*" />

+ 2 - 2
wl/platforms/platforms.json
查看文件

xqd 
@@ -1,4 +1,4 @@
 
 {
 
-    "android": "4.1.1",
 
-    "ios": "3.9.2"
 
+    "ios": "3.9.2",
 
+    "android": "4.1.1"
 
 }

+ 14 - 14
wl/plugins/android.json
查看文件

xqd 
@@ -8,40 +8,40 @@
 
     },
 
     "installed_plugins": {
 
         "cordova-plugin-actionsheet": {
 
-            "PACKAGE_NAME": "com.uhisport.football"
 
+            "PACKAGE_NAME": "net.yihankeji.demo"
 
         },
 
         "cordova-plugin-appversion": {
 
-            "PACKAGE_NAME": "com.uhisport.football"
 
+            "PACKAGE_NAME": "net.yihankeji.demo"
 
         },
 
         "cordova-plugin-camera": {
 
-            "PACKAGE_NAME": "com.uhisport.football"
 
+            "PACKAGE_NAME": "net.yihankeji.demo"
 
         },
 
         "cordova-plugin-compat": {
 
-            "PACKAGE_NAME": "com.uhisport.football"
 
+            "PACKAGE_NAME": "net.yihankeji.demo"
 
         },
 
         "cordova-plugin-console": {
 
-            "PACKAGE_NAME": "com.uhisport.football"
 
+            "PACKAGE_NAME": "net.yihankeji.demo"
 
         },
 
         "cordova-plugin-device": {
 
-            "PACKAGE_NAME": "com.uhisport.football"
 
+            "PACKAGE_NAME": "net.yihankeji.demo"
 
         },
 
         "cordova-plugin-file": {
 
-            "PACKAGE_NAME": "com.uhisport.football"
 
+            "PACKAGE_NAME": "net.yihankeji.demo"
 
         },
 
         "cordova-plugin-file-transfer": {
 
-            "PACKAGE_NAME": "com.uhisport.football"
 
+            "PACKAGE_NAME": "net.yihankeji.demo"
 
+        },
 
+        "cordova-plugin-splashscreen": {
 
+            "PACKAGE_NAME": "net.yihankeji.demo"
 
         },
 
         "cordova-plugin-statusbar": {
 
-            "PACKAGE_NAME": "com.uhisport.football"
 
+            "PACKAGE_NAME": "net.yihankeji.demo"
 
         },
 
         "cordova-plugin-whitelist": {
 
-            "PACKAGE_NAME": "com.uhisport.football"
 
+            "PACKAGE_NAME": "net.yihankeji.demo"
 
         },
 
         "ionic-plugin-keyboard": {
 
-            "PACKAGE_NAME": "com.uhisport.football"
 
-        },
 
-        "cordova-plugin-splashscreen": {
 
-            "PACKAGE_NAME": "com.uhisport.football"
 
+            "PACKAGE_NAME": "net.yihankeji.demo"
 
         }
 
     },
 
     "dependent_plugins": {}

+ 1 - 1
wl/www/js/services/dataservice.js
查看文件

xqd 
@@ -21,7 +21,7 @@
 
                 this.remove(key);
 
                 this.set(key, value);
 
             },
 
-            updateObject(key, value) {
 
+            updateObject: function(key, value) {
 
                 this.remove(key);
 
                 this.setObject(key, value);
 
             },