no message

zhangxiaowen
1 parent 0661acba
Showing 18 changed files with 511 additions and 105 deletions
CNLiveSettingModule/Classes/Controller/CNLiveSettingController.m
CNLiveSettingModule/Classes/Model/CNLiveSettingRequest.h
CNLiveSettingModule/Classes/Model/CNLiveSettingRequest.m
CNLiveSettingModule/Classes/Model/CNLiveUserDefaultsModel.h
CNLiveSettingModule/Classes/Model/CNLiveUserDefaultsModel.m
CNLiveSettingModule/Classes/Model/NSUserDefaultsModel.h
CNLiveSettingModule/Classes/Model/NSUserDefaultsModel.m
CNLiveSettingModule/Classes/Privacy/CNLivePrivacyTableViewCell.h → CNLiveSettingModule/Classes/Privacy/CNLivePrivacyCell.h
CNLiveSettingModule/Classes/Privacy/CNLivePrivacyTableViewCell.m → CNLiveSettingModule/Classes/Privacy/CNLivePrivacyCell.m
CNLiveSettingModule/Classes/Privacy/CNLivePrivacyContactTableViewCell.h → CNLiveSettingModule/Classes/Privacy/CNLivePrivacyContactCell.h
CNLiveSettingModule/Classes/Privacy/CNLivePrivacyContactTableViewCell.m → CNLiveSettingModule/Classes/Privacy/CNLivePrivacyContactCell.m
CNLiveSettingModule/Classes/Privacy/CNLivePrivacyController.m
CNLiveSettingModule/Classes/Privacy/CNLivePrivacyModel.h
CNLiveSettingModule/Classes/Privacy/CNLivePrivacyRequest.h
CNLiveSettingModule/Classes/Privacy/CNLivePrivacyRequest.m
CNLiveSettingModule/Classes/View/CNLiveSettingCell.m
Example/CNLiveSettingModule.xcodeproj/project.pbxproj
Example/CNLiveSettingModule/CNLIVEAppDelegate.m
@@ -145,6 +145,8 @@ static const NSInteger timeValue = 1.5;
     [super viewWillAppear:animated];
     self.navigationController.navigationBarHidden = YES;
     [self.tableView reloadData];
+    self.logout.titleLabel.font = UIFontBoldCNMake(17.0);
+
 }
 - (void)viewDidLoad {
+//
+//  CNLiveSettingRequest.h
+//  CNLiveSettingModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright © 2019 153993236@qq.com. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveSettingRequest : NSObject
+
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveSettingRequest.m
+//  CNLiveSettingModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright © 2019 153993236@qq.com. All rights reserved.
+//
+
+#import "CNLiveSettingRequest.h"
+
+@implementation CNLiveSettingRequest
+
+
+@end
+//
+//  CNLiveUserDefaultsModel.h
+//  CNLiveSettingModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright © 2019 153993236@qq.com. All rights reserved.
+//
+
+#import "NSUserDefaultsModel.h"
+
+#define UserDefaultsModel [CNLiveUserDefaultsModel userDefaultsModel]
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveUserDefaultsModel : NSUserDefaultsModel
+
+//@property (nonatomic, copy) NSString *name;
+//@property (nonatomic, assign) NSInteger gender;
+//@property (nonatomic, assign) long age;
+//@property (nonatomic, assign) float floatNumber;
+//@property (nonatomic, assign) double doubleNumber;
+
+
+// 允许陌生人查看生活圈
+@property (nonatomic, copy) NSString *findStrangerSwitch;
+
+// 金币音量开关
+@property (nonatomic, assign) BOOL goldCoinSound;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+//
+//  CNLiveUserDefaultsModel.m
+//  CNLiveSettingModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright © 2019 153993236@qq.com. All rights reserved.
+//
+
+#import "CNLiveUserDefaultsModel.h"
+
+@implementation CNLiveUserDefaultsModel
+
+//@dynamic name;
+//@dynamic gender;
+//@dynamic age;
+//@dynamic floatNumber;
+//@dynamic doubleNumber;
+
+@dynamic goldCoinSound;
+@dynamic findStrangerSwitch;
+
+#pragma mark - Init
+
+- (NSDictionary *)setupDefaultValues {
+    return @{
+//        @"name": @"lc",
+//        @"gender": @1,
+//        @"age": @20,
+//        @"floatNumber": @11.1,
+//        @"doubleNumber": @22.2,
+        @"goldCoinSound": @YES,
+        @"findStrangerSwitch": @"access"
+    };
+}
+
+@end
+//
+//  NSUserDefaultsModel.h
+//  CNLiveSettingModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright © 2019 153993236@qq.com. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSUserDefaultsModel : NSObject
+
+// Value types
+typedef NS_ENUM(NSInteger, NSUserDefaultsValueType) {
+    NSUserDefaultsValueTypeInteger,         // NSInteger
+    NSUserDefaultsValueTypeLong,            // Include:long,long long,short and unsigned
+    NSUserDefaultsValueTypeFloat,
+    NSUserDefaultsValueTypeDouble,
+    NSUserDefaultsValueTypeBool,
+    NSUserDefaultsValueTypeObject,
+    NSUserDefaultsValueTypeUnknown
+};
+
+// Init
++ (instancetype)userDefaultsModel;
+
+// Set default values
+/**
+ * Override this method,you can setup default values
+ * Description: If the object has two properties such as 'name' and 'gender',you should return @{@"name": @"defaultName", @"gender": @defaultGender}
+ */
+- (NSDictionary *)setupDefaultValues;
+
+@end
+//
+//  NSUserDefaultsModel.m
+//  CNLiveSettingModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright © 2019 153993236@qq.com. All rights reserved.
+//
+
+#import "NSUserDefaultsModel.h"
+#import <objc/runtime.h>
+
+@interface NSUserDefaultsModel ()
+@property (nonatomic, strong) NSMutableDictionary *properties;
+
+@end
+
+@implementation NSUserDefaultsModel
+
+#pragma mark - Init
++ (instancetype)userDefaultsModel {
+    static id model = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        model = [[[self class] alloc] init];
+    });
+    
+    return model;
+}
+
+- (instancetype)init {
+    if (self = [super init]) {
+        if ([self respondsToSelector:@selector(setupDefaultValues)]) {
+            NSDictionary *defaults = [self setupDefaultValues];
+            if (defaults) {
+                [[NSUserDefaults standardUserDefaults] registerDefaults:defaults];
+                [self exchangeAccessMethods];
+            }
+        }
+    }
+    
+    return self;
+}
+
+- (NSDictionary *)setupDefaultValues {
+    return nil;
+}
+
+#pragma mark - Processing Data
+- (void)exchangeAccessMethods {
+    unsigned int count = 0;
+
+    objc_property_t *propertyList = class_copyPropertyList([self class], &count);
+    for (int index = 0; index < count; index++) {
+        objc_property_t property = propertyList[index];
+        const char *propertyName = property_getName(property);
+        const char *propertyAttributes = property_getAttributes(property);
+        
+        NSString *getterKey = [NSString stringWithFormat:@"%s", propertyName];
+        NSString *setterKey = [NSString stringWithFormat:@"set%@%@:", [[getterKey substringToIndex:1] uppercaseString], [getterKey substringFromIndex:1]];
+        if (getterKey && getterKey.length > 0) {
+            SEL getterSelector = NSSelectorFromString(getterKey);
+            SEL setterSelector = NSSelectorFromString(setterKey);
+            self.properties[getterKey] = getterKey;
+            self.properties[setterKey] = getterKey;
+            
+            IMP getterImp = NULL;
+            IMP setterImp = NULL;
+            // Data type
+            char type = propertyAttributes[1];
+            if (type == '@') {
+                getterImp = (IMP)getObjectValue;
+                setterImp = (IMP)setObjectValue;
+            }else if (type == 'B') {
+                getterImp = (IMP)getBoolValue;
+                setterImp = (IMP)setBoolValue;
+            } else if (type == 'i') {
+                getterImp = (IMP)getIntegerValue;
+                setterImp = (IMP)setIntegerValue;
+            } else if (type == 'd') {
+                getterImp = (IMP)getDoubleValue;
+                setterImp = (IMP)setDoubleValue;
+            } else if (type == 'f') {
+                getterImp = (IMP)getFloatValue;
+                setterImp = (IMP)setFloatValue;
+            } else if (type == 's' || type == 'l' || type == 'q' || type == 'S' || type == 'I' || type == 'L' || type == 'Q') {
+                getterImp = (IMP)getLongValue;
+                setterImp = (IMP)setLongValue;
+            } else {
+                NSLog(@"Warning:Unsupported type ,property = '%@'", getterKey);
+                break;
+            }
+            
+            char getterYypes[3] = "v@:";
+            getterYypes[0] = type;
+            class_addMethod([self class], getterSelector, getterImp, getterYypes);
+
+            char setterTypes[4] = "v@:";
+            setterTypes[3] = type;
+            class_addMethod([self class], setterSelector, setterImp, setterTypes);
+        }
+    }
+    free(propertyList); // release
+}
+
+#pragma mark - Override Methods
+- (NSMutableDictionary *)properties {
+    if (!_properties) {
+        _properties = [NSMutableDictionary dictionary];
+    }
+    return _properties;
+}
+
+#pragma mark - Private Methods
+/**
+ * Setter And Getter Methods
+ */
+
+// Bbject
+static id getObjectValue(NSUserDefaultsModel *model, SEL sel) {
+    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+    return [userDefaults objectForKey:model.properties[NSStringFromSelector(sel)]];
+}
+
+static void setObjectValue(NSUserDefaultsModel *model, SEL sel, id value) {
+    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+    if (value) {
+        [userDefaults setObject:value forKey:model.properties[NSStringFromSelector(sel)]];
+    } else {
+        [userDefaults removeObjectForKey:model.properties[NSStringFromSelector(sel)]];
+    }
+    [userDefaults synchronize];
+}
+
+// Bool
+static BOOL getBoolValue(NSUserDefaultsModel *model, SEL sel) {
+    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+    return [userDefaults boolForKey:model.properties[NSStringFromSelector(sel)]];
+}
+
+static void setBoolValue(NSUserDefaultsModel *model, SEL sel, BOOL value) {
+    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+    [userDefaults setBool:value forKey:model.properties[NSStringFromSelector(sel)]];
+    [userDefaults synchronize];
+}
+
+// Integer
+static NSInteger getIntegerValue(NSUserDefaultsModel *model, SEL sel) {
+    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+    return [userDefaults integerForKey:model.properties[NSStringFromSelector(sel)]];
+}
+
+static void setIntegerValue(NSUserDefaultsModel *model, SEL sel, NSInteger value) {
+    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+    [userDefaults setInteger:value forKey:model.properties[NSStringFromSelector(sel)]];
+    [userDefaults synchronize];
+}
+
+// Double
+static double getDoubleValue(NSUserDefaultsModel *model, SEL sel) {
+    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+    return [userDefaults doubleForKey:model.properties[NSStringFromSelector(sel)]];
+}
+
+static void setDoubleValue(NSUserDefaultsModel *model, SEL sel, double value) {
+    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+    [userDefaults setDouble:value forKey:model.properties[NSStringFromSelector(sel)]];
+    [userDefaults synchronize];
+}
+
+// Float
+static float getFloatValue(NSUserDefaultsModel *model, SEL sel) {
+    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+    return [userDefaults doubleForKey:model.properties[NSStringFromSelector(sel)]];
+}
+
+static void setFloatValue(NSUserDefaultsModel *model, SEL sel, float value) {
+    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+    [userDefaults setFloat:value forKey:model.properties[NSStringFromSelector(sel)]];
+    [userDefaults synchronize];
+}
+
+// Long
+static long long getLongValue(NSUserDefaultsModel *model, SEL sel) {
+    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+    return [[userDefaults objectForKey:model.properties[NSStringFromSelector(sel)]] longLongValue];
+}
+
+static void setLongValue(NSUserDefaultsModel *model, SEL sel, long long value) {
+    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+    [userDefaults setObject:@(value) forKey:model.properties[NSStringFromSelector(sel)]];
+    [userDefaults synchronize];
+}
+
+@end
 //
-//  CNPrivacyTableViewCell.h
+//  CNPrivacyCell.h
 //  CNLiveSettingModule
 //
 //  Created by CNLive-zxw on 2019/4/23.
@@ -9,10 +9,10 @@
 #import <UIKit/UIKit.h>
 NS_ASSUME_NONNULL_BEGIN
-#define kCNLivePrivacyTableViewCell @"CNLivePrivacyTableViewCell"
+#define kCNLivePrivacyCell @"CNLivePrivacyCell"
 @class CNLivePrivacyModel;
-@interface CNLivePrivacyTableViewCell : UITableViewCell
+@interface CNLivePrivacyCell : UITableViewCell
 @property (nonatomic, strong) CNLivePrivacyModel *model;
 @end
 //
-//  CNLivePrivacyTableViewCell.m
+//  CNLivePrivacyCell.m
 //  CNLiveSettingModule
 //
 //  Created by CNLive-zxw on 2019/4/23.
 //  Copyright © 2019 cnlive. All rights reserved.
 //
-#import "CNLivePrivacyTableViewCell.h"
+#import "CNLivePrivacyCell.h"
 #import <SDWebImage/SDWebImage.h>
 #import "QMUIKit.h"
 #import <Masonry/Masonry.h>
@@ -18,15 +18,17 @@
 #import "CNLiveBaseKit.h"
 #import "CNLivePrivacyModel.h"
