Quellcode durchsuchen

feature: 对设备电量格数做兼容处理,添加电量格数注解

Damon vor 7 Monaten
Ursprung
Commit
2c77d17f05
2 geänderte Dateien mit 23 neuen und 10 gelöschten Zeilen
  1. 2 0
      pages/index/index.js
  2. 21 10
      utils/lexin/message.js

+ 2 - 0
pages/index/index.js

@@ -306,6 +306,7 @@ Page({
           ///获取电量
           else if (payloadType === "battery" && other) {
             if (other.battery) {
+              console.log("获取电量数值===00===" + other.battery);
               var battery = lexin_message.getBattery(other.battery);
               that.setData({
                 battery: battery,
@@ -831,6 +832,7 @@ Page({
     that.getchannelData(other.ProdModel);
     // 电量
     if (other.Power) {
+      console.log("获取电量数值===11===" + other.Power);
       var battery = lexin_message.getBattery(other.Power);
       that.setData({
         battery: battery,

+ 21 - 10
utils/lexin/message.js

@@ -107,17 +107,28 @@ function getDeviceInfo(payloads) {
 ///获取电量
 function getBattery(battery) {
   var b = 0;
+  ///0格 10
   if (battery < 20) {
-    _babttery = 0
-  } else if (20 <= battery && battery < 40) {
-    b = 1
-  } else if (40 <= battery && battery < 60) {
-    b = 2
-  } else if (60 <= battery && battery < 80) {
-    b = 3
-  } else if (80 <= battery && battery <= 100) {
-    b = 4
-  } else if (battery > 100) {
+    b = 0;
+  }
+  ///1格 20、30
+  else if (20 <= battery && battery < 40) {
+    b = 1;
+  }
+  ///2格 40、50
+  else if (40 <= battery && battery < 60) {
+    b = 2;
+  }
+  ///3格 60、70
+  else if (60 <= battery && battery < 80) {
+    b = 3;
+  }
+  ///满格 4格 80、90
+  else if (80 <= battery && battery <= 100) {
+    b = 4;
+  }
+  /// 充电中
+  else if (battery > 100) {
     b = 5
   };
   return b;