|
|
@@ -18,7 +18,7 @@ import android.view.KeyEvent
|
|
|
import android.view.View
|
|
|
import android.view.WindowManager
|
|
|
import android.view.animation.Animation
|
|
|
-import android.view.animation.TranslateAnimation
|
|
|
+import android.view.animation.ScaleAnimation
|
|
|
import android.widget.*
|
|
|
import androidx.appcompat.app.AlertDialog
|
|
|
import androidx.appcompat.app.AppCompatActivity
|
|
|
@@ -84,43 +84,26 @@ class MainActivity : AppCompatActivity(), ScannerFragment.OnDeviceSelectedListen
|
|
|
|
|
|
// 绘制心律图
|
|
|
ChartView()
|
|
|
-// 心跳动画
|
|
|
- heartAnimate()
|
|
|
|
|
|
+ // 心跳动画根据心跳数进行加载 todo 获取心率数据后跑不动
|
|
|
+ heartAnimate()
|
|
|
}
|
|
|
|
|
|
- fun heartAnimate(){
|
|
|
+ fun heartAnimate() {
|
|
|
val mIdIvFace = findViewById<ImageView>(R.id.heart)
|
|
|
-
|
|
|
-
|
|
|
- // 设置移动效果
|
|
|
- /**
|
|
|
- *
|
|
|
- * float fromXDelta 动画开始的点离当前View X坐标上的差值
|
|
|
- * float toXDelta 动画结束的点离当前View X坐标上的差值
|
|
|
- * float fromYDelta 动画开始的点离当前View Y坐标上的差值
|
|
|
- * float toYDelta 动画开始的点离当前View Y坐标上的差值
|
|
|
- */
|
|
|
-
|
|
|
-
|
|
|
- // 设置移动效果
|
|
|
- /**
|
|
|
- *
|
|
|
- * float fromXDelta 动画开始的点离当前View X坐标上的差值
|
|
|
- * float toXDelta 动画结束的点离当前View X坐标上的差值
|
|
|
- * float fromYDelta 动画开始的点离当前View Y坐标上的差值
|
|
|
- * float toYDelta 动画开始的点离当前View Y坐标上的差值
|
|
|
- */
|
|
|
- val translateAnimation: Animation = TranslateAnimation(0F, 20F, 0F, 20F)
|
|
|
- // 设置动画持续时间
|
|
|
+ val scaleAnimation = ScaleAnimation(
|
|
|
+ 0.6f, 1f, 0.6f, 1f,
|
|
|
+ Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f
|
|
|
+ )
|
|
|
// 设置动画持续时间
|
|
|
- translateAnimation.duration = 30000
|
|
|
- // 为ImageView设置动画效果
|
|
|
+ scaleAnimation.duration = 1000
|
|
|
+
|
|
|
// 为ImageView设置动画效果
|
|
|
- mIdIvFace.setAnimation(translateAnimation)
|
|
|
+ mIdIvFace.setAnimation(scaleAnimation)
|
|
|
// 启动动画
|
|
|
- // 启动动画
|
|
|
- translateAnimation.startNow()
|
|
|
+// scaleAnimation.startNow()
|
|
|
+ scaleAnimation.repeatCount = Animation.INFINITE
|
|
|
+ scaleAnimation.start()
|
|
|
}
|
|
|
|
|
|
fun setStatusBarColor(colorType: String) {
|
|
|
@@ -141,12 +124,23 @@ class MainActivity : AppCompatActivity(), ScannerFragment.OnDeviceSelectedListen
|
|
|
private fun linkHeartBand() {
|
|
|
val chainBtn = findViewById<Button>(R.id.chainBtn)
|
|
|
chainBtn.setOnClickListener {
|
|
|
- val dialog = ScannerFragment.getInstance()
|
|
|
- if (dialog == null) {
|
|
|
- println("1122")
|
|
|
+
|
|
|
+ if (isBLEEnabled()) {
|
|
|
+ if (!mDeviceConnected) {
|
|
|
+ showDeviceScanningDialog()
|
|
|
+ } else {
|
|
|
+ mManager!!.disConnect()
|
|
|
+ }
|
|
|
} else {
|
|
|
- dialog.show(supportFragmentManager, "scan_fragment")
|
|
|
+ showBLEDialog()
|
|
|
}
|
|
|
+
|
|
|
+// val dialog = ScannerFragment.getInstance()
|
|
|
+// if (dialog == null) {
|
|
|
+// println("1122")
|
|
|
+// } else {
|
|
|
+// dialog.show(supportFragmentManager, "scan_fragment")
|
|
|
+// }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -412,9 +406,10 @@ class MainActivity : AppCompatActivity(), ScannerFragment.OnDeviceSelectedListen
|
|
|
if (rrIntervals != null) {
|
|
|
findViewById<TextView>(R.id.rrIntervals).text = rrIntervals.toString()
|
|
|
}
|
|
|
-// 把心跳数塞进去
|
|
|
+
|
|
|
+// 把心跳数塞进心跳图里
|
|
|
val aaChartView = findViewById<AAChartView>(R.id.aa_chart_view)
|
|
|
- if(HeartLine.size > 10){
|
|
|
+ if (HeartLine.size > 10) {
|
|
|
HeartLine.remove(0)
|
|
|
}
|
|
|
HeartLine.add(heartRate)
|
|
|
@@ -432,7 +427,6 @@ class MainActivity : AppCompatActivity(), ScannerFragment.OnDeviceSelectedListen
|
|
|
// val arrayList = ArrayList<Int>()
|
|
|
|
|
|
|
|
|
-
|
|
|
// 运动强度
|
|
|
// 男:((-55.0969 +(0.6309×HR)+(0.1988 xW)+(0.2017×A))/ 4.184)×60 xT
|
|
|
// 女:((-20.4022 +(0.4472×HR) - (0.1263 xW)+(0.074×A))/ 4.184)×60 xT
|
|
|
@@ -464,6 +458,7 @@ class MainActivity : AppCompatActivity(), ScannerFragment.OnDeviceSelectedListen
|
|
|
findViewById<Button>(R.id.chainBtn).setVisibility(View.GONE); // 隐藏
|
|
|
findViewById<TextView>(R.id.unchain).text = "心率带已连接"
|
|
|
findViewById<TextView>(R.id.unchain).setTextColor(Color.parseColor("#AACC03"))
|
|
|
+
|
|
|
}
|
|
|
|
|
|
// 开始运动
|