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

6946d926 · 路少雄 · 6ecc1f98 · 944d66f6 · 6946d926 · 6946d926
Commit 6946d926 authored Jun 17, 2025 by 路少雄
7 changed files
--- a/DJMHomeTY.xcworkspace/xcuserdata/lushaoxiong.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/DJMHomeTY.xcworkspace/xcuserdata/lushaoxiong.xcuserdatad/UserInterfaceState.xcuserstate
--- a/DJMHomeTY.xcworkspace/xcuserdata/lushaoxiong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/DJMHomeTY.xcworkspace/xcuserdata/lushaoxiong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
--- a/DJMHomeTY/AppDelegate/AppDelegate.m
+++ b/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];
+    }
 }//

--- a/DJMHomeTY/Global/Base/Controller/XHCustomTabBarController.m
+++ b/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;
+}

--- a/DJMHomeTY/Page/DeviceListPage/Controller/DXAddBannerVC.m
+++ b/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];

--- a/DJMHomeTY/Page/DeviceListPage/Controller/DXBannerVC.m
+++ b/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

--- a/Pods/Pods.xcodeproj/xcuserdata/lushaoxiong.xcuserdatad/xcschemes/YModemLib.xcscheme
+++ b/Pods/Pods.xcodeproj/xcuserdata/lushaoxiong.xcuserdatad/xcschemes/YModemLib.xcscheme
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1240"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4DE6125F6924398571066BA050276608"
-               BuildableName = "YModemLib.framework"
-               BlueprintName = "YModemLib"
-               ReferencedContainer = "container:Pods.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>