1.部分更新

DJMHomeTY.xcodeproj/project.pbxproj

@@ -3197,7 +3197,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.4;
+				MARKETING_VERSION = 1.2.7;
 				PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMDrWater;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -3243,7 +3243,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.4;
+				MARKETING_VERSION = 1.2.7;
 				PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMDrWater;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

DJMHomeTY/AppDelegate/AppDelegate.m

@@ -167,26 +167,41 @@
         [SVProgressHUD dismiss];
         NSLog(@"responseObject:\n%@===%@",responseObject,responseObject[@"msg"]);
         
-        XHGetDataManager.giftLink = responseObject[@"data"];
+        NSString *giftL = responseObject[@"data"];
+        if (XHGetDataManager.token) {
+            XHGetDataManager.giftLink =  [NSString stringWithFormat:@"%@?token=%@",giftL,XHGetDataManager.token];
+        }
+//        XHGetDataManager.giftLink = responseObject[@"data"];
         dispatch_async(self.main_queue_t, ^{
             [weakSelf setAppWindows];
             [weakSelf setRootViewController];
         });
         
     } fail:^(id failMessage) {
-        
+        dispatch_async(self.main_queue_t, ^{
+            [weakSelf setAppWindows];
+            [weakSelf setRootViewController];
+        });
         
     }networkRequestsFail:^(id networkFail) {
-        
+        dispatch_async(self.main_queue_t, ^{
+            [weakSelf setAppWindows];
+            [weakSelf setRootViewController];
+        });
     }];
 }
 -(void)LoginSuccess{
     HJSelfWeak;
+    if ([XHDataManager sharedManager].simparlanguage == 0) {
+        [self requestGiftLink];
+    }else{
         dispatch_async(self.main_queue_t, ^{
             [weakSelf setAppWindows];
             [weakSelf setRootViewController];
         });
-    [self requestGiftLink];
+    }
+    
+    
     
     
 }//

DJMHomeTY/Global/Base/Controller/XHCustomTabBarController.m

@@ -22,7 +22,7 @@
     if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
           self.navigationController.interactivePopGestureRecognizer.enabled = NO;
       }
-//    self.delegate = self;
+    self.delegate = self;
     XHTabBar *tabBar = [[XHTabBar alloc] init];
     tabBar.tabBarDelegate = self;
     [self setValue:tabBar forKeyPath:@"tabBar"];
@@ -279,15 +279,27 @@
 {
 
 //    NSLog(@"%@%@",tabBar,item);
-//    XHUINavigationController *bannerNav = self.viewControllers[1];
-//    
-//    DXBannerVC *banner = bannerNav.viewControllers[0];
-//    banner.url = XHGetDataManager.giftLink;
+
 //                banner.hidesBottomBarWhenPushed = YES;
 //    [weakSelf.tabBarController setSelectedIndex:1];
 
 }
+- (BOOL)tabBarController:(UITabBarController *)tabBarController shouldSelectViewController:(UIViewController *)viewController {
+    
+    
+    if ([XHDataManager sharedManager].simparlanguage == 0) {
+        if (viewController == tabBarController.viewControllers[1]) {
+                XHUINavigationController *bannerNav = self.viewControllers[1];
             
+                DXBannerVC *banner = bannerNav.viewControllers[0];
+                banner.url = XHGetDataManager.giftLink;
+        }else{
+
+        }
+    }
+    
+    return YES;
+}
 
 
 

DJMHomeTY/Global/Define/XHURL.h

@@ -8,8 +8,8 @@
 
 #ifndef XHURL_h
 #define XHURL_h
-#define DRURL @"https://testdjm.imoreme.com"//测试
-//#define DRURL @"https://djm.imoreme.com"//正式
+//#define DRURL @"https://testdjm.imoreme.com"//测试
+#define DRURL @"https://djm.imoreme.com"//正式
 //#define URL @"http://192.168.1.168:8080"//luocong
 //#define URL @"http://192.168.1.66:9012"//luocong
 

DJMHomeTY/Page/DeviceListPage/Controller/DXAddBannerVC.m

@@ -67,7 +67,8 @@
     
     if (!self.url || [self.url isEqualToString:@""]) {
 //        self.url = XHGetDataManager.giftLink;
-        self.url = [NSString stringWithFormat:@"%@?token=%@",XHGetDataManager.giftLink,XHGetDataManager.token];
+//        self.url = [NSString stringWithFormat:@"%@?token=%@",XHGetDataManager.giftLink,XHGetDataManager.token];
+        self.url = [NSString stringWithFormat:@"%@",XHGetDataManager.giftLink];
         self.navigationController.navigationBar.hidden = YES;
     }else{
         self.navigationController.navigationBar.hidden = NO;
@@ -86,6 +87,7 @@
 - (void)setUrl:(NSString *)url{
 //    url = @"https://www.baidu.com";
     _url = url;
+    
     NSURL *url1 = [NSURL URLWithString:url];
        // 根据URL创建请求
     NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url1];

DJMHomeTY/Page/DeviceListPage/Controller/DXBannerVC.m

@@ -79,10 +79,11 @@
     
     if (!self.url || [self.url isEqualToString:@""]) {
 //        self.url = XHGetDataManager.giftLink;
-        self.url = [NSString stringWithFormat:@"%@?token=%@",XHGetDataManager.giftLink,XHGetDataManager.token];
+//        self.url = [NSString stringWithFormat:@"%@?token=%@",XHGetDataManager.giftLink,XHGetDataManager.token];
+        self.url = [NSString stringWithFormat:@"%@",XHGetDataManager.giftLink];
         self.navigationController.navigationBar.hidden = YES;
     }else{
-        self.navigationController.navigationBar.hidden = NO;
+        self.navigationController.navigationBar.hidden = YES;
     }
     //http://djmfa.imoreme.com/#/pages/goshop/goshop?token=
 
@@ -98,6 +99,11 @@
 - (void)setUrl:(NSString *)url{
 //    url = @"https://www.baidu.com";
     _url = url;
+    
+//    if ([url isEqualToString:XHGetDataManager.giftLink]) {
+//        url = [NSString stringWithFormat:@"%@?token=%@",XHGetDataManager.giftLink,XHGetDataManager.token];
+//    }
+    
     NSURL *url1 = [NSURL URLWithString:url];
     
        // 根据URL创建请求
@@ -106,7 +112,7 @@
 //    NSURLRequest *request = [NSURLRequest requestWithURL:url1];
        // WKWebView加载请求
     [self.webView loadRequest:request];
-    [self.webView reload];
+//    [self.webView reload];
 }
 #pragma mark --委托代理
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
@@ -118,6 +124,7 @@
         NSURL *url = (NSURL *)change[NSKeyValueChangeNewKey];
         // https://map.qq.com/nav/drive#routes/page?eword=%E6%B5%8B&epointx=113.93041&epointy=22.53332&noback=&referer=groupActivity&ch=mc_h5marker
 //        dispatch_async(dispatch_get_main_queue(), ^{
+        if (![url isKindOfClass:[NSNull class]]) {
             if ([url.absoluteString rangeOfString:@"map.qq.com/m/mqq/nav/"].location != NSNotFound) {
                 
                 NSString *pattern = @"eword=([^&]+).*?epointx=([^&]+).*?epointy=([^&]+)";
@@ -146,10 +153,12 @@
             
                 [mapItem openInMapsWithLaunchOptions:@{MKLaunchOptionsDirectionsModeKey: MKLaunchOptionsDirectionsModeDriving,MKLaunchOptionsShowsTrafficKey: [NSNumber numberWithBool:YES]}];
                     // 使用mapItem打开苹果地图应用
-//                [mapItem openInMapsWithLaunchOptions:nil];
+    //                [mapItem openInMapsWithLaunchOptions:nil];
+                }
         }
         
             
+        
 //        });
         
    // https://mapapi.qq.com/web/mapComponents/locationMarker/v/index.html?marker=coord:22.53332,113.93041;title:测;addr:给对方Fghh