From 69b898944c14062c21ddaf05f3d0d937d38f4cd7 Mon Sep 17 00:00:00 2001
From: lijunjie <jiee17@163.com>
Date: Wed, 28 Sep 2022 18:18:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/IndexController.php | 16 ++++++++++------
 public/script/http/index.js              | 12 ------------
 resources/views/http/lora2.blade.php     |  4 ----
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php
index 0e8a936..fba2f43 100644
--- a/app/Http/Controllers/IndexController.php
+++ b/app/Http/Controllers/IndexController.php
@@ -175,6 +175,8 @@ class IndexController extends BaseController
     {
 //        echo Cache::get('blood');
 
+        //00F10D59006F0061
+
         $request_data = request()->all();
 
         $lora_mac = config("custom.lora_mac");
@@ -191,21 +193,20 @@ class IndexController extends BaseController
         $blood1 = hexdec(substr($blood, 0, 2));
         $blood2 = substr($blood, 2, 2);
         $blood2 = CommonService::customHex2dec($blood2);
+
         Cache::put('blood' . $request_data['node'], ($blood1 + $blood2) * 100);
 
         //体温36.1
         $temperature = substr($request_data['data'], 4, 4);
-        $temperature1 = hexdec(substr($temperature, 0, 2));
-        $temperature2 = substr($temperature, 2, 2);
-        $temperature2 = CommonService::customHex2dec($temperature2);
-        Cache::put('temperature' . $request_data['node'], $temperature1 + $temperature2);
+        $temperature = hexdec($temperature) / 100;
+        Cache::put('temperature' . $request_data['node'], $temperature);
         //心跳70
         $heart = substr($request_data['data'], 8, 4);
-        $heart = hexdec(substr($heart, 0, 2));
+        $heart = hexdec($heart);
         Cache::put('heart' . $request_data['node'], $heart);
         //脉搏70
         $heart2 = substr($request_data['data'], 12, 4);
-        $heart2 = hexdec(substr($heart2, 0, 2));
+        $heart2 = hexdec($heart2);
         Cache::put('heart2' . $request_data['node'], $heart2);
 
         return 'ok';
@@ -267,6 +268,9 @@ class IndexController extends BaseController
 
     public function loraData2()
     {
+
+        //00F10D59006F0061
+
         $time = (int)(time() . '000');
 
         $request_data = request()->all();
diff --git a/public/script/http/index.js b/public/script/http/index.js
index f4d4227..39a0257 100644
--- a/public/script/http/index.js
+++ b/public/script/http/index.js
@@ -162,18 +162,6 @@ function pressure(dom, item) {
             realtime: false,
             inRange: {
                 color: [
-                    // '#313695',
-                    // '#4575b4',
-                    // '#74add1',
-                    // '#abd9e9',
-                    // '#e0f3f8',
-                    // '#ffffbf',
-                    // '#fee090',
-                    // '#fdae61',
-                    // '#f46d43',
-                    // '#d73027',
-                    // '#a50026'
-
                     '#ffffdc',
                     '#ffffbf',
                     '#ffff71',
diff --git a/resources/views/http/lora2.blade.php b/resources/views/http/lora2.blade.php
index b723b66..6f8f439 100644
--- a/resources/views/http/lora2.blade.php
+++ b/resources/views/http/lora2.blade.php
@@ -161,10 +161,6 @@
 
         </div>
 
-
-
-
-
     </div>
 
 </div>