+#import "CNLiveUserDefaultsModel.h"
+#import "CNLivePrivacyRequest.h"
-@interface CNLivePrivacyTableViewCell ()
+@interface CNLivePrivacyCell ()
 @property (nonatomic, strong) UILabel *titleLabel;
-@property (nonatomic, strong) UISwitch *notifiSwitch;
+@property (nonatomic, strong) UISwitch *allowSwitch;
 @property (nonatomic, strong) UIImageView *arrowImage;
 @end
-@implementation CNLivePrivacyTableViewCell
+@implementation CNLivePrivacyCell
 static const NSInteger margin = 12;
 #pragma mark - Init
@@ -41,7 +43,7 @@ static const NSInteger margin = 12;
 - (void)initSubView {
     [self.contentView addSubview:self.titleLabel];
     [self.contentView addSubview:self.arrowImage];
-    [self.contentView addSubview:self.notifiSwitch];
+    [self.contentView addSubview:self.allowSwitch];
 }
@@ -55,7 +57,7 @@ static const NSInteger margin = 12;
         make.centerY.mas_equalTo(self.contentView);
         make.right.equalTo(self.contentView).offset(-margin);
     }];
-    [self.notifiSwitch mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.allowSwitch mas_makeConstraints:^(MASConstraintMaker *make) {
         // UISwithch的大小无效.默认大小 51.0f 31.0f)
         make.centerY.mas_equalTo(self.contentView);
         make.right.equalTo(self.contentView).offset(-margin);
@@ -73,48 +75,34 @@ static const NSInteger margin = 12;
 - (void)setModel:(CNLivePrivacyModel *)model {
     _model = model;
     _titleLabel.text = model.title;
-    if (model.cellType == CNLivePrivacyCellTypeList) { //0 隐私的列表
+    if (model.cellType == CNLivePrivacyCellTypeDefault) { //0 隐私的列表
         _arrowImage.hidden = NO;
-        _notifiSwitch.hidden = YES;
+        _allowSwitch.hidden = YES;
     }
     if (model.cellType == CNLivePrivacyCellTypeSee) { //1 是否允许陌生人看生活圈
         _arrowImage.hidden = YES;
-        _notifiSwitch.hidden = NO;
-        
-//        _notifiSwitch.enabled = [[KSYReachability reachabilityForInternetConnection] currentReachabilityStatus];//交互性
-        [_notifiSwitch setOn:[model.status isEqualToString:@"access"]];
-
+        _allowSwitch.hidden = NO;
+        [_allowSwitch setOn:[model.status isEqualToString:@"access"]];
     }
 }
 #pragma mark - Action
-- (void)switchAction:(UISwitch *)sender {
+- (void)allowDidClicked:(UISwitch *)sender {
     if (_model.cellType == CNLivePrivacyCellTypeSee) { //1 是否允许陌生人看生活圈
         sender.userInteractionEnabled = NO;
-        if (![[[NSUserDefaults standardUserDefaults] objectForKey:@"CNLiveConnectSuccNotification"] boolValue]) {
-            [sender setOn:[_model.status isEqualToString:@"access"]];
-            sender.userInteractionEnabled = YES;
-            return;
-        };
         __weak typeof(self) weakSelf = self;
-        NSDictionary *params = @{@"appId":AppId,
-                                 @"type":[_model.status isEqualToString:@"access"]?@"reject":@"access",
-                                 @"sid":CNUserShareModel.uid};
-        [CNLiveNetworking setAllowRequestDefaultArgument:YES];
-        [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNSwitchAllowStrangerUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
-            if ([responseObject isKindOfClass:[NSDictionary class]] && [responseObject[@"errorCode"] isEqualToString:@"0"]) {
-                weakSelf.model.status = [weakSelf.model.status isEqualToString:@"access"]?@"reject":@"access";
-                [[NSUserDefaults standardUserDefaults] setValue:weakSelf.model.status forKey:@"findStrangerSwitch"];
-                
+        [CNLivePrivacyRequest changeAllowStrangersToSeeState:[UserDefaultsModel.findStrangerSwitch isEqualToString:@"access"]?@"reject":@"access" block:^(BOOL isSuccess) {
+            if(isSuccess){
+                UserDefaultsModel.findStrangerSwitch = [UserDefaultsModel.findStrangerSwitch isEqualToString:@"access"]?@"reject":@"access";
             }else{
                 [sender setOn:[weakSelf.model.status isEqualToString:@"access"]];
             }
             sender.userInteractionEnabled = YES;
-            
         }];
+        
     }
 }
@@ -142,18 +130,18 @@ static const NSInteger margin = 12;
 - (UIImageView *)arrowImage {
     if (!_arrowImage) {
         _arrowImage = [[UIImageView alloc] init];
-        UIImage *xw_image = [self getImageWithImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[CNLivePrivacyTableViewCell class]];
+        UIImage *xw_image = [self getImageWithImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
         _arrowImage.image = xw_image;
     }
     return _arrowImage;
 }
-- (UISwitch *)notifiSwitch {
-    if (!_notifiSwitch) {
-        _notifiSwitch = [[UISwitch alloc] init];
-        [_notifiSwitch addTarget:self action:@selector(switchAction:) forControlEvents:UIControlEventValueChanged];
+- (UISwitch *)allowSwitch {
+    if (!_allowSwitch) {
+        _allowSwitch = [[UISwitch alloc] init];
+        [_allowSwitch addTarget:self action:@selector(allowDidClicked:) forControlEvents:UIControlEventValueChanged];
     }
-    return _notifiSwitch;
+    return _allowSwitch;
 }
 @end
 //
-//  CNLivePrivacyContactTableViewCell.h
+//  CNLivePrivacyContactCell.h
 //  CNLiveSettingModule
 //
 //  Created by CNLive-zxw on 2019/4/24.
@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 @end
-@interface CNLivePrivacyContactTableViewCell : UITableViewCell
+@interface CNLivePrivacyContactCell : UITableViewCell
 @property (nonatomic, strong) UIButton *selectBtn;
 @property (nonatomic, strong) IMAUser *user;
 @property (nonatomic, assign) id<CNLivePrivacyContactCellDelegate> delegate;
 //
-//  CNLivePrivacyContactTableViewCell.m
+//  CNLivePrivacyContactCell.m
 //  CNLiveSettingModule
 //
 //  Created by CNLive-zxw on 2019/4/24.
 //  Copyright © 2019 cnlive. All rights reserved.
 //
-#import "CNLivePrivacyContactTableViewCell.h"
+#import "CNLivePrivacyContactCell.h"
 #import <Masonry/Masonry.h>
 #import "QMUIKit.h"
 #import "CNLiveCategory.h"
-@interface CNLivePrivacyContactTableViewCell ()
+@interface CNLivePrivacyContactCell ()
 @property (nonatomic, strong) UIImageView *iconImage;
 @property (nonatomic, strong) UILabel *nickLabel;
 @end
-@implementation CNLivePrivacyContactTableViewCell
+@implementation CNLivePrivacyContactCell
 #pragma mark - Init
 + (instancetype)cellWithTableView:(UITableView *)tableView {
-    static NSString *indentify = @"CNLivePrivacyContactTableViewCell";
-    CNLivePrivacyContactTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:indentify];
+    static NSString *indentify = @"CNLivePrivacyContactCell";
+    CNLivePrivacyContactCell *cell = [tableView dequeueReusableCellWithIdentifier:indentify];
     if (!cell) {
-        cell = [[CNLivePrivacyContactTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:indentify];
+        cell = [[CNLivePrivacyContactCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:indentify];
     }
     return cell;
@@ -194,7 +194,7 @@
 - (UIImageView *)moreImage {
     if (!_moreImage) {
-        UIImage *xw_image = [self getImageWithImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[CNLivePrivacyContactTableViewCell class]];
+        UIImage *xw_image = [self getImageWithImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[CNLivePrivacyContactCell class]];
         _moreImage = [[UIImageView alloc] initWithImage:xw_image];
     }
     return _moreImage;
@@ -17,17 +17,20 @@
 #import "CNUserInfoManager.h"
 #import "CNLiveSettingNavigationBar.h"
-#import "CNLivePrivacyTableViewCell.h"
+#import "CNLivePrivacyCell.h"
 #import "CNLivePrivacyHeaderView.h"
 #import "CNLivePrivacyModel.h"
 #import "CNLiveNotSeeController.h"//不让看/不看
 //#import "CNLiveBlackListController.h"//通讯录黑名单
+#import "CNLiveUserDefaultsModel.h"
+#import "CNLivePrivacyRequest.h"
 @interface CNLivePrivacyController ()<UITableViewDelegate,UITableViewDataSource,CNLiveSettingNavigationBarDelegate>
 @property (nonatomic, strong) CNLiveSettingNavigationBar *navigationBar;
 @property (nonatomic, strong) UITableView *tableView;
-@property (nonatomic, strong) NSMutableArray <CNLivePrivacyModel*>*data;
+
 @property (nonatomic, strong) CNLivePrivacyModel *model;
+@property (nonatomic, strong) NSMutableArray <CNLivePrivacyModel*>*data;
 @end
@@ -70,26 +73,14 @@
 //允许陌生人查看生活圈
 - (void)getData {
-    NSDictionary *params = @{@"appId":AppId,
-                             @"sid":CNUserShareModel.uid};
-    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
-    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNIsAllowFindStrangerSwitchUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
-        if ([responseObject isKindOfClass:[NSDictionary class]] && [responseObject[@"errorCode"] isEqualToString:@"0"]) {
-            if(responseObject[@"data"] && [responseObject[@"data"] isKindOfClass:[NSDictionary class]]){
-                NSMutableArray <CNLivePrivacyModel *>*arr = [CNLivePrivacyModel mj_objectArrayWithKeyValuesArray:responseObject[@"data"][@"findStrangerSwitch"]];
-                CNLivePrivacyModel *model = [arr firstObject];
-                [[NSUserDefaults standardUserDefaults] setValue:model.status forKey:@"findStrangerSwitch"];
-                for (CNLivePrivacyModel *model in self.data) {
-                    if([model.title isEqualToString:@"允许陌生人查看生活圈"]){
-                        model.status = model.status;
-                    }
-                }
+    [CNLivePrivacyRequest getAllowStrangersToSeeState:^(NSString * _Nonnull status) {
+        for (CNLivePrivacyModel *model in self.data) {
+            if([model.title isEqualToString:@"允许陌生人查看生活圈"]){
+                model.status = status;
             }
         }
         [self.tableView reloadData];
-
     }];
-    
 }
 - (void)viewWillAppear:(BOOL)animated {
@@ -97,31 +88,30 @@
     [self.tableView reloadData];
 }
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    self.title = @"隐私";
     self.view.backgroundColor = [UIColor whiteColor];
+    [self loadData:UserDefaultsModel.findStrangerSwitch];
     [self getData];
-    NSString *status = [[NSUserDefaults standardUserDefaults] valueForKey:@"findStrangerSwitch"];
-    [self loadData:status?status:@"access"];
     [self createUI];
 }
+
 //网络监听
 - (void)cn_noNetworking {
     [self.tableView reloadData];
-    
 }
 - (void)cn_wifiOrWWANNetworking {
     [self.tableView reloadData];
 }
+
 #pragma mark - UI
 - (void)createUI {
     [self.view addSubview:self.navigationBar];
     [self.view addSubview:self.tableView];
-
 }
 #pragma mark - UITableViewDataSource
@@ -131,28 +121,27 @@
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     return section == 0?1:self.data.count;
-    
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    CNLivePrivacyTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:kCNLivePrivacyTableViewCell forIndexPath:indexPath];
+    CNLivePrivacyCell *cell = [tableView dequeueReusableCellWithIdentifier:kCNLivePrivacyCell forIndexPath:indexPath];
     cell.model = indexPath.section == 0?self.model:self.data[indexPath.row];
     cell.selectionStyle = UITableViewCellSelectionStyleNone;
     return cell;
-    
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
     return self.data[indexPath.row].rowHeight;
-    
 }
+
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
     return section == 0?10:30;
 }
+
 - (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
     return 0.000001f;
-
 }
+
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
     CNLivePrivacyHeaderView *view = [tableView dequeueReusableHeaderFooterViewWithIdentifier:kCNLivePrivacyHeaderView];
     view.text = section == 0?@"":@"生活圈和视频动态";
@@ -185,7 +174,6 @@
                 vc.name = model.title;
                 vc.type = CNTypeNoSeeHim;
                 [self.navigationController pushViewController:vc animated:YES];
-
             }
                 break;
             case 2:  //允许陌生人查看生活圈
@@ -205,8 +193,6 @@
 - (void)navigationBar:(CNLiveSettingNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
     if ([actionEvents isEqualToString:@"1"]) {
         [self goBack];
-    }else if ([actionEvents isEqualToString:@"2"]){
-        
     }
 }
@@ -240,11 +226,10 @@
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         _tableView.showsVerticalScrollIndicator = NO;
         _tableView.showsHorizontalScrollIndicator = NO;
-        [_tableView registerClass:[CNLivePrivacyTableViewCell class] forCellReuseIdentifier:kCNLivePrivacyTableViewCell];
+        [_tableView registerClass:[CNLivePrivacyCell class] forCellReuseIdentifier:kCNLivePrivacyCell];
         [_tableView registerClass:[CNLivePrivacyHeaderView class] forHeaderFooterViewReuseIdentifier:kCNLivePrivacyHeaderView];
     }
     return _tableView;
-    
 }
 - (NSMutableArray *)data{
@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 typedef enum {
-    CNLivePrivacyCellTypeList                    = 0,//隐私列表
+    CNLivePrivacyCellTypeDefault                 = 0,//隐私列表
     CNLivePrivacyCellTypeSee                     = 1,//是否允许陌生人查看生活圈
 } CNLivePrivacyCellType;
+//
+//  CNLivePrivacyRequest.h
+//  CNLiveSettingModule
+//
+//  Created by CNLive-zxw on 2019/4/23.
+//  Copyright © 2019 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef void(^GetStatusBlock)(NSString *status);
+typedef void(^ChangeStatusBlock)(BOOL isSuccess);
+
+@interface CNLivePrivacyRequest : NSObject
+
+// 获取是否允许默认人查看生活区状态
++ (void)getAllowStrangersToSeeState:(GetStatusBlock)block;
+
+// 改变是否允许默认人查看生活区状态
++ (void)changeAllowStrangersToSeeState:(NSString *)state block:(ChangeStatusBlock)block;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLivePrivacyRequest.m
+//  CNLiveSettingModule
+//
+//  Created by CNLive-zxw on 2019/4/23.
+//  Copyright © 2019 cnlive. All rights reserved.
+//
+
+#import "CNLivePrivacyRequest.h"
+
+#import "MJExtension.h"
+
+#import "CNLiveNetworking.h"
+#import "CNLiveEnvironment.h"
+#import "CNUserInfoManager.h"
+#import "CNLivePrivacyModel.h"
+#import "CNLiveUserDefaultsModel.h"
+
+@implementation CNLivePrivacyRequest
+
+// 获取是否允许默认人查看生活区状态
++ (void)getAllowStrangersToSeeState:(GetStatusBlock)block{
+    NSDictionary *params = @{@"appId":AppId,
+                             @"sid":CNUserShareModel.uid};
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNIsAllowFindStrangerSwitchUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        if ([responseObject isKindOfClass:[NSDictionary class]] && [responseObject[@"errorCode"] isEqualToString:@"0"]) {
+            if(responseObject[@"data"] && [responseObject[@"data"] isKindOfClass:[NSDictionary class]]){
+                NSMutableArray <CNLivePrivacyModel *>*arr = [CNLivePrivacyModel mj_objectArrayWithKeyValuesArray:responseObject[@"data"][@"findStrangerSwitch"]];
+                CNLivePrivacyModel *model = [arr firstObject];
+                if(model.status&&(![model.status isEqualToString:@""])&&(![UserDefaultsModel.findStrangerSwitch isEqualToString:model.status])){
+                    UserDefaultsModel.findStrangerSwitch = model.status;
+                    block?block(model.status):@"";
+                }
+            }
+
+        }
+
+    }];
+}
+
+// 改变是否允许默认人查看生活区状态
++ (void)changeAllowStrangersToSeeState:(NSString *)state block:(ChangeStatusBlock)block{
+    NSDictionary *params = @{@"appId":AppId,
+                             @"type":state,
+                             @"sid":CNUserShareModel.uid};
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNSwitchAllowStrangerUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        block?block(([responseObject isKindOfClass:[NSDictionary class]] && [responseObject[@"errorCode"] isEqualToString:@"0"])):@"";
+    }];
+}
+
+@end
@@ -13,6 +13,9 @@
 #import "CNLiveSettingModel.h"
+// 本地化数据
+#import "CNLiveUserDefaultsModel.h"
+
 @interface CNLiveSettingCell()
 @property (nonatomic, strong) UIView *line;
 @property (nonatomic, strong) UILabel *title;
@@ -113,6 +116,7 @@ static const NSInteger margin = 12;
                 make.right.equalTo(self.line.mas_right).with.offset(-margin);
             }];
+            [_switchOn setOn:UserDefaultsModel.goldCoinSound];
         }
             break;
@@ -145,6 +149,7 @@ static const NSInteger margin = 12;
 #pragma mark - 响应方法
 - (void)switchChanged:(UISwitch *)sw{
+    UserDefaultsModel.goldCoinSound = !UserDefaultsModel.goldCoinSound;
 }
@@ -184,7 +189,6 @@ static const NSInteger margin = 12;
         UIImage *xw_image = [self getImageWithImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveSettingCell class]];
         _front.image = xw_image;
         _front.contentMode = UIViewContentModeCenter;
