update；

Config/common_config.py

@@ -12,6 +12,8 @@ if is_prod:
 else:
 else:
     ONENET_CONFIG['api_key'] = "H9x=yfGVGPPPBZxzyaaGhbaJ6kM="
     ONENET_CONFIG['api_key'] = "H9x=yfGVGPPPBZxzyaaGhbaJ6kM="
 
 
+LIUYUAN_CONFIG = "DS1=GyIEzsNvpET8HOTcYPuZlak=="
+
 MINA_APP = {
 MINA_APP = {
     "app_id": "wx3185fb4a3633beb0",
     "app_id": "wx3185fb4a3633beb0",
     "app_key": "d0fee84366bfb19c95505f4ddfa47b63",
     "app_key": "d0fee84366bfb19c95505f4ddfa47b63",

Libs/Onenet/OneNetApi.py

@@ -5,7 +5,7 @@ import urllib.parse
 
 
 import requests
 import requests
 
 
-from Config.common_config import ONENET_CONFIG as config
+from Config.common_config import ONENET_CONFIG as config, LIUYUAN_CONFIG
 
 
 
 
 class OneNetApi(object):
 class OneNetApi(object):
@@ -37,6 +37,9 @@ class OneNetApi(object):
     def get_cur_api_key(self):
     def get_cur_api_key(self):
         return config["api_key"]
         return config["api_key"]
 
 
+    def get_liuyuan_api_key(self):
+        return LIUYUAN_CONFIG
+
     def device(self, id):
     def device(self, id):
         if not id:
         if not id:
             return False
             return False
@@ -285,6 +288,10 @@ class OneNetApi(object):
 
 
         api = "/cmds?device_id={device_id}&qos={qos}&timeout={timeout}".format(device_id=device_id, qos=qos,
         api = "/cmds?device_id={device_id}&qos={qos}&timeout={timeout}".format(device_id=device_id, qos=qos,
                                                                                timeout=timeout)
                                                                                timeout=timeout)
+
+        if device_id in ['83803512', '83803513', '83803514', '83803515']:
+            return self._call_liuyuan(api, "POST", sms)
+
         return self._call(api, "POST", sms)
         return self._call(api, "POST", sms)
 
 
     def send_data_to_mqtt(self, topic, sms):
     def send_data_to_mqtt(self, topic, sms):
@@ -345,6 +352,48 @@ class OneNetApi(object):
         else:
         else:
             return {}
             return {}
 
 
+    def _call_liuyuan(self, url, method="GET", data=None, heasers=None):
+        result = self._rawcall_liuyuan(url, method, data, heasers)
+        if not result:
+            return False
+
+        return result
+
+    def _rawcall_liuyuan(self, url, method, data=None, heasers=None):
+        url = self._paddingUrl(url)
+
+        self._error_no = 0
+        self._error = None
+
+        if not url:
+            self._http_code = 500
+            return False
+
+        if method not in self._ALLOW_METHODS:
+            self._http_code = 500
+            return False
+
+        if heasers:
+            heasers = heasers
+
+        kwargs = {"headers": {"api-key": self.get_liuyuan_api_key()}}
+        if data:
+            if isinstance(data, list) or isinstance(data, dict):
+                data = json.dumps(data).encode('utf-8')
+            kwargs["data"] = data
+        if heasers:
+            kwargs["headers"].update(heasers)
+
+        result = requests.request(method, url, **kwargs)
+        print(result.text)
+
+        if result:
+            self._http_code = result.status_code
+            result = json.loads(result.text)
+            return result
+        else:
+            return {}
+
     def _paddingUrl(self, url):
     def _paddingUrl(self, url):
         if not url:
         if not url:
             return url
             return url