Skip to content

D
DrWater
Commit e2c8c66f by 李威
Options

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

parents 43609e20 a66aa741
Showing with 373 additions and 172 deletions
DJMHomeTY.xcodeproj/project.pbxproj
......@@ -58,6 +58,10 @@
6CAFE7402AFB8E6500C929A7 /* DXHFXVideoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CAFE73E2AFB8E6500C929A7 /* DXHFXVideoCell.m */; };
6CAFE7412AFB8E6500C929A7 /* DXHFXVideoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CAFE73E2AFB8E6500C929A7 /* DXHFXVideoCell.m */; };
6CAFE7422AFB8E6500C929A7 /* DXHFXVideoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CAFE73E2AFB8E6500C929A7 /* DXHFXVideoCell.m */; };
6CB1390E2C12DEAF00544383 /* DXAddBannerVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CB1390D2C12DEAF00544383 /* DXAddBannerVC.m */; };
6CB1390F2C12DEAF00544383 /* DXAddBannerVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CB1390D2C12DEAF00544383 /* DXAddBannerVC.m */; };
6CB139102C12DEAF00544383 /* DXAddBannerVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CB1390D2C12DEAF00544383 /* DXAddBannerVC.m */; };
6CB139112C12DEAF00544383 /* DXAddBannerVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CB1390D2C12DEAF00544383 /* DXAddBannerVC.m */; };
6CB327CC2AEF8CD900ABAEC3 /* DXDeviceListVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CB327CA2AEF8CD900ABAEC3 /* DXDeviceListVC.m */; };
6CB327CD2AEF8CD900ABAEC3 /* DXDeviceListVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CB327CA2AEF8CD900ABAEC3 /* DXDeviceListVC.m */; };
6CB327CE2AEF8CD900ABAEC3 /* DXDeviceListVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CB327CA2AEF8CD900ABAEC3 /* DXDeviceListVC.m */; };
......@@ -696,6 +700,8 @@
6CAFE7382AFB76E400C929A7 /* DXHFXVideoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DXHFXVideoModel.m; sourceTree = "<group>"; };
6CAFE73D2AFB8E6500C929A7 /* DXHFXVideoCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DXHFXVideoCell.h; sourceTree = "<group>"; };
6CAFE73E2AFB8E6500C929A7 /* DXHFXVideoCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DXHFXVideoCell.m; sourceTree = "<group>"; };
6CB1390C2C12DEAE00544383 /* DXAddBannerVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DXAddBannerVC.h; sourceTree = "<group>"; };
6CB1390D2C12DEAF00544383 /* DXAddBannerVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DXAddBannerVC.m; sourceTree = "<group>"; };
6CB327CA2AEF8CD900ABAEC3 /* DXDeviceListVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DXDeviceListVC.m; sourceTree = "<group>"; };
6CB327CB2AEF8CD900ABAEC3 /* DXDeviceListVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DXDeviceListVC.h; sourceTree = "<group>"; };
6CB327D02AEF8D0700ABAEC3 /* DXDeviceListCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DXDeviceListCell.m; sourceTree = "<group>"; };
......@@ -1736,6 +1742,8 @@
6CB327CA2AEF8CD900ABAEC3 /* DXDeviceListVC.m */,
6CB6F3C12B1898C1004CF0F3 /* DXBannerVC.h */,
6CB6F3C22B1898C1004CF0F3 /* DXBannerVC.m */,
6CB1390C2C12DEAE00544383 /* DXAddBannerVC.h */,
6CB1390D2C12DEAF00544383 /* DXAddBannerVC.m */,
);
path = Controller;
sourceTree = "<group>";
......@@ -2456,6 +2464,7 @@
883150AE2A0A2CB70025FDDE /* XHRegistFirstView.m in Sources */,
883150AF2A0A2CB70025FDDE /* XHSelectDeviceCell.m in Sources */,
88DA475B2AE39D9200313BB8 /* XHDr03View.m in Sources */,
6CB1390F2C12DEAF00544383 /* DXAddBannerVC.m in Sources */,
883150B12A0A2CB70025FDDE /* XHAlterTools.m in Sources */,
883150B22A0A2CB70025FDDE /* XHPersonalViewModel.m in Sources */,
39E082782BB3BCF000786B9D /* DXRDSmartRec.m in Sources */,
......@@ -2604,6 +2613,7 @@
88D323862A177CDC00334372 /* XHSelectDeviceCell.m in Sources */,
88D323882A177CDC00334372 /* XHAlterTools.m in Sources */,
88D323892A177CDC00334372 /* XHPersonalViewModel.m in Sources */,
6CB139112C12DEAF00544383 /* DXAddBannerVC.m in Sources */,
88D3238A2A177CDC00334372 /* XHRegistSecondView.m in Sources */,
88DA475E2AE39D9200313BB8 /* XHDr03View.m in Sources */,
39E082762BB3BCEF00786B9D /* DXRDSmartRec.m in Sources */,
......@@ -2752,6 +2762,7 @@
88314FEC2A0A1FEC0025FDDE /* XHSmartView.m in Sources */,
88314FCB2A0A1BC30025FDDE /* XHDRVC.m in Sources */,
88314FCC2A0A1BC30025FDDE /* XHDRView.m in Sources */,
6CB139102C12DEAF00544383 /* DXAddBannerVC.m in Sources */,
88EE69692A04D3C900C37EE2 /* XHCountDownButton.m in Sources */,
88EE696A2A04D3C900C37EE2 /* XHMineSetSexVC.m in Sources */,
39E082772BB3BCF000786B9D /* DXRDSmartRec.m in Sources */,
......@@ -2900,6 +2911,7 @@
88E843A329B9BBA200263DB0 /* XHPersonalViewModel.m in Sources */,
88CAA08629B870DB00825EDC /* XHRegistSecondView.m in Sources */,
884E463729A600B600A58A9A /* XHCustomTabBarController.m in Sources */,
6CB1390E2C12DEAF00544383 /* DXAddBannerVC.m in Sources */,
884E462D29A600B600A58A9A /* UIViewExt.m in Sources */,
88CAA09929B87D6300825EDC /* XHDatePickerView.m in Sources */,
88E7FC3E29B32B3B00F8585F /* HJAlertView.m in Sources */,
......
DJMHomeTY.xcworkspace/xcuserdata/lushaoxiong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -70,54 +70,6 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "E359E523-3519-496C-8634-30B842625020"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DeviceListPage/Controller/DXDeviceListVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "324"
endingLineNumber = "324"
landmarkName = "-machineButton:button:"
landmarkType = "7">
<Locations>
<Location
uuid = "E359E523-3519-496C-8634-30B842625020 - 972ab115af337bd3"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXDeviceListVC machineButton:button:]"
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/DXDeviceListVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "324"
endingLineNumber = "324"
offsetFromSymbolStart = "484">
</Location>
<Location
uuid = "E359E523-3519-496C-8634-30B842625020 - 972ab115af337bd3"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXDeviceListVC machineButton:button:]"
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/DXDeviceListVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "324"
endingLineNumber = "324"
offsetFromSymbolStart = "100">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "AE62525A-FDB8-4523-909B-B4D7A3305DB3"
shouldBeEnabled = "Yes"
ignoreCount = "0"
......@@ -175,6 +127,21 @@
endingLineNumber = "803"
offsetFromSymbolStart = "40">
</Location>
<Location
uuid = "AE62525A-FDB8-4523-909B-B4D7A3305DB3 - 5097582193a1d7c2"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[HJBluetoothManager checkDeviceVersionWithResult:binUrl:]"
moduleName = "HJMDrWarter"
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>
......@@ -193,38 +160,6 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "206E05D5-BECB-4FF3-8127-15C7E2245ECF"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/HomePage/Controller/XHMainVC1.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1487"
endingLineNumber = "1487"
landmarkName = "-setGestationRecordId:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "6E1E1A56-5D97-418B-8D8A-D348300D29CC"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "238"
endingLineNumber = "238"
landmarkName = "-saveRecord:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "E8BF8F50-9FFE-4F6A-AC94-B3D28C372550"
shouldBeEnabled = "Yes"
ignoreCount = "0"
......@@ -273,49 +208,17 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "606EE620-8EB7-41B4-9247-C0DF004BE693"
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 = "234"
endingLineNumber = "234"
landmarkName = "-saveRecord:"
startingLineNumber = "1559"
endingLineNumber = "1559"
landmarkName = "-changePumpSpeedWithSize:"
landmarkType = "7">
<Locations>
<Location
uuid = "606EE620-8EB7-41B4-9247-C0DF004BE693 - b459135280a193fd"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[XHParentVC saveRecord:]"
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"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "234"
endingLineNumber = "234"
offsetFromSymbolStart = "2716">
</Location>
<Location
uuid = "606EE620-8EB7-41B4-9247-C0DF004BE693 - 34b9e1ee23678e83"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__25-[XHParentVC saveRecord:]_block_invoke"
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"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "235"
endingLineNumber = "235"
offsetFromSymbolStart = "60">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
......
DJMHomeTY/AppDelegate/AppDelegate.m
......@@ -186,7 +186,7 @@
[weakSelf setAppWindows];
[weakSelf setRootViewController];
});
// [self requestGiftLink];
[self requestGiftLink];
}//
......
DJMHomeTY/Page/DeviceListPage/Controller/DXAddBannerVC.h 0 → 100644
//
// DXAddBannerVC.h
// DJMHomeTY
//
// Created by 大雄 on 2024/6/7.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface DXAddBannerVC : UIViewController
@property (nonatomic,copy) NSString *url;
@end
NS_ASSUME_NONNULL_END
DJMHomeTY/Page/DeviceListPage/Controller/DXAddBannerVC.m 0 → 100644
//
// DXAddBannerVC.m
// DJMHomeTY
//
// Created by 大雄 on 2024/6/7.
//
#import "DXAddBannerVC.h"
#import <WebKit/WebKit.h>
#import <CoreLocation/CoreLocation.h>
#import "MapKit/MapKit.h"
@interface DXAddBannerVC ()<WKNavigationDelegate,WKUIDelegate,CLLocationManagerDelegate>{
CLLocationManager*locationmanager;//定位服务
NSString*strlatitude;//经度
NSString*strlongitude;//纬度
UIAlertController *alert;
}
@property (nonatomic,strong) WKWebView *webView;
@end
@implementation DXAddBannerVC
#pragma mark --系统方法
- (void)viewDidLoad {
[super viewDidLoad];
[self initData];
[self initUI];
[self requestData];
// [self startLocation];
}
- (void)viewWillAppear:(BOOL)animated{
[super viewWillAppear:animated];
self.tabBarController.tabBar.hidden = YES;
}
- (void)viewWillDisappear:(BOOL)animated{
[super viewWillDisappear:animated];
self.tabBarController.tabBar.hidden = NO;
}
#pragma mark --初始化UI
- (void)initUI
{
self.view.backgroundColor = [UIColor whiteColor];
// self.navigationController.navigationBar.hidden = YES;
[self.view addSubview:self.webView];
[self.webView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.equalTo(self.view);
make.top.mas_equalTo(0);
make.bottom.mas_equalTo(self.view).offset(83);
}];
}//
#pragma mark --初始化数据
- (void)initData
{
[self.webView addObserver:self forKeyPath:@"title" options:NSKeyValueObservingOptionNew context:NULL];
[self.webView addObserver:self forKeyPath:@"URL" options:NSKeyValueObservingOptionNew context:nil];
}
#pragma mark --网络请求
- (void)requestData
{
if (!self.url || [self.url isEqualToString:@""]) {
// self.url = XHGetDataManager.giftLink;
self.url = [NSString stringWithFormat:@"%@?token=%@",XHGetDataManager.giftLink,XHGetDataManager.token];
self.navigationController.navigationBar.hidden = YES;
}else{
self.navigationController.navigationBar.hidden = NO;
}
//http://djmfa.imoreme.com/#/pages/goshop/goshop?token=
NSURL *url = [NSURL URLWithString:self.url];
// 根据URL创建请求
// NSURLRequest *request = [NSURLRequest requestWithURL:url];
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
[request setValue:@"no-cache" forHTTPHeaderField:@"Cache-Control"];
// WKWebView加载请求
[self.webView loadRequest:request];
}
#pragma mark --交互方法
- (void)setUrl:(NSString *)url{
// url = @"https://www.baidu.com";
_url = url;
NSURL *url1 = [NSURL URLWithString:url];
// 根据URL创建请求
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url1];
[request setValue:@"no-cache" forHTTPHeaderField:@"Cache-Control"];
// NSURLRequest *request = [NSURLRequest requestWithURL:url1];
// WKWebView加载请求
[self.webView loadRequest:request];
}
#pragma mark --委托代理
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
if ([keyPath isEqualToString:@"title"]) {
// NSString *title = (NSString *)change[NSKeyValueChangeNewKey];
// self.title = title;
}else if ([keyPath isEqualToString:@"URL"]){
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);
// 创建一个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];
}
// });
// https://mapapi.qq.com/web/mapComponents/locationMarker/v/index.html?marker=coord:22.53332,113.93041;title:测;addr:给对方Fghh
}
// [_webView.scrollView setContentInsetAdjustmentBehavior:UIScrollViewContentInsetAdjustmentNever];
}
- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void(^)(WKNavigationActionPolicy))decisionHandler {
// decisionHandler(WKNavigationActionPolicyAllow);
// 允许链接跳转
if ([navigationAction.request.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:navigationAction.request.URL.absoluteString options:0 range:NSMakeRange(0, navigationAction.request.URL.absoluteString.length)];
// 如果找到匹配项，则提取相应的值
if (result) {
NSString *eword = [navigationAction.request.URL.absoluteString substringWithRange:[result rangeAtIndex:1]];
NSString *epointx = [navigationAction.request.URL.absoluteString substringWithRange:[result rangeAtIndex:2]];
NSString *epointy = [navigationAction.request.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]]; // 设置地点的名称，可选
// 设置地图选项
// NSDictionary *options = @{
// MKLaunchOptionsMapCenterKey: [NSValue valueWithMKCoordinate:placemark.coordinate],
// MKLaunchOptionsMapSpanKey: [NSValue valueWithMKCoordinateSpan:MKCoordinateSpanMake(0.01, 0.01)]
// };
[mapItem openInMapsWithLaunchOptions:@{MKLaunchOptionsDirectionsModeKey: MKLaunchOptionsDirectionsModeDriving,MKLaunchOptionsShowsTrafficKey: [NSNumber numberWithBool:YES]}];
// 使用mapItem打开苹果地图应用，并指定选项
// [mapItem openInMapsWithLaunchOptions:options];
}
decisionHandler(WKNavigationActionPolicyCancel);
} else {
decisionHandler(WKNavigationActionPolicyAllow);
}
}
#pragma mark --懒加载
- (WKWebView *)webView
{
if (nil == _webView) {
// 可以做一些初始化配置定制
WKWebViewConfiguration *configuration = [[WKWebViewConfiguration alloc] init];
configuration.selectionGranularity = WKSelectionGranularityDynamic;
configuration.allowsInlineMediaPlayback = YES;
WKPreferences *preferences = [WKPreferences new];
//是否支持JavaScript
preferences.javaScriptEnabled = YES;
//不通过用户交互，是否可以打开窗口
preferences.javaScriptCanOpenWindowsAutomatically = YES;
configuration.preferences = preferences;
// 初始化WKWebView
_webView = [[WKWebView alloc] initWithFrame:[UIScreen mainScreen].bounds configuration:configuration];
// self.edgesForExtendedLayout = false;
// 有两种代理，UIDelegate负责界面弹窗，navigationDelegate负责加载、跳转等
_webView.UIDelegate = self;
_webView.navigationDelegate = self;
}
return _webView;
}
-(void) startLocation
{
//判断定位功能是否打开
if ([CLLocationManager locationServicesEnabled]) {
locationmanager = [[CLLocationManager alloc]init];
locationmanager.delegate = self;
[locationmanager requestAlwaysAuthorization];
[locationmanager requestWhenInUseAuthorization];
//设置寻址精度
locationmanager.distanceFilter=kCLDistanceFilterNone;//实时更新定位位置
locationmanager.pausesLocationUpdatesAutomatically=NO;
locationmanager.desiredAccuracy = kCLLocationAccuracyBest;
locationmanager.distanceFilter = 5.0;
[locationmanager startUpdatingLocation];
}else{
// WFUserInfo *info = [WFUserInfo share];
//
// [self checkAuth:@"定位服务已关闭 您需要打开定位权限，以便提升数据的获取速度。请到设置->隐私->定位服务中开启【洗脸猫】的定位服务"];
}
}
//开始定位
-(void) startLocations
{
//判断定位功能是否打开
if ([CLLocationManager authorizationStatus] ==kCLAuthorizationStatusDenied) {
// locationmanager = [[CLLocationManager alloc]init];
// locationmanager.delegate = self;
// [locationmanager requestAlwaysAuthorization];
// [locationmanager requestWhenInUseAuthorization];
//
// //设置寻址精度
// locationmanager.desiredAccuracy = kCLLocationAccuracyBest;
// locationmanager.distanceFilter = 5.0;
// [locationmanager startUpdatingLocation];
return;
}else{
// WFUserInfo *info = [WFUserInfo share];
// [self checkAuth:@"定位服务已关闭 您需要打开定位权限，以便提升数据的获取速度。请到设置->隐私->定位服务中开启【】的定位服务"];
// [SVProgressHUD dismiss];
return;
}
}
@end
DJMHomeTY/Page/DeviceListPage/Controller/DXBannerVC.m
......@@ -35,6 +35,7 @@
[self requestData];
// [self startLocation];
}
#pragma mark --初始化UI
- (void)initUI
{
......
DJMHomeTY/Page/DeviceListPage/Controller/DXDeviceListVC.m
......@@ -13,6 +13,7 @@
#import "DXHFXVC.h"
#import "DXBannerVC.h"
#import "DXHotElectricVC.h"
#import "DXAddBannerVC.h"
static NSString *dxmachineCell = @"DXDeviceListCell";
@interface DXDeviceListVC ()<UITableViewDelegate,UITableViewDataSource,XHCountDownButtonDelegate,DXDeviceListCellDelegate>
......@@ -111,16 +112,19 @@ static NSString *dxmachineCell = @"DXDeviceListCell";
// _bannerView.layer.masksToBounds = YES;
// _bannerView.layer.cornerRadius = 13;
_bannerView.clickItemOperationBlock = ^(NSInteger index) {
DXBannerVC *banner = [DXBannerVC new];
DXAddBannerVC *banner = [DXAddBannerVC new];
banner.url = weakSelf.linkArray[index];
if(banner.url && ![banner.url isEqualToString:@""]){
if ([banner.url containsString:@"http://djmfa.imoreme.com"]) {
banner.hidesBottomBarWhenPushed = YES;
[weakSelf.tabBarController setSelectedIndex:1];
}else{
[weakSelf.navigationController pushViewController:banner animated:YES];
}
[weakSelf.navigationController pushViewController:banner animated:YES];
banner.hidesBottomBarWhenPushed = YES;
// if ([banner.url containsString:@"http://djmfa.imoreme.com"]) {
// banner.hidesBottomBarWhenPushed = YES;
// [weakSelf.tabBarController setSelectedIndex:1];
// }else{
// [weakSelf.navigationController pushViewController:banner animated:YES];
// }
//
......
Podfile.lock
......@@ -84,7 +84,7 @@ SPEC REPOS:
- ZFPlayer
SPEC CHECKSUMS:
AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
CocoaSecurity: d288a6f87e0f363823d2cb83e753814a6944f71a
GVUserDefaults: 52d48cf8ba578b40a1a76312b196dfc9134ba36a
......
Pods/Manifest.lock
......@@ -84,7 +84,7 @@ SPEC REPOS:
- ZFPlayer
SPEC CHECKSUMS:
AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
CocoaSecurity: d288a6f87e0f363823d2cb83e753814a6944f71a
GVUserDefaults: 52d48cf8ba578b40a1a76312b196dfc9134ba36a
......
Pods/Pods.xcodeproj/project.pbxproj
......@@ -1213,11 +1213,11 @@
2A378C4B62F38B6196E5D07BCE50DAA7 /* MJRefreshBackStateFooter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MJRefreshBackStateFooter.h; path = MJRefresh/Custom/Footer/Back/MJRefreshBackStateFooter.h; sourceTree = "<group>"; };
2ADD9F67C676DC8321130589FD4ECA20 /* TAPageControl.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = TAPageControl.m; path = SDCycleScrollView/Lib/SDCycleScrollView/PageControl/TAPageControl.m; sourceTree = "<group>"; };
2AEA88AF4DB9631A3767679EFCB25847 /* AFURLSessionManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFURLSessionManager.m; path = AFNetworking/AFURLSessionManager.m; sourceTree = "<group>"; };
2B276B0A79173A1D6E83C9B4FB9A4A57 /* MJExtension */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = MJExtension; path = MJExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2B276B0A79173A1D6E83C9B4FB9A4A57 /* MJExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MJExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2B2F69BC9A0D04F04F6B1AAE78725017 /* SDWebImageTransition.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SDWebImageTransition.m; path = SDWebImage/Core/SDWebImageTransition.m; sourceTree = "<group>"; };
2B3B7C0A5AEA4B0E09461190CDB10D43 /* SDAssociatedObject.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SDAssociatedObject.h; path = SDWebImage/Private/SDAssociatedObject.h; sourceTree = "<group>"; };
2BCE38CCBE9E56333F1C95C341B26730 /* Pods-DJMHomeDR-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-DJMHomeDR-dummy.m"; sourceTree = "<group>"; };
2BD64C6176042118865C3300CA922E4D /* Pods-DJMHomeDR */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = "Pods-DJMHomeDR"; path = Pods_DJMHomeDR.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2BD64C6176042118865C3300CA922E4D /* Pods_DJMHomeDR.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_DJMHomeDR.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2C0FB4C4A01B4B41EFACF5A591C380AE /* MJPropertyType.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MJPropertyType.h; path = MJExtension/MJPropertyType.h; sourceTree = "<group>"; };
2C284A787EEBCE1718B1E92E2607B5CF /* MJRefreshAutoFooter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MJRefreshAutoFooter.m; path = MJRefresh/Base/MJRefreshAutoFooter.m; sourceTree = "<group>"; };
2CC253B9E25F7782C8850D0903F854AD /* KTVHCDownload.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = KTVHCDownload.h; path = KTVHTTPCache/Classes/KTVHCDownload/KTVHCDownload.h; sourceTree = "<group>"; };
......@@ -1447,7 +1447,7 @@
7D9E8DCCF3786823E6A33CA5FBBDDB4B /* Pods-HJMDrWarter-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-HJMDrWarter-umbrella.h"; sourceTree = "<group>"; };
7E271E18ACCC6B5504309342996F8470 /* HTTPServer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = HTTPServer.h; path = KTVCocoaHTTPServer/Classes/HTTPServer.h; sourceTree = "<group>"; };
7E90D973DF13BBFCA72F590DA5D5867E /* KTVHCHTTPConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = KTVHCHTTPConnection.h; path = KTVHTTPCache/Classes/KTVHCHTTPServer/KTVHCHTTPConnection.h; sourceTree = "<group>"; };
7EC433E8BAD0BDC9CD95443247F7003B /* Pods-DJMPS2 */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = "Pods-DJMPS2"; path = Pods_DJMPS2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7EC433E8BAD0BDC9CD95443247F7003B /* Pods_DJMPS2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_DJMPS2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7EE39A6AD6990DA4ABE4C4050008B4FE /* ZFPortraitViewController.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = ZFPortraitViewController.m; path = ZFPlayer/Classes/Core/ZFPortraitViewController.m; sourceTree = "<group>"; };
7F203964B94DCC7B9499F0AB658C642E /* ZFReachabilityManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = ZFReachabilityManager.m; path = ZFPlayer/Classes/Core/ZFReachabilityManager.m; sourceTree = "<group>"; };
7F90E4C05FF747FB077E4C5414E430E8 /* AFURLResponseSerialization.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFURLResponseSerialization.m; path = AFNetworking/AFURLResponseSerialization.m; sourceTree = "<group>"; };
......@@ -1547,7 +1547,7 @@
A4B23EF105307DC78119AE86FB57FE09 /* CocoaSecurity-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CocoaSecurity-prefix.pch"; sourceTree = "<group>"; };
A4B3232EC7E8FB8E3020110EB176AFCC /* Masonry-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Masonry-prefix.pch"; sourceTree = "<group>"; };
A4ECEB53325812289BDAA0C5F4836373 /* KTVCocoaHTTPServer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = KTVCocoaHTTPServer.h; path = KTVCocoaHTTPServer/KTVCocoaHTTPServer.h; sourceTree = "<group>"; };
A4FA15D44DF6BAC7550EDEED10862AA3 /* AFNetworking */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = AFNetworking; path = AFNetworking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
A4FA15D44DF6BAC7550EDEED10862AA3 /* AFNetworking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AFNetworking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
A5059A8D1E803DD188058DB9B8FD47C7 /* SDImageAssetManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SDImageAssetManager.m; path = SDWebImage/Private/SDImageAssetManager.m; sourceTree = "<group>"; };
A63D9EC4A5FCC1E8001143C438A74F63 /* KTVHTTPCache.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = KTVHTTPCache.modulemap; sourceTree = "<group>"; };
A68D101B595111707A0E55B0A45D664B /* SDImageAWebPCoder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SDImageAWebPCoder.m; path = SDWebImage/Core/SDImageAWebPCoder.m; sourceTree = "<group>"; };
......@@ -1583,7 +1583,7 @@
AFDA21C889B462DDE10B14555EC04300 /* NSObject+MJClass.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSObject+MJClass.h"; path = "MJExtension/NSObject+MJClass.h"; sourceTree = "<group>"; };
B03D6ED99CCCF627D387FA6DE114845E /* Pods-HJMDrWarter-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-HJMDrWarter-dummy.m"; sourceTree = "<group>"; };
B09B6C4B7DE73B520E9CC501C6CBFED6 /* UIViewController+ZFPlayerRotation.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIViewController+ZFPlayerRotation.m"; path = "ZFPlayer/Classes/Core/UIViewController+ZFPlayerRotation.m"; sourceTree = "<group>"; };
B0B214D775196BA7CA8E17E53048A493 /* SDWebImage */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = SDWebImage; path = SDWebImage.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B0B214D775196BA7CA8E17E53048A493 /* SDWebImage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDWebImage.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B0D20416B22ABDA1350DFFC3AB749748 /* SDImageIOAnimatedCoder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SDImageIOAnimatedCoder.m; path = SDWebImage/Core/SDImageIOAnimatedCoder.m; sourceTree = "<group>"; };
B128FC7FAC4C7D302ACD0B01871052E6 /* SVIndefiniteAnimatedView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SVIndefiniteAnimatedView.h; path = SVProgressHUD/SVIndefiniteAnimatedView.h; sourceTree = "<group>"; };
B19F5D1F7D936923B1375846C22B1915 /* View+MASShorthandAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "View+MASShorthandAdditions.h"; path = "Masonry/View+MASShorthandAdditions.h"; sourceTree = "<group>"; };
......@@ -1713,7 +1713,7 @@
E425B5FDF63B38FCF0BFD4384BD8AD61 /* ZFPlayer.bundle */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "wrapper.plug-in"; name = ZFPlayer.bundle; path = ZFPlayer/Classes/ControlView/ZFPlayer.bundle; sourceTree = "<group>"; };
E43E6764D9CCD2146C3F6FD293BEA056 /* GVUserDefaults.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = GVUserDefaults.modulemap; sourceTree = "<group>"; };
E477571A8EF99756022D046ED5915C51 /* MASConstraint.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MASConstraint.m; path = Masonry/MASConstraint.m; sourceTree = "<group>"; };
E49D6D248DD1CEE584E6776B9164A1B2 /* MJRefresh */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = MJRefresh; path = MJRefresh.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E49D6D248DD1CEE584E6776B9164A1B2 /* MJRefresh.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MJRefresh.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E49F18CA1354F6D6CB015B6948FFA599 /* AFNetworking-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "AFNetworking-prefix.pch"; sourceTree = "<group>"; };
E4B6817F517E24227E22109C83213163 /* JZLocationConverter.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = JZLocationConverter.release.xcconfig; sourceTree = "<group>"; };
E50A4DCA69D200532DCA94D1E28D4A12 /* AFURLSessionManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFURLSessionManager.h; path = AFNetworking/AFURLSessionManager.h; sourceTree = "<group>"; };
......@@ -1765,7 +1765,7 @@
F67C0A495C01E04D16E4894D6C4959FB /* SVProgressHUD.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SVProgressHUD.h; path = SVProgressHUD/SVProgressHUD.h; sourceTree = "<group>"; };
F6D07DB4E9B2CDD7F5E1A8C585DAE9EC /* UIView+WebCacheOperation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIView+WebCacheOperation.h"; path = "SDWebImage/Core/UIView+WebCacheOperation.h"; sourceTree = "<group>"; };
F721EFC52BDCF8ED0F0E5A83FEF1E761 /* SDImageGIFCoder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SDImageGIFCoder.h; path = SDWebImage/Core/SDImageGIFCoder.h; sourceTree = "<group>"; };
F735F566F6486E4E68A504903171C287 /* Pods-DJMHomeTY */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = "Pods-DJMHomeTY"; path = Pods_DJMHomeTY.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F735F566F6486E4E68A504903171C287 /* Pods_DJMHomeTY.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_DJMHomeTY.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F74E169251A5CB00785540CBFFA28DED /* SDDeviceHelper.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SDDeviceHelper.m; path = SDWebImage/Private/SDDeviceHelper.m; sourceTree = "<group>"; };
F7D7426E71B73DE176F4A579C6CBEAD2 /* Pods-DJMHomeDR-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-DJMHomeDR-umbrella.h"; sourceTree = "<group>"; };
F80244BE5138D76CFD22F78447B80C37 /* MJProperty.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MJProperty.m; path = MJExtension/MJProperty.m; sourceTree = "<group>"; };
......@@ -2206,7 +2206,7 @@
49C7CC01D28498601461E792CBA4FD0C /* Products */ = {
isa = PBXGroup;
children = (
A4FA15D44DF6BAC7550EDEED10862AA3 /* AFNetworking */,
A4FA15D44DF6BAC7550EDEED10862AA3 /* AFNetworking.framework */,
6CBEFE4F9E22AFDC6347A739BB35FF8C /* CocoaAsyncSocket.framework */,
7697F522E1E2F8AAED486E20B7210E8D /* CocoaSecurity.framework */,
B9059712611CC1401783300DD3E99188 /* GVUserDefaults.framework */,
......@@ -2216,14 +2216,14 @@
25BB7D389AA57F912B6D70E4FEB7FE16 /* KTVHTTPCache.framework */,
1FFED36A657123030ABB700256D73F15 /* Masonry.framework */,
8B8FAB0D627B17EDE1366984278705D9 /* MBProgressHUD.framework */,
2B276B0A79173A1D6E83C9B4FB9A4A57 /* MJExtension */,
E49D6D248DD1CEE584E6776B9164A1B2 /* MJRefresh */,
2BD64C6176042118865C3300CA922E4D /* Pods-DJMHomeDR */,
F735F566F6486E4E68A504903171C287 /* Pods-DJMHomeTY */,
7EC433E8BAD0BDC9CD95443247F7003B /* Pods-DJMPS2 */,
2B276B0A79173A1D6E83C9B4FB9A4A57 /* MJExtension.framework */,
E49D6D248DD1CEE584E6776B9164A1B2 /* MJRefresh.framework */,
2BD64C6176042118865C3300CA922E4D /* Pods_DJMHomeDR.framework */,
F735F566F6486E4E68A504903171C287 /* Pods_DJMHomeTY.framework */,
7EC433E8BAD0BDC9CD95443247F7003B /* Pods_DJMPS2.framework */,
912C5A3E61557F4080DB00E781D87209 /* Pods_HJMDrWarter.framework */,
8B6CF5C20C32EE9F7F0862FF892524DE /* SDCycleScrollView.framework */,
B0B214D775196BA7CA8E17E53048A493 /* SDWebImage */,
B0B214D775196BA7CA8E17E53048A493 /* SDWebImage.framework */,
E97D43C46A45EE515A4DA3AF94398441 /* SVProgressHUD.framework */,
ED363DD89BB17FB9F31F94524BA59CBB /* ZFPlayer.framework */,
);
......@@ -3582,7 +3582,7 @@
);
name = AFNetworking;
productName = AFNetworking;
productReference = A4FA15D44DF6BAC7550EDEED10862AA3 /* AFNetworking */;
productReference = A4FA15D44DF6BAC7550EDEED10862AA3 /* AFNetworking.framework */;
productType = "com.apple.product-type.framework";
};
105186B500AA09A533997F3D16DF7B9E /* KTVCocoaHTTPServer */ = {
......@@ -3637,7 +3637,7 @@
);
name = SDWebImage;
productName = SDWebImage;
productReference = B0B214D775196BA7CA8E17E53048A493 /* SDWebImage */;
productReference = B0B214D775196BA7CA8E17E53048A493 /* SDWebImage.framework */;
productType = "com.apple.product-type.framework";
};
4D3BA58D0583DF37575CACAB3DDADC85 /* MJExtension */ = {
......@@ -3655,7 +3655,7 @@
);
name = MJExtension;
productName = MJExtension;
productReference = 2B276B0A79173A1D6E83C9B4FB9A4A57 /* MJExtension */;
productReference = 2B276B0A79173A1D6E83C9B4FB9A4A57 /* MJExtension.framework */;
productType = "com.apple.product-type.framework";
};
53A1C16A1948B1223752744D56459E7B /* Pods-DJMHomeDR */ = {
......@@ -3690,7 +3690,7 @@
);
name = "Pods-DJMHomeDR";
productName = Pods_DJMHomeDR;
productReference = 2BD64C6176042118865C3300CA922E4D /* Pods-DJMHomeDR */;
productReference = 2BD64C6176042118865C3300CA922E4D /* Pods_DJMHomeDR.framework */;
productType = "com.apple.product-type.framework";
};
55AF53E6C77A10ED4985E04D74A8878E /* Masonry */ = {
......@@ -3743,7 +3743,7 @@
);
name = "Pods-DJMHomeTY";
productName = Pods_DJMHomeTY;
productReference = F735F566F6486E4E68A504903171C287 /* Pods-DJMHomeTY */;
productReference = F735F566F6486E4E68A504903171C287 /* Pods_DJMHomeTY.framework */;
productType = "com.apple.product-type.framework";
};
6083682834ABE0AE7BD1CBF06CADD036 /* CocoaAsyncSocket */ = {
......@@ -3814,7 +3814,7 @@
);
name = MJRefresh;
productName = MJRefresh;
productReference = E49D6D248DD1CEE584E6776B9164A1B2 /* MJRefresh */;
productReference = E49D6D248DD1CEE584E6776B9164A1B2 /* MJRefresh.framework */;
productType = "com.apple.product-type.framework";
};
82B0A41D3031FF27D78E17B0A9A46FB0 /* MBProgressHUD */ = {
......@@ -3905,7 +3905,7 @@
);
name = "Pods-DJMPS2";
productName = Pods_DJMPS2;
productReference = 7EC433E8BAD0BDC9CD95443247F7003B /* Pods-DJMPS2 */;
productReference = 7EC433E8BAD0BDC9CD95443247F7003B /* Pods_DJMPS2.framework */;
productType = "com.apple.product-type.framework";
};
AD364BEC9F48BB6838C4913361D55A9F /* GVUserDefaults */ = {
......@@ -4005,8 +4005,8 @@
BFDFE7DC352907FC980B868725387E98 /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1300;
LastUpgradeCheck = 1300;
LastSwiftUpdateCheck = 1240;
LastUpgradeCheck = 1240;
};
buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */;
compatibilityVersion = "Xcode 12.0";
......@@ -5077,7 +5077,7 @@
GCC_PREFIX_HEADER = "Target Support Files/SDWebImage/SDWebImage-prefix.pch";
INFOPLIST_FILE = "Target Support Files/SDWebImage/SDWebImage-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......@@ -5264,7 +5264,7 @@
GCC_PREFIX_HEADER = "Target Support Files/MJExtension/MJExtension-prefix.pch";
INFOPLIST_FILE = "Target Support Files/MJExtension/MJExtension-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......@@ -5330,7 +5330,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "Target Support Files/Pods-DJMHomeTY/Pods-DJMHomeTY-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......@@ -5400,7 +5400,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "Target Support Files/Pods-DJMPS2/Pods-DJMPS2-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......@@ -5469,7 +5469,7 @@
GCC_PREFIX_HEADER = "Target Support Files/MJRefresh/MJRefresh-prefix.pch";
INFOPLIST_FILE = "Target Support Files/MJRefresh/MJRefresh-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......@@ -5503,7 +5503,7 @@
GCC_PREFIX_HEADER = "Target Support Files/MJExtension/MJExtension-prefix.pch";
INFOPLIST_FILE = "Target Support Files/MJExtension/MJExtension-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......@@ -5537,7 +5537,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "Target Support Files/Pods-DJMHomeDR/Pods-DJMHomeDR-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......@@ -5573,7 +5573,7 @@
GCC_PREFIX_HEADER = "Target Support Files/SDWebImage/SDWebImage-prefix.pch";
INFOPLIST_FILE = "Target Support Files/SDWebImage/SDWebImage-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......@@ -5676,7 +5676,7 @@
GCC_PREFIX_HEADER = "Target Support Files/MJRefresh/MJRefresh-prefix.pch";
INFOPLIST_FILE = "Target Support Files/MJRefresh/MJRefresh-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......@@ -5778,7 +5778,7 @@
GCC_PREFIX_HEADER = "Target Support Files/AFNetworking/AFNetworking-prefix.pch";
INFOPLIST_FILE = "Target Support Files/AFNetworking/AFNetworking-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......@@ -6013,7 +6013,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "Target Support Files/Pods-DJMHomeDR/Pods-DJMHomeDR-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......@@ -6118,7 +6118,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "Target Support Files/Pods-DJMHomeTY/Pods-DJMHomeTY-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......@@ -6332,7 +6332,7 @@
GCC_PREFIX_HEADER = "Target Support Files/AFNetworking/AFNetworking-prefix.pch";
INFOPLIST_FILE = "Target Support Files/AFNetworking/AFNetworking-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......@@ -6465,7 +6465,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "Target Support Files/Pods-DJMPS2/Pods-DJMPS2-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......
Pods/Pods.xcodeproj/xcuserdata/lushaoxiong.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -104,11 +104,6 @@
<key>isShown</key>
<false/>
</dict>
<key>YModemLib.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
</dict>
<key>ZFPlayer.xcscheme</key>
<dict>
<key>isShown</key>
......
Pods/Target Support Files/Pods-DJMHomeDR/Pods-DJMHomeDR-frameworks.sh
......@@ -41,7 +41,7 @@ install_framework()
if [ -L "${source}" ]; then
echo "Symlinked..."
source="$(readlink "${source}")"
source="$(readlink -f "${source}")"
fi
if [ -d "${source}/${BCSYMBOLMAP_DIR}" ]; then
......
Pods/Target Support Files/Pods-DJMHomeTY/Pods-DJMHomeTY-frameworks.sh
......@@ -41,7 +41,7 @@ install_framework()
if [ -L "${source}" ]; then
echo "Symlinked..."
source="$(readlink "${source}")"
source="$(readlink -f "${source}")"
fi
if [ -d "${source}/${BCSYMBOLMAP_DIR}" ]; then
......
Pods/Target Support Files/Pods-DJMPS2/Pods-DJMPS2-frameworks.sh
......@@ -41,7 +41,7 @@ install_framework()
if [ -L "${source}" ]; then
echo "Symlinked..."
source="$(readlink "${source}")"
source="$(readlink -f "${source}")"
fi
if [ -d "${source}/${BCSYMBOLMAP_DIR}" ]; then
......
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