Merge branch 'main' of http://git.imoreme.com/lushaoxiong/DrWater

# Conflicts:
#	DJMHomeTY/Global/Define/XHURL.h
#	DJMHomeTY/Global/Manager/XHHttpRequestManager.m

DJMHomeTY/AppDelegate/AppDelegate.m

@@ -140,6 +140,7 @@
         XHDataModel *model = [XHDataModel mj_objectWithKeyValues:responseObject[@"data"]];
         XHDataModel *model = [XHDataModel mj_objectWithKeyValues:responseObject[@"data"]];
         XHGetDataManager.customerModel = model;
         XHGetDataManager.customerModel = model;
         dispatch_async(self.main_queue_t, ^{
         dispatch_async(self.main_queue_t, ^{
+            
             [weakSelf LoginSuccess];
             [weakSelf LoginSuccess];
         });
         });
     } fail:^(id failMessage) {
     } fail:^(id failMessage) {
@@ -157,18 +158,45 @@
         });
         });
     }];
     }];
 }
 }
+// 请求h5链接
+- (void)requestGiftLink{
+    HJSelfWeak;
     
     
--(void)LoginSuccess{
+    
+    [[XHHttpRequestManager shareManager] getHttpRequestURL:HFXGetGiftLink isJson:NO parameters:@{} success:^(id responseObject) {
+        [SVProgressHUD dismiss];
+        NSLog(@"responseObject:\n%@===%@",responseObject,responseObject[@"msg"]);
+        
+        XHGetDataManager.giftLink = responseObject[@"data"];
         dispatch_async(self.main_queue_t, ^{
         dispatch_async(self.main_queue_t, ^{
-        [self setAppWindows];
-        [self setRootViewController];
+            [weakSelf setAppWindows];
+            [weakSelf setRootViewController];
         });
         });
+        
+    } fail:^(id failMessage) {
+        
+        
+    }networkRequestsFail:^(id networkFail) {
+        
+    }];
 }
 }
+-(void)LoginSuccess{
+    HJSelfWeak;
+    dispatch_async(self.main_queue_t, ^{
+        [weakSelf setAppWindows];
+        [weakSelf setRootViewController];
+    });
+//    [self requestGiftLink];
+    
+    
+}//
 -(void)LoginAgain{
 -(void)LoginAgain{
     //断开蓝牙
     //断开蓝牙
    HJGetBluetoothManager.noReconnect = true;
    HJGetBluetoothManager.noReconnect = true;
    [HJGetBluetoothManager stopConnect];
    [HJGetBluetoothManager stopConnect];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             [HJGetBluetoothManager stopScanning];
             [HJGetBluetoothManager stopScanning];
+        });
 //   [HJGetBluetoothManager.delegate removeBluetoothDelegate:self];
 //   [HJGetBluetoothManager.delegate removeBluetoothDelegate:self];
     [self resetDefaults];
     [self resetDefaults];
     [self setAppWindows];
     [self setAppWindows];

DJMHomeTY/Assets.xcassets/HFX/DR_gift_Normal.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DR_gift_Normal@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "DR_gift_Normal@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DJMHomeTY/Assets.xcassets/HFX/DR_gift_Sel.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DR_gift_Sel@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "DR_gift_Sel@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DJMHomeTY/Global/Base/Controller/XHCustomTabBarController.m

@@ -168,9 +168,20 @@
     
     
     
     
     self.tabBar.translucent     = NO;
     self.tabBar.translucent     = NO;
-    NSArray * normalItems       = @[@"DR_Home_home-Normal",@"DR_Mine_Normal"];
-    NSArray * selectItmes       = @[@"DR_Home_home-sel",@"DR_Mine_Sel"];
-    NSArray * controllClass     = @[@"DXDeviceListVC",@"XHMineVC"];
+    NSArray * normalItems;
+    NSArray * selectItmes;
+    NSArray * controllClass;
+    if ([XHDataManager sharedManager].simparlanguage == 0) {
+        normalItems       = @[@"DR_Home_home-Normal",@"DR_gift_Normal",@"DR_Mine_Normal"];
+        selectItmes       = @[@"DR_Home_home-sel",@"DR_gift_Sel",@"DR_Mine_Sel"];
+        controllClass     = @[@"DXDeviceListVC",@"DXBannerVC",@"XHMineVC"];
+    }else{
+        normalItems       = @[@"DR_Home_home-Normal",@"DR_Mine_Normal"];
+        selectItmes       = @[@"DR_Home_home-sel",@"DR_Mine_Sel"];
+        controllClass     = @[@"DXDeviceListVC",@"XHMineVC"];
+    }
+    
+    
     self.delegate               = self;
     self.delegate               = self;
     NSMutableArray * controllers = [[NSMutableArray alloc]init];
     NSMutableArray * controllers = [[NSMutableArray alloc]init];
     for (int i = 0; i < normalItems.count; i++)
     for (int i = 0; i < normalItems.count; i++)

DJMHomeTY/Global/Base/Controller/XHParentVC.m

@@ -63,7 +63,7 @@
           self.navigationController.interactivePopGestureRecognizer.enabled = NO;
           self.navigationController.interactivePopGestureRecognizer.enabled = NO;
       }
       }
     [self setNavigationState];
     [self setNavigationState];
-    [self addNotification];
+    [self addNotificationSuper];
     [self initNavView];
     [self initNavView];
     [self startLocation1];
     [self startLocation1];
     self.centralManager = [[CBCentralManager alloc] initWithDelegate:self queue:nil];
     self.centralManager = [[CBCentralManager alloc] initWithDelegate:self queue:nil];
