1

miaomiao/platforms/android/build/intermediates/assets/debug/www/js/controllers/add.js

@@ -22,7 +22,7 @@
             $scope.videos = [];
             $scope.addpict = function () {
                 common.chooseImage().then(function (img) {
-                    common.uploadFiles(img).then(function (result) {
+                    common.uploadFiles(img,1).then(function (result) {
                         var response = JSON.parse(result.response);
                         var file = response.data.file;
                         $scope.imgs.push(file);
@@ -37,7 +37,8 @@
                 var options = { limit: 1, duration:20};
                 navigator.device.capture.captureVideo(function (videos) {
                     $scope.videos.push(videos[0].fullPath);
-                    common.uploadFiles(videos[0].fullPath).then(function (result) {
+                    common.uploadFiles(videos[0].fullPath, 2).then(function (result) {
+                        debugger;
                         var response = JSON.parse(result.response);
                         var file = response.data.file;
                         debugger;

miaomiao/platforms/android/build/intermediates/assets/debug/www/js/services/commonservice.js

@@ -53,19 +53,27 @@
                 });
                 return deferred.promise;
             },
-            uploadFiles: function (imageUri) {//通用上传
+            uploadFiles: function (imageUri,type) {//通用上传,type:1图片,2视频
                 var deferred = $q.defer();
                 if (imageUri) {
                     var uploadOptions = new FileUploadOptions();
-                    uploadOptions.fileKey = "store";
-                    uploadOptions.fileName = "store.jpg";
-                    uploadOptions.mimeType = "image/jpeg";
+                    if (type==1) {//图片
+                        uploadOptions.fileKey = "picture";
+                        uploadOptions.fileName = "picture.jpg";
+                        uploadOptions.mimeType = "image/jpeg";
+                        uploadOptions.params = { tag: "picture" };
+                    }
+                    if (type==2) {//视频
+                        uploadOptions.fileKey = "video";
+                        uploadOptions.fileName = "video.mp4";
+                        uploadOptions.mimeType = "video/mpeg";
+                        uploadOptions.params = { tag: "video" };
+                    }
                     uploadOptions.httpMethod = 'post';
                     uploadOptions.chunkedMode = true;
                     var token = 'Bearer ' + localStorage['token'];
                     uploadOptions.headers = { "Authorization": token };
                     var ft = new FileTransfer();
-                    uploadOptions.params = { tag: "picture" };
                     ft.upload(imageUri, encodeURI(config.server + "api/attachment/upload"), function (sucess) {
                         deferred.resolve(sucess);
                         //  alert('上传成功' + JSON.stringify(sucess));

miaomiao/www/js/controllers/add.js

@@ -22,7 +22,7 @@
             $scope.videos = [];
             $scope.addpict = function () {
                 common.chooseImage().then(function (img) {
-                    common.uploadFiles(img).then(function (result) {
+                    common.uploadFiles(img,1).then(function (result) {
                         var response = JSON.parse(result.response);
                         var file = response.data.file;
                         $scope.imgs.push(file);
@@ -37,7 +37,8 @@
                 var options = { limit: 1, duration:20};
                 navigator.device.capture.captureVideo(function (videos) {
                     $scope.videos.push(videos[0].fullPath);
-                    common.uploadFiles(videos[0].fullPath).then(function (result) {
+                    common.uploadFiles(videos[0].fullPath, 2).then(function (result) {
+                        debugger;
                         var response = JSON.parse(result.response);
                         var file = response.data.file;
                         debugger;

miaomiao/www/js/services/commonservice.js

@@ -53,19 +53,27 @@
                 });
                 return deferred.promise;
             },
-            uploadFiles: function (imageUri) {//通用上传
+            uploadFiles: function (imageUri,type) {//通用上传,type:1图片,2视频
                 var deferred = $q.defer();
                 if (imageUri) {
                     var uploadOptions = new FileUploadOptions();
-                    uploadOptions.fileKey = "store";
-                    uploadOptions.fileName = "store.jpg";
-                    uploadOptions.mimeType = "image/jpeg";
+                    if (type==1) {//图片
+                        uploadOptions.fileKey = "picture";
+                        uploadOptions.fileName = "picture.jpg";
+                        uploadOptions.mimeType = "image/jpeg";
+                        uploadOptions.params = { tag: "picture" };
+                    }
+                    if (type==2) {//视频
+                        uploadOptions.fileKey = "video";
+                        uploadOptions.fileName = "video.mp4";
+                        uploadOptions.mimeType = "video/mpeg";
+                        uploadOptions.params = { tag: "video" };
+                    }
                     uploadOptions.httpMethod = 'post';
                     uploadOptions.chunkedMode = true;
                     var token = 'Bearer ' + localStorage['token'];
                     uploadOptions.headers = { "Authorization": token };
                     var ft = new FileTransfer();
-                    uploadOptions.params = { tag: "picture" };
                     ft.upload(imageUri, encodeURI(config.server + "api/attachment/upload"), function (sucess) {
                         deferred.resolve(sucess);
                         //  alert('上传成功' + JSON.stringify(sucess));