Merge remote-tracking branch 'remotes/origin/Bin' into dev

Controller/EquipmentManagerV3.py

@@ -136,13 +136,15 @@ class EquipmentManagerV3(View):
         if userID is None:
             return response.json(309)
         try:
-            deviceData = json.loads(deviceContent)
+            # deviceData = json.loads(deviceContent)
+            deviceData = eval(deviceContent)
             # print(deviceData['View_Password'])
             if deviceData.__contains__('View_Password'):
                 deviceData['View_Password'] = self.decode_pwd(deviceData['View_Password'])
             dev_info_qs = Device_Info.objects.filter(userID_id=userID, id=id)
             dev_info_qs.update(**deviceData)
         except Exception as e:
+            print(e)
             return response.json(177, repr(e))
         else:
             qs = Device_Info.objects.filter(userID_id=userID, id=id)