【功能代码优化】移除我的模块系统设置功能

tongxin.xcodeproj/project.pbxproj

@@ -7234,7 +7234,7 @@
 					"$(PROJECT_DIR)/sdk/lib/ios",
 				);
 				MACH_O_TYPE = mh_execute;
-				MARKETING_VERSION = 1.4.1;
+				MARKETING_VERSION = 1.4.3;
 				"OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--generate-entitlement-der";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -7350,7 +7350,7 @@
 					"$(PROJECT_DIR)/tongxin/ThirdPartyLib/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 					"$(PROJECT_DIR)/sdk/lib/ios",
 				);
-				MARKETING_VERSION = 1.4.1;
+				MARKETING_VERSION = 1.4.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

tongxin.xcodeproj/xcshareddata/xcschemes/yisai-LeKan.xcscheme

@@ -60,7 +60,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

tongxin/AppDelegate.m

@@ -999,6 +999,7 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
 - (void)splashAdViewControllerDidClose:(BUSplashAd *)splashAd;
 {
     NSLog(@"广告关闭1111");
+    [self disYulan];
     self.splashLabel.hidden = YES;
     [self.splashLabel removeFromSuperview];
 }
@@ -1006,6 +1007,7 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
 - (void)splashAdDidClose:(BUSplashAd *)splashAd closeType:(BUSplashAdCloseType)closeType
 {
     NSLog(@"广告关闭2222");
+    [self disYulan];
     self.splashLabel.hidden = YES;
     [self.splashLabel removeFromSuperview];
 }

tongxin/Helpers/myHttp/NetHeader.h

@@ -178,6 +178,9 @@ typedef NS_ENUM(NSInteger, HTTP_CODE)
 
 #define HTTP_DEVICES_SCHEDULE @"20000/devices/[imei]/schedule"
 
+/// 获取设备资料
+#define HTTP_DEVICES_INFO @"20000/devices/[imei]"
+
 //常见问题
 #define HTTP_GET_CQ_AND_HOTQ @"getway/categorys_and_titles"//获取问题类别和热门问题
 #define HTTP_GET_ALL_CQ @"getway/titles/[categoryid]"//获取某个问题类别中的所有问题

tongxin/VC/Map/MapReviseViewController.m

@@ -59,8 +59,8 @@
     }];
     
 //    //检查隐私合规
-//    [MAMapView updatePrivacyShow:AMapPrivacyShowStatusDidShow privacyInfo:AMapPrivacyInfoStatusDidContain];
-//    [MAMapView updatePrivacyAgree:AMapPrivacyAgreeStatusDidAgree];
+    [MAMapView updatePrivacyShow:AMapPrivacyShowStatusDidShow privacyInfo:AMapPrivacyInfoStatusDidContain];
+    [MAMapView updatePrivacyAgree:AMapPrivacyAgreeStatusDidAgree];
 
     //地图
     _mapView = [[MAMapView alloc]initWithFrame:CGRectMake(0, iPhoneX_NavHeight, ScreenWidth, ScreenHeight-iPhoneX_NavHeight-Adapted(140))];

tongxin/VC/Map/MapViewController.m

@@ -90,6 +90,9 @@
 }
 -(void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
+    
+    
+    
     self.zx_navTitle = cUser.cDevice.name;
     self.isSetTranslucent = NO;
     [self loadData];
@@ -696,10 +699,22 @@
             self.locationTypeImageView.image = [UIImage imageNamed:@"icon_base_station"];
             self.locationTypeLabel.text = @"LBS";
         }
