Эх сурвалжийг харах

是否支持恢复出厂设置

liuzhenxing1118 1 долоо хоног өмнө
parent
commit
fdaca74181

+ 2 - 1
artimenring-iOS/Artimenring/Classes/Model/SKModel.h

@@ -112,8 +112,9 @@
 @property(nonatomic, assign) NSInteger chatVoiceMax; //语音时长
 @property(nonatomic, assign) NSInteger chatVoiceFormat; //语音格式 0:amr, 1:mp3, 2:ogg
 @property(nonatomic, assign) NSInteger historyPathMax; //历史轨迹显示天数
-- (BOOL)isAblum;
+- (BOOL)isAblum; //是否支持移动云相册
 + (BOOL)isAblumWithModel:(NSString*)model;
+- (BOOL)isReset; //是否支持恢复出厂设置
 - (BOOL)isLockApp;
 - (BOOL)isWeather;
 - (NSInteger)getChatVoiceFormat;

+ 3 - 0
artimenring-iOS/Artimenring/Classes/Model/SKModel.m

@@ -243,6 +243,9 @@
 + (BOOL)isAblumWithModel:(NSString*)model {
     return [model.uppercaseString isEqualToString:SK_MODEL_N8_CMCC];
 }
+- (BOOL)isReset {
+    return [self.model containsString:SK_MODEL_N8_CMCC];
+}
 - (BOOL)isLockApp {
     return [self.model containsString:SK_MODEL_N8] || [self.model isEqualToString:SK_MODEL_W301H];
 }

+ 8 - 6
artimenring-iOS/Artimenring/Classes/ViewController/WFunction/OnOff/SKOnOffSettingViewController.m

@@ -51,14 +51,16 @@ enum ENUM_TIME_TYPE
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    if (section == 1)
-        return 3;
-    else if (section == 2)
+    if (section == 1) {
+        SKDeviceModel* model = [[SKDataManager shared] getSelectDevice];
+        return [model.match isReset] ? 3 : 2;
+    } else if (section == 2) {
         return 1;
-    else if (section == 3)
+    } else if (section == 3) {
         return 2;
-    
-    return 0;
+    } else {
+        return 0;
+    }
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {