优化电量算法

Author: Lloyd0577

README.md

@@ -1,4 +1,4 @@
-# Biomodule 蓝牙SDK  [![Download](https://api.bintray.com/packages/hzentertech/maven/biomoduleble/images/download.svg?version=1.0.7)](https://bintray.com/hzentertech/maven/biomoduleble/1.0.7/link)
+# Biomodule 蓝牙SDK  [![Download](https://api.bintray.com/packages/hzentertech/maven/biomoduleble/images/download.svg?version=1.0.8)](https://bintray.com/hzentertech/maven/biomoduleble/1.0.8/link)
 # 简介
 
 本 SDK 包含回车生物电采集模块的蓝牙连接和生物电采集控制。通过此 SDK 可以在 Android app 里快速实现和我们的采集模块连接，并控制其进行数据的采集和停止等指令。
@@ -25,7 +25,7 @@ SDK中Demo与API接口采用Kotlin语言编写，希望你对Kotlin有一定的
 ### gradle自动依赖
 在所需的module中的build.gradle文件下添加以下依赖即可：
 ```groovy
-implementation 'cn.entertech:biomoduleble:1.0.7'
+implementation 'cn.entertech:biomoduleble:1.0.8'
 ```
 ### jar包集成
 如果你在自动依赖遇到问题也可以手动添加依赖
@@ -34,7 +34,7 @@ implementation 'cn.entertech:biomoduleble:1.0.7'
 
 ```groovy
 implementation fileTree(include: ['*.jar'], dir: 'libs')
-implementation files('libs/enter-biomodule-ble-v1.0.7.jar')
+implementation files('libs/enter-biomodule-ble-v1.0.8.jar')
 ```
 ### 注意事项
 

app/libs/enter-biomodule-ble-v1.0.7.jar renamed to app/libs/enter-biomodule-ble-v1.0.8.jar

@@ -51,7 +51,7 @@ publish {
     //项目名称
     artifactId = 'biomoduleble'
     //版本号
-    publishVersion = '1.0.7'
+    publishVersion = '1.0.8'
     //描述，不重要
     desc = ''
     //网站，不重要

ble/build.gradle

@@ -1,6 +1,9 @@
 package cn.entertech.ble.util
 
-import com.orhanobut.logger.Logger
+import kotlin.math.exp
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.pow
 
 /**
  * Created by EnterTech on 2018/2/8.
@@ -9,18 +12,29 @@ object BatteryUtil {
 
     fun getMinutesLeft(byte: Byte): NapBattery {
         ((byte / 100.0) * (4.1 - 3.1) + 3.1).let {
-            val minutes = -12050 * Math.pow(it, 4.0) + 137175 * Math.pow(it, 3.0) - 517145 * Math.pow(it, 2.0) + 644850 * it + 5034
-//            val minutes = 229607.31 * Math.pow(it, 4.0)  - 3581456.13 * Math.pow(it, 3.0) + 20922054.15 * Math.pow(it, 2.0) - 54241619.24* it + 52651001.51
-            val percent = (minutes * 100 / (81 * 60)).toInt()
+            var a1 = 99.84
+            var b1 = 4.244
+            var c1 = 0.3781
+            var a2 = 21.38
+            var b2 = 3.953
+            var c2 = 0.1685
+            var a3 = 15.21
+            var b3 = 3.813
+            var c3 = 0.09208
+            var q1 = a1 * exp(-((it - b1) / c1).pow(2.0))
+            var q2 = a2 * exp(-((it - b2) / c2).pow(2.0))
+            var q3 = a3 * exp(-((it - b3) / c3).pow(2.0))
+            var percent = (q1 + q2 + q3).toInt()
+            percent = max(min(percent, 100), 0)
+            var minutes = 4.52 * percent
             val hours = (minutes / 60).toInt()
             val minutesLast = (minutes % 60).toInt()
-
             return NapBattery(hours, minutesLast, percent)
         }
     }
 }
 
-data class NapBattery(val hours: Int, val minutes: Int, val percent: Int){
+data class NapBattery(val hours: Int, val minutes: Int, val percent: Int) {
     override fun toString(): String {
         return "NapBattery(hours=$hours, minutes=$minutes, percent=$percent)"
     }