Skip to content

D
DrWater
Commit 6946d926 by 路少雄
Options

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

parents 6ecc1f98 944d66f6
Showing with 296 additions and 210 deletions
DJMHomeTY.xcworkspace/xcuserdata/lushaoxiong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -7,69 +7,6 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "8E79E0B6-5E3A-4942-95A9-4129987DD18C"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "289"
endingLineNumber = "289"
landmarkName = "-updateRecord:"
landmarkType = "7">
<Locations>
<Location
uuid = "8E79E0B6-5E3A-4942-95A9-4129987DD18C - 633e2f4dec526b58"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[XHParentVC updateRecord:]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "254"
endingLineNumber = "254"
offsetFromSymbolStart = "756">
</Location>
<Location
uuid = "8E79E0B6-5E3A-4942-95A9-4129987DD18C - 633e2f4dec526b58"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[XHParentVC updateRecord:]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "254"
endingLineNumber = "254"
offsetFromSymbolStart = "928">
</Location>
<Location
uuid = "8E79E0B6-5E3A-4942-95A9-4129987DD18C - 7f605f14e892f54e"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[XHParentVC updateRecord:]"
moduleName = "DJMHomeDR"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "254"
endingLineNumber = "254"
offsetFromSymbolStart = "756">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "AE62525A-FDB8-4523-909B-B4D7A3305DB3"
shouldBeEnabled = "Yes"
ignoreCount = "0"
......@@ -142,6 +79,21 @@
endingLineNumber = "802"
offsetFromSymbolStart = "248">
</Location>
<Location
uuid = "AE62525A-FDB8-4523-909B-B4D7A3305DB3 - 4cc92878976149d4"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[HJBluetoothManager checkDeviceVersionWithResult:binUrl:]"
moduleName = "DJMHomeDR"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Global/Manager/HJBluetoothManager.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "802"
endingLineNumber = "802"
offsetFromSymbolStart = "248">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
......@@ -160,47 +112,77 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "E8BF8F50-9FFE-4F6A-AC94-B3D28C372550"
uuid = "C7F8CC65-4282-4316-B969-EF2447928026"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Base/Controller/XHParentVC.m"
filePath = "DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "247"
endingLineNumber = "247"
landmarkName = "-saveRecord:"
startingLineNumber = "1559"
endingLineNumber = "1559"
landmarkName = "-changePumpSpeedWithSize:"
landmarkType = "7">
<Locations>
<Location
uuid = "E8BF8F50-9FFE-4F6A-AC94-B3D28C372550 - c3b76f265bff27c5"
uuid = "C7F8CC65-4282-4316-B969-EF2447928026 - ff6afef0fc66f760"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__25-[XHParentVC saveRecord:]_block_invoke.116"
symbolName = "-[DXHFXVC changePumpSpeedWithSize:]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Global/Base/Controller/XHParentVC.m"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "247"
endingLineNumber = "247"
offsetFromSymbolStart = "100">
startingLineNumber = "1559"
endingLineNumber = "1559"
offsetFromSymbolStart = "68">
</Location>
<Location
uuid = "E8BF8F50-9FFE-4F6A-AC94-B3D28C372550 - d8f31718eb018d9d"
uuid = "C7F8CC65-4282-4316-B969-EF2447928026 - ff6afef0fc66f781"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__25-[XHParentVC saveRecord:]_block_invoke_2"
symbolName = "-[DXHFXVC changePumpSpeedWithSize:]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Global/Base/Controller/XHParentVC.m"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "248"
endingLineNumber = "248"
offsetFromSymbolStart = "28">
startingLineNumber = "1560"
endingLineNumber = "1560"
offsetFromSymbolStart = "24">
</Location>
<Location
uuid = "C7F8CC65-4282-4316-B969-EF2447928026 - e3348ea9f8a66997"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXHFXVC changePumpSpeedWithSize:]"
moduleName = "DJMHomeDR"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1560"
endingLineNumber = "1560"
offsetFromSymbolStart = "24">
</Location>
<Location
uuid = "C7F8CC65-4282-4316-B969-EF2447928026 - f67225bf6830039d"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXHFXVC setIsBack:]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1559"
endingLineNumber = "1559"
offsetFromSymbolStart = "248">
</Location>
</Locations>
</BreakpointContent>
......@@ -208,47 +190,62 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "C7F8CC65-4282-4316-B969-EF2447928026"
uuid = "4C3803B5-60B7-4BB0-8F4D-4296028F657A"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
filePath = "DJMHomeTY/Page/DeviceListPage/Controller/DXAddBannerVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1559"
endingLineNumber = "1559"
landmarkName = "-changePumpSpeedWithSize:"
startingLineNumber = "72"
endingLineNumber = "72"
landmarkName = "-requestData"
landmarkType = "7">
<Locations>
<Location
uuid = "C7F8CC65-4282-4316-B969-EF2447928026 - ff6afef0fc66f760"
uuid = "4C3803B5-60B7-4BB0-8F4D-4296028F657A - d2b46f3f9e48a997"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXHFXVC changePumpSpeedWithSize:]"
symbolName = "-[DXAddBannerVC requestData]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DeviceListPage/Controller/DXAddBannerVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1559"
endingLineNumber = "1559"
offsetFromSymbolStart = "68">
startingLineNumber = "71"
endingLineNumber = "71"
offsetFromSymbolStart = "432">
</Location>
<Location
uuid = "C7F8CC65-4282-4316-B969-EF2447928026 - ff6afef0fc66f781"
uuid = "4C3803B5-60B7-4BB0-8F4D-4296028F657A - d2b46f3f9e48a9f6"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXHFXVC changePumpSpeedWithSize:]"
symbolName = "-[DXAddBannerVC requestData]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DeviceListPage/Controller/DXAddBannerVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1560"
endingLineNumber = "1560"
offsetFromSymbolStart = "24">
startingLineNumber = "72"
endingLineNumber = "72"
offsetFromSymbolStart = "352">
</Location>
<Location
uuid = "4C3803B5-60B7-4BB0-8F4D-4296028F657A - ceea1f669a8837e0"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXAddBannerVC requestData]"
moduleName = "DJMHomeDR"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DeviceListPage/Controller/DXAddBannerVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "72"
endingLineNumber = "72"
offsetFromSymbolStart = "352">
</Location>
</Locations>
</BreakpointContent>
......@@ -256,33 +253,142 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "542E4238-3B5E-4B7E-A75E-07C96F5A221D"
uuid = "55E8269E-99F4-490A-8BCB-81490693613A"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DeviceListPage/Controller/DXBannerVC.m"
filePath = "DJMHomeTY/Page/DeviceListPage/Controller/DXAddBannerVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "109"
endingLineNumber = "109"
landmarkName = "-setUrl:"
startingLineNumber = "84"
endingLineNumber = "84"
landmarkName = "-requestData"
landmarkType = "7">
<Locations>
<Location
uuid = "55E8269E-99F4-490A-8BCB-81490693613A - d2b46f3f9e48af6b"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXAddBannerVC requestData]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DeviceListPage/Controller/DXAddBannerVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "83"
endingLineNumber = "83"
offsetFromSymbolStart = "744">
</Location>
<Location
uuid = "55E8269E-99F4-490A-8BCB-81490693613A - d2b46f3f9e48af4a"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXAddBannerVC requestData]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DeviceListPage/Controller/DXAddBannerVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "84"
endingLineNumber = "84"
offsetFromSymbolStart = "664">
</Location>
<Location
uuid = "55E8269E-99F4-490A-8BCB-81490693613A - ceea1f669a88315c"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXAddBannerVC requestData]"
moduleName = "DJMHomeDR"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DeviceListPage/Controller/DXAddBannerVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "84"
endingLineNumber = "84"
offsetFromSymbolStart = "664">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "8857F1C6-D9ED-49C4-A9C7-B25BAB5BD8C2"
uuid = "EF088688-C25D-4092-A7F1-CC95E0FD8FCD"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DeviceListPage/Controller/DXBannerVC.m"
filePath = "DJMHomeTY/Page/DeviceListPage/Controller/DXAddBannerVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "95"
endingLineNumber = "95"
landmarkName = "-requestData"
startingLineNumber = "97"
endingLineNumber = "97"
landmarkName = "-setUrl:"
landmarkType = "7">
<Locations>
<Location
uuid = "EF088688-C25D-4092-A7F1-CC95E0FD8FCD - dcdc82fe6590ba4a"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXAddBannerVC setUrl:]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DeviceListPage/Controller/DXAddBannerVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "98"
endingLineNumber = "98"
offsetFromSymbolStart = "504">
</Location>
<Location
uuid = "EF088688-C25D-4092-A7F1-CC95E0FD8FCD - dcdc82fe6590b98c"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXAddBannerVC setUrl:]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DeviceListPage/Controller/DXAddBannerVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "96"
endingLineNumber = "96"
offsetFromSymbolStart = "188">
</Location>
<Location
uuid = "EF088688-C25D-4092-A7F1-CC95E0FD8FCD - dcdc82fe6590ba6b"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXAddBannerVC setUrl:]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DeviceListPage/Controller/DXAddBannerVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "97"
endingLineNumber = "97"
offsetFromSymbolStart = "188">
</Location>
<Location
uuid = "EF088688-C25D-4092-A7F1-CC95E0FD8FCD - c082f2a76150247d"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXAddBannerVC setUrl:]"
moduleName = "DJMHomeDR"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DeviceListPage/Controller/DXAddBannerVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "97"
endingLineNumber = "97"
offsetFromSymbolStart = "188">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
......
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;
dispatch_async(self.main_queue_t, ^{
[weakSelf setAppWindows];
[weakSelf setRootViewController];
});
[self requestGiftLink];
if ([XHDataManager sharedManager].simparlanguage == 0) {
[self requestGiftLink];
}else{
dispatch_async(self.main_queue_t, ^{
[weakSelf setAppWindows];
[weakSelf setRootViewController];
});
}
}//
......
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/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,36 +124,39 @@
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.absoluteString rangeOfString:@"map.qq.com/m/mqq/nav/"].location != NSNotFound) {
NSString *pattern = @"eword=([^&]+).*?epointx=([^&]+).*?epointy=([^&]+)";
NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:pattern options:0 error:nil];
// 在 URL 字符串中搜索匹配的内容
NSTextCheckingResult *result = [regex firstMatchInString:url.absoluteString options:0 range:NSMakeRange(0, url.absoluteString.length)];
// 如果找到匹配项，则提取相应的值
NSString *eword = [url.absoluteString substringWithRange:[result rangeAtIndex:1]];
NSString *epointx = [url.absoluteString substringWithRange:[result rangeAtIndex:2]];
NSString *epointy = [url.absoluteString substringWithRange:[result rangeAtIndex:3]];
// 打印提取到的值
NSLog(@"eword: %@", eword);
NSLog(@"epointx: %@", epointx);
NSLog(@"epointy: %@", epointy);
if (![url isKindOfClass:[NSNull class]]) {
if ([url.absoluteString rangeOfString:@"map.qq.com/m/mqq/nav/"].location != NSNotFound) {
// 创建一个MKPlacemark对象，表示目标位置的地标
MKPlacemark *placemark = [[MKPlacemark alloc] initWithCoordinate:CLLocationCoordinate2DMake([epointy doubleValue], [epointx doubleValue])];
// 创建一个MKMapItem对象，表示要在地图中显示的位置
MKMapItem *mapItem = [[MKMapItem alloc] initWithPlacemark:placemark];
[mapItem setName:[eword stringByRemovingPercentEncoding]]; // 设置地点的名称，可选
NSString *pattern = @"eword=([^&]+).*?epointx=([^&]+).*?epointy=([^&]+)";
NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:pattern options:0 error:nil];
// 在 URL 字符串中搜索匹配的内容
NSTextCheckingResult *result = [regex firstMatchInString:url.absoluteString options:0 range:NSMakeRange(0, url.absoluteString.length)];
// 如果找到匹配项，则提取相应的值
NSString *eword = [url.absoluteString substringWithRange:[result rangeAtIndex:1]];
NSString *epointx = [url.absoluteString substringWithRange:[result rangeAtIndex:2]];
NSString *epointy = [url.absoluteString substringWithRange:[result rangeAtIndex:3]];
// 打印提取到的值
NSLog(@"eword: %@", eword);
NSLog(@"epointx: %@", epointx);
NSLog(@"epointy: %@", epointy);
// 创建一个MKPlacemark对象，表示目标位置的地标
MKPlacemark *placemark = [[MKPlacemark alloc] initWithCoordinate:CLLocationCoordinate2DMake([epointy doubleValue], [epointx doubleValue])];
// 创建一个MKMapItem对象，表示要在地图中显示的位置
MKMapItem *mapItem = [[MKMapItem alloc] initWithPlacemark:placemark];
[mapItem setName:[eword stringByRemovingPercentEncoding]]; // 设置地点的名称，可选
[mapItem openInMapsWithLaunchOptions:@{MKLaunchOptionsDirectionsModeKey: MKLaunchOptionsDirectionsModeDriving,MKLaunchOptionsShowsTrafficKey: [NSNumber numberWithBool:YES]}];
// 使用mapItem打开苹果地图应用
// [mapItem openInMapsWithLaunchOptions:nil];
}
}
[mapItem openInMapsWithLaunchOptions:@{MKLaunchOptionsDirectionsModeKey: MKLaunchOptionsDirectionsModeDriving,MKLaunchOptionsShowsTrafficKey: [NSNumber numberWithBool:YES]}];
// 使用mapItem打开苹果地图应用
// [mapItem openInMapsWithLaunchOptions:nil];
}
// });
......
Pods/Pods.xcodeproj/xcuserdata/lushaoxiong.xcuserdatad/xcschemes/YModemLib.xcscheme deleted 100644 → 0
<?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>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment