diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..1680434 Binary files /dev/null and b/.DS_Store differ diff --git a/mi-scale/.DS_Store b/mi-scale/.DS_Store new file mode 100644 index 0000000..d443f87 Binary files /dev/null and b/mi-scale/.DS_Store differ diff --git a/mi-scale/src/Xiaomi_Scale.py b/mi-scale/src/Xiaomi_Scale.py index 58cf233..45d268e 100644 --- a/mi-scale/src/Xiaomi_Scale.py +++ b/mi-scale/src/Xiaomi_Scale.py @@ -274,23 +274,23 @@ class ScanProcessor(): lib = Xiaomi_Scale_Body_Metrics.bodyMetrics(calcweight, height, age, sex, 0) message = '{' - message += '"weight":' + "{:.2f}".format(weight) - message += ',"weight_unit":"' + str(unit) + '"' - message += ',"bmi":' + "{:.2f}".format(lib.getBMI()) - message += ',"basal_metabolism":' + "{:.2f}".format(lib.getBMR()) - message += ',"visceral_fat":' + "{:.2f}".format(lib.getVisceralFat()) + message += '"重量":' + "{:.2f}".format(weight) + message += ',"重量单位":"' + str(unit) + '"' + message += ',"BMI身体质量指数":' + "{:.2f}".format(lib.getBMI()) + message += ',"基本代谢":' + "{:.2f}".format(lib.getBMR()) + message += ',"内脏脂肪":' + "{:.2f}".format(lib.getVisceralFat()) if hasImpedance: lib = Xiaomi_Scale_Body_Metrics.bodyMetrics(calcweight, height, age, sex, int(miimpedance)) bodyscale = ['Obese', 'Overweight', 'Thick-set', 'Lack-exerscise', 'Balanced', 'Balanced-muscular', 'Skinny', 'Balanced-skinny', 'Skinny-muscular'] - message += ',"lean_body_mass":' + "{:.2f}".format(lib.getLBMCoefficient()) - message += ',"body_fat":' + "{:.2f}".format(lib.getFatPercentage()) - message += ',"water":' + "{:.2f}".format(lib.getWaterPercentage()) - message += ',"bone_mass":' + "{:.2f}".format(lib.getBoneMass()) - message += ',"muscle_mass":' + "{:.2f}".format(lib.getMuscleMass()) - message += ',"protein":' + "{:.2f}".format(lib.getProteinPercentage()) - message += ',"body_type":"' + str(bodyscale[lib.getBodyType()]) + '"' - message += ',"metabolic_age":' + "{:.0f}".format(lib.getMetabolicAge()) + message += ',"去脂体重":' + "{:.2f}".format(lib.getLBMCoefficient()) + message += ',"体脂":' + "{:.2f}".format(lib.getFatPercentage()) + message += ',"水分":' + "{:.2f}".format(lib.getWaterPercentage()) + message += ',"骨量":' + "{:.2f}".format(lib.getBoneMass()) + message += ',"肌肉量":' + "{:.2f}".format(lib.getMuscleMass()) + message += ',"蛋白质":' + "{:.2f}".format(lib.getProteinPercentage()) + message += ',"身体类型":"' + str(bodyscale[lib.getBodyType()]) + '"' + message += ',"代谢年龄":' + "{:.0f}".format(lib.getMetabolicAge()) message += ',"timestamp":"' + mitdatetime + '"' message += '}'