Mike 7 年之前
父节点
当前提交
2cd9929d61

+ 3 - 0
miaomiao/www/js/controllers/account.js

@@ -69,6 +69,9 @@
                                       $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
                                       $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
                                       $scope.user=storage.getObject('user');
                                       $scope.user=storage.getObject('user');
                                       $state.go('app.home');
                                       $state.go('app.home');
+                                      if(localStorage['jpush']){
+                                        userService.jpush({ jpush: localStorage['jpush']}).then(function (result) {}, function (erro) {});
+                                      }
                                   }else{
                                   }else{
                                       $state.go("loginAccount",{wechat:result.data.data.openid})
                                       $state.go("loginAccount",{wechat:result.data.data.openid})
                                   }
                                   }

+ 5 - 2
miaomiao/www/js/services/commonservice.js

@@ -175,8 +175,11 @@
                                       audioSampleRate: 44100,
                                       audioSampleRate: 44100,
                                       audioBitrate: 128000, // 128 kilobits
                                       audioBitrate: 128000, // 128 kilobits
                                       progress: function (info) {
                                       progress: function (info) {
-                                          var f=parseFloat(info)*100;
-                                          msg.text('压缩:'+Math.floor(f) + '%');
+                                        var f=parseFloat(info)*100;
+                                        if(cordova.platformId === 'ios'){
+                                           var f=info; 
+                                        }
+                                        msg.text('压缩:'+Math.floor(f) + '%');
                                       }
                                       }
                                   }
                                   }
                               );
                               );

+ 7 - 0
miaomiao/www/js/services/userservice.js

@@ -27,6 +27,13 @@
                     method: "get",
                     method: "get",
                 })
                 })
             },
             },
+            jpush:function (data) {
+                return $http({
+                    url: config.server + 'api/user/jpush',
+                    method: "post",
+                    data: data
+                })
+            },
             isLogin: function () {
             isLogin: function () {
              return !util.empty(storage.get("token")) && storage.getObject("user");
              return !util.empty(storage.get("token")) && storage.getObject("user");
             }
             }

+ 28 - 0
server/app/Http/Controllers/Api/V1/MyController.php

@@ -202,6 +202,34 @@ class MyController extends Controller
         }
         }
     }
     }
 
 
+    /**
+     * 极光推送接口
+     * @param Request $request
+     * @return mixed
+     */
+    public function updateJpush(Request $request)
+    {
+        $user = $this->getUser();
+        $validator = Validator::make($data = $request->all(),
+            [
+                'jpush' => 'required',
+            ],
+            [
+                'jpush.required' => 'Jpush选项必填',
+            ]
+        );
+
+        if ($validator->fails()) {
+            return $this->api($validator->messages(), ErrorCode::CLIENT_WRONG_PARAMS);
+        }
+        $user->jpush = $data['jpush'];
+        if (!$user->save()) {
+            return $this->error(ErrorCode::SAVE_MODEL_FAILED);
+        }
+        return $this->api(['result' => true]);
+    }
+
+
     /**
     /**
      * @api {post} /api/my/recharge 充值
      * @api {post} /api/my/recharge 充值
      * @apiDescription 充值
      * @apiDescription 充值

+ 5 - 1
server/routes/api.php

@@ -296,7 +296,11 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
         'as' => 'interaction.destroy',
         'as' => 'interaction.destroy',
         'uses' => 'InteractionController@destroy',
         'uses' => 'InteractionController@destroy',
     ]);
     ]);
-
+    //jpush
+    $api->post('user/jpush', [
+        'as' => 'user.jpush',
+        'uses' => 'MyController@jpush',
+    ]);
     //支付宝支付回调
     //支付宝支付回调
     $api->post('pay/alipay/notify', [
     $api->post('pay/alipay/notify', [
         'as' => 'pay.alipay.notify',
         'as' => 'pay.alipay.notify',