From 2c7bae44a0bfedcb549eae0748bc7e670a35c982 Mon Sep 17 00:00:00 2001
From: szdot <szdot@qq.com>
Date: Thu, 25 Jul 2024 00:32:23 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afeat=20=E8=AE=BE=E7=BD=AE=E9=A3=9E=E6=9C=BA=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=BB=84=E4=BB=B6=20ui=20=E3=80=90=E5=8E=9F=20=20?=
 =?UTF-8?q?=E5=9B=A0=E3=80=91=EF=BC=9A=20=E3=80=90=E8=BF=87=20=20=E7=A8=8B?=
 =?UTF-8?q?=E3=80=91=EF=BC=9A=20=E3=80=90=E5=BD=B1=20=20=E5=93=8D=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PlaneStatus.vue | 73 +++++++++++++++++++++++++++++-----
 src/styles/myIcon.scss         |  2 +-
 2 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/src/components/PlaneStatus.vue b/src/components/PlaneStatus.vue
index 2038559..b2770f8 100644
--- a/src/components/PlaneStatus.vue
+++ b/src/components/PlaneStatus.vue
@@ -1,14 +1,53 @@
 <template>
-  <div class="mainBox flex column ofh">
+  <div class="mainBox flex ofh column no-select">
     <!-- 心跳 -->
-    <div class="tag flex mac mc">
-      <div :class="online ? heartAnimation ? 'icon-heart online' : 'icon-heart1 online' : 'icon-xinsui offline'"
-        class="iconfont f-s-24"></div>
+    <div class="flex">
+      <div class="tag flex mac mc iconfont"
+        :class="online ? heartAnimation ? 'icon-heart online' : 'icon-heart1 online' : 'icon-xinsui offline'">
+      </div>
+    </div>
+    <!-- 锁定状态 -->
+    <div class="flex">
+      <div class="tag flex mac mc iconfont" :class="isLockState ? 'icon-suoding' : 'icon-jiesuo'">
+      </div>
+    </div>
+    <!-- 飞机模式 -->
+    <div class="flex">
+      <div class="tag flex mac mc iconfont icon-moshixuanze">
+      </div>
     </div>
     <!-- 卫星 -->
-    <div class="tag flex mac">
-      <div class="iconfont icon-weixing f-s-24"></div>
-      <div>{{ satCount }}颗</div>
+    <div class="flex">
+      <div class="tag flex mac mc iconfont icon-weixing">
+      </div>
+      <!-- <div class=" tag flex mac mc f-s-16">
+        {{ satCount }}颗
+      </div> -->
+    </div>
+    <!-- 电池电压 -->
+    <div class="flex">
+      <div class="tag flex mac mc iconfont icon-dianya1">
+      </div>
+    </div>
+    <!-- 电池电流 -->
+    <div class="flex">
+      <div class="tag flex mac mc iconfont icon-dianliu">
+      </div>
+    </div>
+    <!-- 飞机高度 -->
+    <div class="flex">
+      <div class="tag flex mac mc iconfont icon-gaodu">
+      </div>
+    </div>
+    <!-- 飞机对地速度 -->
+    <div class="flex">
+      <div class="tag flex mac mc iconfont icon-sudu">
+      </div>
+    </div>
+    <!-- 钩子状态 1px solid #ddd-->
+    <div class="flex">
+      <div class="tag flex mac mc iconfont icon-mianxingdiaogou">
+      </div>
     </div>
   </div>
 
@@ -40,7 +79,16 @@ export default {
       if (this.plane && this.plane.planeState) {
         return this.plane.planeState.heartRandom
       }
-      return 0
+      return null
+    },
+    // 锁定状态
+    isLockState () {
+      if (this.plane && this.plane.planeState) {
+        if (Number(this.plane.planeState.heartBeat) & 128) {
+          return false
+        }
+      }
+      return true
     },
     // 卫星数
     satCount () {
@@ -84,18 +132,21 @@ export default {
   top: 12px;
   left: 12px;
   z-index: 90;
-  background-color: white;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, .3);
   border-radius: 4px;
 }
 
+.mainBox .flex:not(:first-child) {
+  border-top: 1px solid #ddd;
+}
+
 .tag {
   height: 29px;
   min-width: 29px;
   background-color: white;
-  border-radius: 4px;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
   cursor: pointer;
   border: 0;
   overflow: hidden;
+  font-size: 22px;
 }
 </style>
diff --git a/src/styles/myIcon.scss b/src/styles/myIcon.scss
index cace451..4326ae2 100644
--- a/src/styles/myIcon.scss
+++ b/src/styles/myIcon.scss
@@ -1 +1 @@
-@import 'https://at.alicdn.com/t/c/font_3703467_om4sfs0bw5s.css'; //iconfont阿里巴巴
\ No newline at end of file
+@import 'https://at.alicdn.com/t/c/font_3703467_msxbfmdznja.css'; //iconfont阿里巴巴
\ No newline at end of file