liuzhenxing1118 2 жил өмнө
parent
commit
18a11f142b

+ 1 - 1
ChineseMedicine/ChineseMedicineSDK/Controller/DetectionViewController.m

@@ -279,7 +279,7 @@
         @"weight" : @(userModel.weight),
         @"age" : @(userModel.age),
         @"sampleRate" : @(200),
-        @"part" : @(12), //默认12 12:左手手腕 13:右手手腕
+        @"part" : @(userModel.part), //默认12 12:左手手腕 13:右手手腕
         @"posture" : @(2), //默认2 2:坐姿 3:站姿 4:躺姿
         @"spo" : _mSpoValue > -1 ? @(_mSpoValue) : @([TestDataManager getSpo]),
         @"data" : datas,

+ 3 - 4
ChineseMedicine/ChineseMedicineSDK/Manager/ChineseMedicineManager.m

@@ -172,8 +172,7 @@
     self.mUserModel.weight = (weight != nil && ![weight isEqualToString:@""]) ? [weight integerValue] : 70;
     
     //gender
-    bool isWoman = [gender isEqualToString:@"F"] || [gender isEqualToString:@"1"] || [gender isEqualToString:SK_NSLOCALIZED_STRING(@"user_girl", nil)];
-    self.mUserModel.gender = isWoman ? 3 : 2;
+    self.mUserModel.gender = [gender integerValue];
     
     //age
     NSInteger curYear = [SKUtils getDateYear:[NSDate date]];
@@ -197,12 +196,12 @@
     
     self.mUserModel.height = 170;
     self.mUserModel.weight = 70;
-    self.mUserModel.gender = 3;
+    self.mUserModel.gender = 2;
     self.mUserModel.age = 50;
     
     self.mUserModel.mac = [TestDataManager getMacAddress];
     
-    self.mUserModel.part = @"左手";
+    self.mUserModel.part = @"12";
     self.mUserModel.deviceName = DEVICE_MODEL;
 #endif
 }

+ 1 - 1
ChineseMedicine/ChineseMedicineSDK/Model/UserModel.h

@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, strong) NSString* account;
 @property(nonatomic, strong) NSString* userId;
 @property(nonatomic, strong) NSString* deviceName;
-@property(nonatomic, assign) NSInteger gender;
+@property(nonatomic, assign) NSInteger gender; //2:男 3:女
 @property(nonatomic, assign) NSInteger height;
 @property(nonatomic, assign) NSInteger weight;
 @property(nonatomic, assign) NSInteger part; //默认12 12:左手手腕 13:右手手腕