-
     }
     return _front;
 }
@@ -207,8 +207,8 @@
 				6003F586195388D20070C39A /* Sources */,
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
-				6A7F75A7B7E637A2752F7EE5 /* [CP] Embed Pods Frameworks */,
-				17743842CB67A72F2519D76B /* [CP] Copy Pods Resources */,
+				C2DFB5708D727D1EC7140381 /* [CP] Embed Pods Frameworks */,
+				D4B4D009160ADF9CDF29107C /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -299,25 +299,29 @@
 /* End PBXResourcesBuildPhase section */
 /* Begin PBXShellScriptBuildPhase section */
-		17743842CB67A72F2519D76B /* [CP] Copy Pods Resources */ = {
+		653FED99FAD33AD7306D3799 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-CNLiveSettingModule_Example/Pods-CNLiveSettingModule_Example-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveSettingModule/CNLiveSettingModule.bundle",
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
 			);
-			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveSettingModule.bundle",
+				"$(DERIVED_FILE_DIR)/Pods-CNLiveSettingModule_Tests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveSettingModule_Example/Pods-CNLiveSettingModule_Example-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		653FED99FAD33AD7306D3799 /* [CP] Check Pods Manifest.lock */ = {
+		B63C2143E7B1CC8A1F17474A /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -332,14 +336,14 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-CNLiveSettingModule_Tests-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-CNLiveSettingModule_Example-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		6A7F75A7B7E637A2752F7EE5 /* [CP] Embed Pods Frameworks */ = {
+		C2DFB5708D727D1EC7140381 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -407,26 +411,22 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveSettingModule_Example/Pods-CNLiveSettingModule_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		B63C2143E7B1CC8A1F17474A /* [CP] Check Pods Manifest.lock */ = {
+		D4B4D009160ADF9CDF29107C /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveSettingModule_Example/Pods-CNLiveSettingModule_Example-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveSettingModule/CNLiveSettingModule.bundle",
 			);
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-CNLiveSettingModule_Example-checkManifestLockResult.txt",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveSettingModule.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveSettingModule_Example/Pods-CNLiveSettingModule_Example-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -10,13 +10,32 @@
 #import "CNLiveSettingController.h"
 #import "CNLiveEnvironment.h"
 #import "CNUserInfoManager.h"
+#import <CNLiveRequestBastKit/CNLiveNetworking.h>
 @implementation CNLIVEAppDelegate
+- (void)networkParamAction{
+    NSMutableDictionary * mDict = [[NSMutableDictionary alloc] init];
+    [mDict setValue:@"10514405" forKey:@"loginSid"];
+    [mDict setValue:BundleId forKey:@"platform_id"];
+
+    [mDict setValue:[[[[UIDevice currentDevice] identifierForVendor] UUIDString] stringByReplacingOccurrencesOfString:@"-" withString:@""] forKey:@"uuid"];
+    [mDict setValue:@"i" forKey:@"plat"];
+    [mDict setValue:@"1.7.8.19.10.30.15"forKey:@"ver"];
+    [mDict setObject:AppId forKey:@"appId"];
+    [CNLiveNetworking setupDefaultParam:mDict];
+    [CNLiveNetworking setupShowResult:NO];
+    [CNLiveNetworking setupSignKey:APPKey];
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setResponseSerializerType:CNLiveResponseSerializerJSON];
+    
+}
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     // Override point for customization after application launch.
     [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];
+    [self networkParamAction];
+
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];//UIScreen mainScreen].bounds个人理解获取屏幕的硬件信息然后设置尺寸大小
     CNLiveSettingController *vc = [[CNLiveSettingController alloc] init];
     UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc];