Skip to content

D
DrWater
Commit b642b69d by 路少雄
Options

H5

parent 3807f2b4
Showing with 68 additions and 137 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/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.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/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/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