baimeng 9 年之前
父節點
當前提交
53ea461f26

二進制
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


+ 2 - 4
wl/platforms/android/AndroidManifest.xml

xqd
@@ -2,16 +2,14 @@
 <manifest android:hardwareAccelerated="true" android:versionCode="1" android:versionName="0.0.1" package="net.yihankeji.demo" 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" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <application android:hardwareAccelerated="true" android:icon="@drawable/icon" android:label="@string/app_name" android:supportsRtl="true">
-        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:theme="@android:style/Theme.Black.NoTitleBar" android:windowSoftInputMode="adjustResize">
+        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:theme="@android:style/Theme.DeviceDefault.NoActionBar" android:windowSoftInputMode="adjustResize">
             <intent-filter android:label="@string/launcher_name">
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" />
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 </manifest>

+ 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" />

+ 7 - 7
wl/platforms/android/res/xml/config.xml

xqd xqd xqd
@@ -4,6 +4,9 @@
     <feature name="ActionSheet">
         <param name="android-package" value="nl.xservices.plugins.actionsheet.ActionSheet" />
     </feature>
+    <feature name="RareloopAppVersion">
+        <param name="android-package" value="com.rareloop.cordova.appversion.RareloopAppVersion" />
+    </feature>
     <feature name="Camera">
         <param name="android-package" value="org.apache.cordova.camera.CameraLauncher" />
     </feature>
@@ -17,6 +20,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" />
@@ -29,13 +36,6 @@
         <param name="android-package" value="io.ionic.keyboard.IonicKeyboard" />
         <param name="onload" value="true" />
     </feature>
-    <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" />

+ 1 - 1
wl/platforms/platforms.json

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

+ 18 - 17
wl/plugins/android.json

xqd
@@ -8,41 +8,42 @@
     },
     "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"
-        },
-        "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": {}
+    "dependent_plugins": {
+        "cordova-plugin-compat": {
+            "PACKAGE_NAME": "net.yihankeji.demo"
+        }
+    }
 }