chenjunkai 5 жил өмнө
parent
commit
6487a6e539

+ 0 - 2
Ansjer/urls.py

@@ -118,13 +118,11 @@ urlpatterns = [
     url(r'^v2/authcode/verify$', UserController.verifyAuthcode.as_view()),
 
     url(r'^detect/add$', DetectController.PushNotificationView.as_view()),
-    # url(r'^detect/status$', EquipmentInfo.DetectStatusView.as_view()),
     url(r'^detect/(?P<operation>.*)$', DetectController.DetectControllerView.as_view()),
     url(r'^notify/push$', DetectController.NotificationView.as_view()),
     url(r'^cloudVod/(?P<operation>.*)$', CloudVod.CloudVodView.as_view()),
     url(r'^meal/(?P<operation>.*)$', MealManage.MealView.as_view()),
     url(r'^order/(?P<operation>.*)$', OrderContrller.OrderView.as_view()),
-    # url(r'^uidApp/(?P<operation>.*)$', UidappController.UidappView.as_view()),
     url(r'^appCol/(?P<operation>.*)$', AppColophon.AppColView.as_view()),
     url(r'^vodBucket/(?P<operation>.*)$', VodBucket.VodBucketView.as_view()),
     url(r'^UIDBucket/(?P<operation>.*)$', VodBucket.UidBucketView.as_view()),

+ 3 - 3
Controller/EquipmentOTA.py

@@ -190,7 +190,7 @@ class EquipmentVersionView(View):
         code = request_dict.get('code', None)
         status = request_dict.get('status', None)
         lang = request_dict.get('lang', None)
-        min_ver = request_dict.get('min_ver', None)
+        max_ver = request_dict.get('max_ver', None)
         file_s = request.FILES.get('file', None)
         paths = 'static/versions/image'
         if not os.path.exists(paths):
@@ -225,8 +225,8 @@ class EquipmentVersionView(View):
                         'img': img,
                         'update_time': update_time
                     }
-                    if min_ver:
-                        update_dict['min_ver'] = min_ver
+                    if max_ver:
+                        update_dict['max_ver'] = max_ver
                     ev.update(**update_dict)
                 except Exception as e:
                     return response.json(404, repr(e))

+ 2 - 2
Controller/OTAEquipment.py

@@ -493,8 +493,8 @@ def getNewVerInterface(request):
         equipment = equipmentValid[0]
         file_path = equipment.filePath
         ver = equipment.softwareVersion
-        min_ver = equipment.min_ver
-        if now_ver >= min_ver:
+        max_ver = equipment.max_ver
+        if now_ver <= max_ver:
             # 创建url的token
             tko = UrlTokenObject()
             file_path = tko.generate(data={'Url': "ansjer/" + CommonService.RandomStr(6) + "/" + file_path})

+ 1 - 1
Model/models.py

@@ -490,7 +490,7 @@ class Equipment_Version(models.Model):
     lang = models.CharField(blank=True, default='en', max_length=32, verbose_name=u'ota包内置语言')
     mci = models.CharField(default='', blank=True, max_length=10, verbose_name='设备类型')
     img = models.TextField(blank=True, default='', verbose_name=u'图片路径')
-    min_ver = models.CharField(default='', max_length=16, verbose_name='最小版本号')
+    max_ver = models.CharField(default='', max_length=16, verbose_name='最大版本号')
 
     def __str__(self):
         return self.eid

+ 1 - 1
Service/TemplateService.py

@@ -66,7 +66,7 @@ class TemplateService:
             # 'notify/push',
             'equipment/flowUpdate',
             'wechat/authsign',
-            'user/initInfo',
+            # 'user/initInfo',
 
             'wechat/perfect',
             'oauth / perfect',