From 0c709871f36218ec51a538814e635de37c75643f Mon Sep 17 00:00:00 2001
From: chika <983123963@qq.com>
Date: Sat, 31 Jul 2021 14:11:24 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(lockscreen):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=B7=9D=E7=A6=BB=E7=94=B5=E6=B1=A0=E5=85=85=E6=BB=A1=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Lockscreen/Lockscreen.vue | 4 +++-
 src/components/Lockscreen/Recharge.vue   | 6 +++++-
 src/hooks/useBattery.ts                  | 9 +++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/components/Lockscreen/Lockscreen.vue b/src/components/Lockscreen/Lockscreen.vue
index 900ad83..16a648d 100644
--- a/src/components/Lockscreen/Lockscreen.vue
+++ b/src/components/Lockscreen/Lockscreen.vue
@@ -21,6 +21,7 @@
         :battery="battery"
         :battery-status="batteryStatus"
         :calc-discharging-time="calcDischargingTime"
+        :calc-charging-time="calcChargingTime"
       />
 
       <div class="local-time">
@@ -114,7 +115,7 @@
       const router = useRouter();
       const route = useRoute();
 
-      const { battery, batteryStatus, calcDischargingTime } = useBattery();
+      const { battery, batteryStatus, calcDischargingTime, calcChargingTime } = useBattery();
       const userInfo: object = userStore.getUserInfo || {};
       const username = userInfo['username'] || '';
       const state = reactive({
@@ -176,6 +177,7 @@
         battery,
         batteryStatus,
         calcDischargingTime,
+        calcChargingTime,
         onLockLogin,
         onLogin,
         goLogin,
diff --git a/src/components/Lockscreen/Recharge.vue b/src/components/Lockscreen/Recharge.vue
index d36fbae..514dd36 100644
--- a/src/components/Lockscreen/Recharge.vue
+++ b/src/components/Lockscreen/Recharge.vue
@@ -13,7 +13,7 @@
         剩余可使用时间：{{ calcDischargingTime }}
       </div>
       <span v-show="Number.isFinite(battery.chargingTime) && battery.chargingTime != 0">
-        距离电池充满需要：{{ calcDischargingTime }}
+        距离电池充满需要：{{ calcChargingTime }}
       </span>
     </div>
   </div>
@@ -36,6 +36,10 @@
         type: String,
         default: '',
       },
+      calcChargingTime: {
+        type: String,
+        default: '',
+      },
       batteryStatus: {
         // 电池状态
         type: String,
diff --git a/src/hooks/useBattery.ts b/src/hooks/useBattery.ts
index 4b0ce45..1728a73 100644
--- a/src/hooks/useBattery.ts
+++ b/src/hooks/useBattery.ts
@@ -33,6 +33,14 @@ export const useBattery = () => {
     return `${~~hour}小时${~~minute}分钟`;
   });
 
+  // 计算电池充满剩余时间
+  const calcChargingTime = computed(() => {
+    console.log(state.battery);
+    const hour = state.battery.chargingTime / 3600;
+    const minute = (state.battery.chargingTime / 60) % 60;
+    return `${~~hour}小时${~~minute}分钟`;
+  });
+
   // 电池状态
   const batteryStatus = computed(() => {
     if (state.battery.charging && state.battery.level >= 100) {
@@ -80,5 +88,6 @@ export const useBattery = () => {
     ...toRefs(state),
     batteryStatus,
     calcDischargingTime,
+    calcChargingTime,
   };
 };

From 81a3e6d970c24cde895d3bbf97baec17b9059ec3 Mon Sep 17 00:00:00 2001
From: chika <983123963@qq.com>
Date: Sat, 31 Jul 2021 14:20:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix(lockscreen):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=94=B5=E6=B1=A0=E7=BB=84=E4=BB=B6=E5=9C=A8=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E8=BE=83=E5=B0=8F=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E4=BC=9A?=
 =?UTF-8?q?=E4=B8=8E=E6=97=B6=E9=97=B4=E9=87=8D=E5=8F=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Lockscreen/Recharge.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Lockscreen/Recharge.vue b/src/components/Lockscreen/Recharge.vue
index 514dd36..63913e9 100644
--- a/src/components/Lockscreen/Recharge.vue
+++ b/src/components/Lockscreen/Recharge.vue
@@ -55,7 +55,7 @@
     bottom: 20vh;
     left: 50vw;
     width: 300px;
-    height: 400px;
+    height: 500px;
     transform: translateX(-50%);
 
     .number {

From e602fc50c0f6e53feaf92264bde1219e0d6d5b2f Mon Sep 17 00:00:00 2001
From: chika <983123963@qq.com>
Date: Sat, 31 Jul 2021 14:25:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(lockscreen):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=94=B5=E9=87=8F=E6=98=BE=E7=A4=BA=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Lockscreen/Recharge.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Lockscreen/Recharge.vue b/src/components/Lockscreen/Recharge.vue
index 63913e9..b8f7f81 100644
--- a/src/components/Lockscreen/Recharge.vue
+++ b/src/components/Lockscreen/Recharge.vue
@@ -60,7 +60,7 @@
 
     .number {
       position: absolute;
-      top: 27%;
+      top: 20%;
       z-index: 10;
       width: 300px;
       font-size: 32px;