Pārlūkot izejas kodu

update code

master
陈福行 pirms 11 mēnešiem
vecāks
revīzija
d0d6151596

+ 3
- 3
app/build.gradle Parādīt failu

@@ -7,8 +7,8 @@ android {
applicationId "aicare.net.cn.sdk.iweightdemo"
minSdkVersion 18
targetSdkVersion 29
versionCode 18
versionName "1.3.8"
versionCode 19
versionName "1.5.1"
}
buildTypes {
debug {
@@ -48,6 +48,6 @@ dependencies {
implementation 'com.google.android.material:material:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
testImplementation 'junit:junit:4.12'
implementation 'com.github.elinkthings:BodyFatScaleSDKRepositoryAndroid:1.3.9'
implementation 'com.github.elinkthings:BodyFatScaleSDKRepositoryAndroid:1.5.1'

}

+ 10
- 8
app/src/main/java/aicare/net/cn/iweightdemo/MyActivity.java Parādīt failu

@@ -1,5 +1,7 @@
package aicare.net.cn.iweightdemo;

import static aicare.net.cn.iweightdemo.R.string.weight;

import android.Manifest;
import android.app.AlertDialog;
import android.content.DialogInterface;
@@ -21,6 +23,12 @@ import android.widget.RadioGroup;
import android.widget.SeekBar;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.Toolbar;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.app.ActivityCompat;

import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.snackbar.Snackbar;

@@ -44,13 +52,7 @@ import aicare.net.cn.iweightlibrary.utils.AicareBleConfig;
import aicare.net.cn.iweightlibrary.utils.L;
import aicare.net.cn.iweightlibrary.utils.ParseData;
import aicare.net.cn.iweightlibrary.wby.WBYService;
import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.Toolbar;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.app.ActivityCompat;

import static aicare.net.cn.iweightdemo.R.string.weight;
import cn.net.aicare.algorithmutil.AlgorithmUtil;

/**
*
@@ -899,7 +901,7 @@ public class MyActivity extends BleProfileServiceReadyActivity implements Device
showInfo(algorithmStr, true);
if (user != null) {
cn.net.aicare.algorithmutil.BodyFatData bodyFatData = AicareBleConfig
.getBodyFatData(algorithmInfo.getAlgorithmId(), user.getSex(), user.getAge(), Double.parseDouble(ParseData.getKgWeight(algorithmInfo.getWeight(), algorithmInfo.getDecimalInfo())), user
.getBodyFatData(AlgorithmUtil.AlgorithmType.TYPE_AICARE, user.getSex(), user.getAge(), Double.parseDouble(ParseData.getKgWeight(algorithmInfo.getWeight(), algorithmInfo.getDecimalInfo())), user
.getHeight(), algorithmInfo.getAdc());
BodyFatData bodyFatData1 = new BodyFatData();
bodyFatData1.setAge(user.getAge());

+ 1
- 1
build.gradle Parādīt failu

@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.0'
classpath 'com.android.tools.build:gradle:7.1.3'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

+ 2
- 2
gradle/wrapper/gradle-wrapper.properties Parādīt failu

@@ -1,6 +1,6 @@
#Thu Jul 12 16:16:09 CST 2018
#Fri May 24 17:15:45 CST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

Notiek ielāde…
Atcelt
Saglabāt