@@ -162,7 +162,7 @@
     
     
 }
 }
 //添加通知
 //添加通知
--(void)addNotification{
+-(void)addNotificationSuper{
     [HJNotificationCenter addObserver:self selector:@selector(popVcAction) name:@"popVC" object:nil];
     [HJNotificationCenter addObserver:self selector:@selector(popVcAction) name:@"popVC" object:nil];
     
     
 }
 }

DJMHomeTY/Global/Base/View/XHTabBar.m

@@ -32,7 +32,13 @@
 //    [self bringSubviewToFront:self.scanBtn];
 //    [self bringSubviewToFront:self.scanBtn];
     
     
     // 2.设置其它UITabBarButton的位置和尺寸//self.frame.size.width / 3;
     // 2.设置其它UITabBarButton的位置和尺寸//self.frame.size.width / 3;
-    CGFloat tabbarButtonW = HJScreenWidth / 2;
+    CGFloat tabbarButtonW;
+    if ([XHDataManager sharedManager].simparlanguage == 0 && TargetType == 5){
+        tabbarButtonW = HJScreenWidth / 3;
+    }else{
+        tabbarButtonW = HJScreenWidth / 2;
+    }
+    
     CGFloat tabbarButtonIndex = 0;
     CGFloat tabbarButtonIndex = 0;
     for (UIView *child in self.subviews) {
     for (UIView *child in self.subviews) {
         Class class = NSClassFromString(@"UITabBarButton");
         Class class = NSClassFromString(@"UITabBarButton");

DJMHomeTY/Global/Manager/XHDataManager.h

@@ -127,6 +127,8 @@
 ///// 个人模型
 ///// 个人模型
 @property (nonatomic, strong) XHDataModel *customerModel;
 @property (nonatomic, strong) XHDataModel *customerModel;
 
 
+@property (nonatomic,copy) NSString *giftLink;
+
 + (XHDataManager *)sharedManager;
 + (XHDataManager *)sharedManager;
 +(void)saveValue:(id) value forKey:(NSString *)key;
 +(void)saveValue:(id) value forKey:(NSString *)key;
 
 

DJMHomeTY/Global/Manager/XHHttpRequestManager.m

@@ -30,10 +30,8 @@
     }
     }
     manager.requestSerializer.timeoutInterval = 50;
     manager.requestSerializer.timeoutInterval = 50;
     [manager.requestSerializer setValue:[NSString stringWithFormat:@"%d",XHGetDataManager.simparlanguage] forHTTPHeaderField:@"Accept-Language"];
     [manager.requestSerializer setValue:[NSString stringWithFormat:@"%d",XHGetDataManager.simparlanguage] forHTTPHeaderField:@"Accept-Language"];
-    
     [manager.requestSerializer setValue:XHGetDataManager.token forHTTPHeaderField:@"token"];
     [manager.requestSerializer setValue:XHGetDataManager.token forHTTPHeaderField:@"token"];
     
     
-
     NSLog(@"%d",XHGetDataManager.simparlanguage );
     NSLog(@"%d",XHGetDataManager.simparlanguage );
     [manager GET:url parameters:updateDic headers:nil progress:^(NSProgress * _Nonnull downloadProgress) {
     [manager GET:url parameters:updateDic headers:nil progress:^(NSProgress * _Nonnull downloadProgress) {
         
         

DJMHomeTY/Page/DeviceListPage/Controller/DXDeviceListVC.m

@@ -114,8 +114,16 @@ static NSString *dxmachineCell = @"DXDeviceListCell";
         DXBannerVC *banner = [DXBannerVC new];
         DXBannerVC *banner = [DXBannerVC new];
         banner.url = weakSelf.linkArray[index];
         banner.url = weakSelf.linkArray[index];
         if(banner.url && ![banner.url isEqualToString:@""]){
         if(banner.url && ![banner.url isEqualToString:@""]){
+            
+            if ([banner.url containsString:@"http://djmfa.imoreme.com"]) {
                 banner.hidesBottomBarWhenPushed = YES;
                 banner.hidesBottomBarWhenPushed = YES;
+                [weakSelf.tabBarController setSelectedIndex:1];
+            }else{
                 [weakSelf.navigationController pushViewController:banner animated:YES];
                 [weakSelf.navigationController pushViewController:banner animated:YES];
+            }
+        
+            
+//
         }else{
         }else{
             
             
         }
         }
@@ -140,7 +148,7 @@ static NSString *dxmachineCell = @"DXDeviceListCell";
             weakSelf.linkArray = [NSMutableArray array];
             weakSelf.linkArray = [NSMutableArray array];
             for (XHBannerModel *model in weakSelf.bannerArray) {
             for (XHBannerModel *model in weakSelf.bannerArray) {
                 [urlArray addObject:model.imgUrl];
                 [urlArray addObject:model.imgUrl];
-                [weakSelf.linkArray addObject:model.link];
+                [weakSelf.linkArray addObject:model.imgLink];
             }
             }
             
             
             if (TargetType == 5 && weakSelf.bannerArray.count > 0) {
             if (TargetType == 5 && weakSelf.bannerArray.count > 0) {

DJMHomeTY/Page/DeviceListPage/Model/XHDeviceListModel.h

@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 @property (nonatomic,copy) NSString *imgUrl;
 @property (nonatomic,copy) NSString *imgUrl;
 
 
-@property (nonatomic,copy) NSString *link;
+@property (nonatomic,copy) NSString *imgLink;
 
 
 @end
 @end
 NS_ASSUME_NONNULL_END
 NS_ASSUME_NONNULL_END