-        if(self.curLocate){
+        if(self.curLocate)
+        {
+            NSLog(@"%@",cUser.cDevice.lastLocation.address);
             NSString *dateStr = [myHelper distanceTimeWithBeforeTime:[self.curLocate.timestamp doubleValue]];
             self.locationTimeLabel.text = dateStr;
-            self.locationAddressLabel.text = self.curLocate.address.length > 0 ? self.curLocate.address : @"位置解析中...";
+            if (self.curLocate.address.length < 1 && cUser.cDevice.lastLocation.address.length < 1)
+            {
+                [cUser.cDevice getDeviceInfoSuccess:^(id responseObject) {
+                    NSDictionary *dic = responseObject[@"lastLocation"];
+                    self.locationAddressLabel.text = dic[@"address"];
+                    } failure:^(id faiObject) {
+                        
+                    }];
+            }
+            else
+                self.locationAddressLabel.text = self.curLocate.address.length > 0 ? self.curLocate.address : cUser.cDevice.lastLocation.address;
         }
         
         self.regeo.location = [AMapGeoPoint locationWithLatitude:[self.curLocate.lat floatValue] longitude:[self.curLocate.lon floatValue]];

tongxin/VC/More/MoreViewController.m

@@ -48,7 +48,7 @@
     topImg.frame = CGRectMake(0, 0, ScreenWidth, topImg.image.size.height);
     [self.view addSubview:topImg];
     
-    self.myDataSource = [[NSMutableArray alloc] initWithObjects:@"消息中心",@"系统设置",@"关于我们",@"常见问题",@"清除缓存",@"意见反馈", nil];
+    self.myDataSource = [[NSMutableArray alloc] initWithObjects:@"消息中心",@"关于我们",@"常见问题",@"清除缓存",@"意见反馈", nil];
     self.iconImageArr = [[NSMutableArray alloc] initWithObjects:@"icon_message_center_my",@"icon_settings",@"icon_aboutus",@"icon_question",@"icon_cleanup",@"icon_feedback", nil];
     
     [self.view addSubview:self.moreTableView];

tongxin/VC/More/MyTableViewCell.m

@@ -15,6 +15,9 @@
 
 @property (nonatomic ,weak) UILabel *titleLabel;
 
+
+@property (nonatomic ,weak) UILabel *msgNumLabel;
+
 @end
 
 @implementation MyTableViewCell
@@ -47,6 +50,18 @@
 - (void)setMessageCount:(NSNumber *)messageCount
 {
     _messageCount = messageCount;
+    
+    self.msgNumLabel.hidden = messageCount.integerValue > 0 && [self.titleName isEqualToString:@"消息中心"] ? NO : YES;
+    self.msgNumLabel.text = [NSString stringWithFormat:@"%@",messageCount];
+    if (messageCount.integerValue > 0)
+    {
+        CGFloat ww = messageCount.integerValue > 9 && messageCount.integerValue < 100 ? 25 : messageCount.integerValue > 99 ? 32 : 20;
+        [self.msgNumLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.right.equalTo(self.contentView.mas_right).inset(15);
+            make.centerY.equalTo(self.contentView);
+            make.size.mas_equalTo(CGSizeMake(ww, 20));
+        }];
+    }
 }
 
 - (void)subCellView
@@ -68,6 +83,20 @@
         make.centerY.equalTo(self.contentView);
     }];
     
+    UILabel *msgNumLabel = [UICommon ui_label:CGRectZero lines:0 align:NSTextAlignmentCenter font:Font_(13) textColor:KKWhiteColorColor text:@"" Radius:10];
+    
+    msgNumLabel.layer.borderWidth = 1.5;
+    msgNumLabel.layer.borderColor = KKWhiteColorColor.CGColor;
+    msgNumLabel.backgroundColor = RGB(254, 83, 71);
+    msgNumLabel.hidden = YES;
+    self.msgNumLabel = msgNumLabel;
+    [self.contentView addSubview:msgNumLabel];
+    [msgNumLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.equalTo(self.contentView.mas_right).inset(15);
+        make.centerY.equalTo(self.contentView);
+        make.size.mas_equalTo(CGSizeMake(20, 20));
+    }];
+    
 }
 
 

tongxin/xBase/Model/Device.h

@@ -327,6 +327,10 @@
 - (void)getDeviceCurLocationSuccess:(void (^)(id responseObject))success
                             failure:(void (^)(id faiObject))failure;
 
+#pragma 请求设备信息
+- (void)getDeviceInfoSuccess:(void (^)(id responseObject))success
+                            failure:(void (^)(id faiObject))failure;
+
 #pragma 获取设备注册码
 - (void)getDeviceAuthCodeSuccess:(void (^)(id responseObject))success
                          failure:(void (^)(id faiObject))failure;

tongxin/xBase/Model/Device.m

@@ -316,6 +316,32 @@
      } showHUD:NO];
 }
 
+
+#pragma 请求设备信息
+- (void)getDeviceInfoSuccess:(void (^)(id responseObject))success
+                            failure:(void (^)(id faiObject))failure{
+    NSString *urlStr = [MyHttp getURL:HTTP_DEVICES_INFO
+                               objArr:@[self]];
+    NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
+    [parameters setValue:cUser.accesstoken forKey:@"accesstoken"];
+    [parameters setValue:cUser.openid forKey:@"openid"];
+    [xMyHttp URL:urlStr
+          method:@"GET" parameters:@{}
+         success:^(NSURLSessionDataTask *task, id responseObject)
+     {
+         if ([responseObject[@"code"] intValue] == HTTP_SUCCESS) {
+             if(success){success(responseObject);}
+         }else{
+             if(failure){failure(responseObject);}
+         }
+     } failure:^(NSURLSessionDataTask *task, NSError *error) {
+         if (failure) {
+             failure(error);
+         }
+     } showHUD:NO];
+}
+
+
 #pragma 获取设备注册码
 - (void)getDeviceAuthCodeSuccess:(void (^)(id responseObject))success
                          failure:(void (^)(id faiObject))failure{