Skip to content

D
DrWater
Commit ff544d2f by 路少雄
Options

1.3.1线上版本

parent 62b6f571
Showing with 421 additions and 872 deletions
DJMHomeTY.xcodeproj/project.pbxproj
......@@ -18,6 +18,34 @@
390F59A92DF9636A00D6D06C /* JoystickIntroManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59A72DF9636A00D6D06C /* JoystickIntroManager.m */; };
390F59AA2DF9636A00D6D06C /* JoystickIntroManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59A72DF9636A00D6D06C /* JoystickIntroManager.m */; };
390F59AB2DF9636A00D6D06C /* JoystickIntroManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59A72DF9636A00D6D06C /* JoystickIntroManager.m */; };
390F59EC2E014D2700D6D06C /* XHCustomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E32E014D2700D6D06C /* XHCustomView.m */; };
390F59ED2E014D2700D6D06C /* XHCustomSetTimes.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E12E014D2700D6D06C /* XHCustomSetTimes.m */; };
390F59EE2E014D2700D6D06C /* XHNoConnectView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E52E014D2700D6D06C /* XHNoConnectView.m */; };
390F59EF2E014D2700D6D06C /* XHMainVC1.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59DB2E014D2700D6D06C /* XHMainVC1.m */; };
390F59F02E014D2700D6D06C /* XHSmartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E92E014D2700D6D06C /* XHSmartView.m */; };
390F59F12E014D2700D6D06C /* XHSelectModelView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E72E014D2700D6D06C /* XHSelectModelView.m */; };
390F59F22E014D2700D6D06C /* XHCustomSettimesModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59DE2E014D2700D6D06C /* XHCustomSettimesModel.m */; };
390F59F32E014D2700D6D06C /* XHCustomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E32E014D2700D6D06C /* XHCustomView.m */; };
390F59F42E014D2700D6D06C /* XHCustomSetTimes.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E12E014D2700D6D06C /* XHCustomSetTimes.m */; };
390F59F52E014D2700D6D06C /* XHNoConnectView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E52E014D2700D6D06C /* XHNoConnectView.m */; };
390F59F62E014D2700D6D06C /* XHMainVC1.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59DB2E014D2700D6D06C /* XHMainVC1.m */; };
390F59F72E014D2700D6D06C /* XHSmartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E92E014D2700D6D06C /* XHSmartView.m */; };
390F59F82E014D2700D6D06C /* XHSelectModelView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E72E014D2700D6D06C /* XHSelectModelView.m */; };
390F59F92E014D2700D6D06C /* XHCustomSettimesModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59DE2E014D2700D6D06C /* XHCustomSettimesModel.m */; };
390F59FA2E014D2700D6D06C /* XHCustomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E32E014D2700D6D06C /* XHCustomView.m */; };
390F59FB2E014D2700D6D06C /* XHCustomSetTimes.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E12E014D2700D6D06C /* XHCustomSetTimes.m */; };
390F59FC2E014D2700D6D06C /* XHNoConnectView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E52E014D2700D6D06C /* XHNoConnectView.m */; };
390F59FD2E014D2700D6D06C /* XHMainVC1.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59DB2E014D2700D6D06C /* XHMainVC1.m */; };
390F59FE2E014D2700D6D06C /* XHSmartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E92E014D2700D6D06C /* XHSmartView.m */; };
390F59FF2E014D2700D6D06C /* XHSelectModelView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E72E014D2700D6D06C /* XHSelectModelView.m */; };
390F5A002E014D2700D6D06C /* XHCustomSettimesModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59DE2E014D2700D6D06C /* XHCustomSettimesModel.m */; };
390F5A012E014D2700D6D06C /* XHCustomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E32E014D2700D6D06C /* XHCustomView.m */; };
390F5A022E014D2700D6D06C /* XHCustomSetTimes.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E12E014D2700D6D06C /* XHCustomSetTimes.m */; };
390F5A032E014D2700D6D06C /* XHNoConnectView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E52E014D2700D6D06C /* XHNoConnectView.m */; };
390F5A042E014D2700D6D06C /* XHMainVC1.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59DB2E014D2700D6D06C /* XHMainVC1.m */; };
390F5A052E014D2700D6D06C /* XHSmartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E92E014D2700D6D06C /* XHSmartView.m */; };
390F5A062E014D2700D6D06C /* XHSelectModelView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59E72E014D2700D6D06C /* XHSelectModelView.m */; };
390F5A072E014D2700D6D06C /* XHCustomSettimesModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59DE2E014D2700D6D06C /* XHCustomSettimesModel.m */; };
39D57E752DD445C400FACDD5 /* DXDRPlusVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 39D57E742DD445C400FACDD5 /* DXDRPlusVC.m */; };
39D57E762DD445C400FACDD5 /* DXDRPlusVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 39D57E742DD445C400FACDD5 /* DXDRPlusVC.m */; };
39D57E772DD445C400FACDD5 /* DXDRPlusVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 39D57E742DD445C400FACDD5 /* DXDRPlusVC.m */; };
......@@ -121,22 +149,10 @@
880A7BEB29B093BB00B5F4C4 /* XHSelectCommandModelView.m in Sources */ = {isa = PBXBuildFile; fileRef = 880A7BEA29B093BB00B5F4C4 /* XHSelectCommandModelView.m */; };
880BFDB229A85D4B00B59CFA /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 880BFDA629A85D4B00B59CFA /* Localizable.strings */; };
880BFDB329A85D4B00B59CFA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 880BFDA829A85D4B00B59CFA /* InfoPlist.strings */; };
88314F922A0A168A0025FDDE /* XHCustomSettimesModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F852A0A168A0025FDDE /* XHCustomSettimesModel.m */; };
88314F932A0A168A0025FDDE /* XHNoConnectView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F872A0A168A0025FDDE /* XHNoConnectView.m */; };
88314F942A0A168A0025FDDE /* XHSelectModelView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F882A0A168A0025FDDE /* XHSelectModelView.m */; };
88314F952A0A168A0025FDDE /* XHCustomSetTimes.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F892A0A168A0025FDDE /* XHCustomSetTimes.m */; };
88314F962A0A168A0025FDDE /* XHCustomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F8B2A0A168A0025FDDE /* XHCustomView.m */; };
88314F972A0A168A0025FDDE /* XHSmartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F8F2A0A168A0025FDDE /* XHSmartView.m */; };
88314FB52A0A1AEF0025FDDE /* XHDRVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314FB42A0A1AEF0025FDDE /* XHDRVC.m */; };
88314FC42A0A1B600025FDDE /* XHDRView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314FC32A0A1B600025FDDE /* XHDRView.m */; };
88314FCB2A0A1BC30025FDDE /* XHDRVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314FB42A0A1AEF0025FDDE /* XHDRVC.m */; };
88314FCC2A0A1BC30025FDDE /* XHDRView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314FC32A0A1B600025FDDE /* XHDRView.m */; };
88314FE72A0A1FEC0025FDDE /* XHCustomSettimesModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F852A0A168A0025FDDE /* XHCustomSettimesModel.m */; };
88314FE82A0A1FEC0025FDDE /* XHCustomSetTimes.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F892A0A168A0025FDDE /* XHCustomSetTimes.m */; };
88314FE92A0A1FEC0025FDDE /* XHCustomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F8B2A0A168A0025FDDE /* XHCustomView.m */; };
88314FEA2A0A1FEC0025FDDE /* XHNoConnectView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F872A0A168A0025FDDE /* XHNoConnectView.m */; };
88314FEB2A0A1FEC0025FDDE /* XHSelectModelView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F882A0A168A0025FDDE /* XHSelectModelView.m */; };
88314FEC2A0A1FEC0025FDDE /* XHSmartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F8F2A0A168A0025FDDE /* XHSmartView.m */; };
883150A72A0A2CB70025FDDE /* XHCountDownButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45A129A600B000A58A9A /* XHCountDownButton.m */; };
883150A82A0A2CB70025FDDE /* XHMineSetSexVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F07F1F29C1CB3000B2EBE6 /* XHMineSetSexVC.m */; };
883150A92A0A2CB70025FDDE /* XHTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45F029A600B500A58A9A /* XHTabBar.m */; };
......@@ -164,7 +180,6 @@
883150C32A0A2CB70025FDDE /* XHNsstringTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45AF29A600B100A58A9A /* XHNsstringTool.m */; };
883150C42A0A2CB70025FDDE /* HJTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45B529A600B100A58A9A /* HJTools.m */; };
883150C52A0A2CB70025FDDE /* XHParentVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45E929A600B500A58A9A /* XHParentVC.m */; };
883150C62A0A2CB70025FDDE /* XHCustomSettimesModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F852A0A168A0025FDDE /* XHCustomSettimesModel.m */; };
883150C72A0A2CB70025FDDE /* XHCommonMethods.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45B029A600B100A58A9A /* XHCommonMethods.m */; };
883150C82A0A2CB70025FDDE /* UIButton+HJButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45E329A600B400A58A9A /* UIButton+HJButton.m */; };
883150C92A0A2CB70025FDDE /* HJScanView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E7FC3029B3286C00F8585F /* HJScanView.m */; };
......@@ -187,7 +202,6 @@
883150DD2A0A2CB70025FDDE /* XHRecordCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E843AF29B9D40E00263DB0 /* XHRecordCell.m */; };
883150DE2A0A2CB70025FDDE /* UITextView+XHPlaceHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E457D29A600B000A58A9A /* UITextView+XHPlaceHolder.m */; };
883150DF2A0A2CB70025FDDE /* XHMineVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E8438D29B9822100263DB0 /* XHMineVC.m */; };
883150E02A0A2CB70025FDDE /* XHNoConnectView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F872A0A168A0025FDDE /* XHNoConnectView.m */; };
883150E12A0A2CB70025FDDE /* NSString+HJExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45DD29A600B400A58A9A /* NSString+HJExtension.m */; };
883150E22A0A2CB70025FDDE /* XHSetFrequencyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E90CA329A74A7C009FAB0E /* XHSetFrequencyView.m */; };
883150E32A0A2CB70025FDDE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E456729A600A500A58A9A /* AppDelegate.m */; };
......@@ -203,7 +217,6 @@
883150EE2A0A2CB70025FDDE /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 88EF4FC5298BA4E4009835BF /* main.m */; };
883150EF2A0A2CB70025FDDE /* XHCollectCellModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D115F029B5D3ED009445EE /* XHCollectCellModel.m */; };
883150F02A0A2CB70025FDDE /* ZXSegmentHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E458029A600B000A58A9A /* ZXSegmentHeaderCell.m */; };
883150F12A0A2CB70025FDDE /* XHCustomSetTimes.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F892A0A168A0025FDDE /* XHCustomSetTimes.m */; };
883150F22A0A2CB70025FDDE /* XHDrawChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E458D29A600B000A58A9A /* XHDrawChartView.m */; };
883150F32A0A2CB70025FDDE /* XHSetModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 880A7BE429B0658C00B5F4C4 /* XHSetModel.m */; };
883150F42A0A2CB70025FDDE /* ZJAnimationPopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E7FC3929B32A7200F8585F /* ZJAnimationPopView.m */; };
......@@ -211,7 +224,6 @@
883150F62A0A2CB70025FDDE /* HJBluetoothManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45F429A600B500A58A9A /* HJBluetoothManager.m */; };
883150F72A0A2CB70025FDDE /* UITextView+XHPinchZoom.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E457B29A600B000A58A9A /* UITextView+XHPinchZoom.m */; };
883150F82A0A2CB70025FDDE /* XHUINavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45E829A600B500A58A9A /* XHUINavigationController.m */; };
883150F92A0A2CB70025FDDE /* XHSmartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F8F2A0A168A0025FDDE /* XHSmartView.m */; };
883150FA2A0A2CB70025FDDE /* HJTipsMessageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E7FC1829B3279A00F8585F /* HJTipsMessageView.m */; };
883150FB2A0A2CB70025FDDE /* AppDelegate+XHAppService.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E456829A600A500A58A9A /* AppDelegate+XHAppService.m */; };
883150FC2A0A2CB70025FDDE /* HJVerifyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E7FC1A29B3279B00F8585F /* HJVerifyView.m */; };
......@@ -224,7 +236,6 @@
883151032A0A2CB70025FDDE /* AppDelegate+XHViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E456929A600A500A58A9A /* AppDelegate+XHViewController.m */; };
883151042A0A2CB70025FDDE /* XHCollectionDeviceCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D115ED29B5D2A8009445EE /* XHCollectionDeviceCell.m */; };
883151052A0A2CB70025FDDE /* HJTipsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E7FC1929B3279A00F8585F /* HJTipsView.m */; };
883151062A0A2CB70025FDDE /* XHCustomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F8B2A0A168A0025FDDE /* XHCustomView.m */; };
883151082A0A2CB70025FDDE /* XHMSCodeLoginView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88CAA07529B85AA300825EDC /* XHMSCodeLoginView.m */; };
883151092A0A2CB70025FDDE /* XHPersonalVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E8439C29B9BB6B00263DB0 /* XHPersonalVC.m */; };
8831510A2A0A2CB70025FDDE /* XHPersonalViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E8439F29B9BB8900263DB0 /* XHPersonalViewCell.m */; };
......@@ -242,7 +253,6 @@
883151172A0A2CB70025FDDE /* XHAgreementVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F07F1429C1C4BF00B2EBE6 /* XHAgreementVC.m */; };
883151182A0A2CB70025FDDE /* XHAlterActionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E457629A600B000A58A9A /* XHAlterActionView.m */; };
883151192A0A2CB70025FDDE /* XHDRView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314FC32A0A1B600025FDDE /* XHDRView.m */; };
8831511A2A0A2CB70025FDDE /* XHSelectModelView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F882A0A168A0025FDDE /* XHSelectModelView.m */; };
8831511B2A0A2CB70025FDDE /* XHResetDeviceNameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 880A7BE729B0939200B5F4C4 /* XHResetDeviceNameView.m */; };
8831511C2A0A2CB70025FDDE /* UIBarButtonItem+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45E029A600B400A58A9A /* UIBarButtonItem+Extension.m */; };
8831511D2A0A2CB70025FDDE /* XHRecordVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E843B229B9D6B600263DB0 /* XHRecordVC.m */; };
......@@ -327,10 +337,6 @@
88CAA09329B8792000825EDC /* XHRegistThirdView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88CAA09229B8792000825EDC /* XHRegistThirdView.m */; };
88CAA09929B87D6300825EDC /* XHDatePickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88CAA09729B87D6200825EDC /* XHDatePickerView.m */; };
88CAA09C29B87EC300825EDC /* XHRegistThirdVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 88CAA09B29B87EC300825EDC /* XHRegistThirdVC.m */; };
88CF1A622A287D4C0039F29B /* XHMainVC1.m in Sources */ = {isa = PBXBuildFile; fileRef = 88CF1A602A287D4B0039F29B /* XHMainVC1.m */; };
88CF1A632A28959C0039F29B /* XHMainVC1.m in Sources */ = {isa = PBXBuildFile; fileRef = 88CF1A602A287D4B0039F29B /* XHMainVC1.m */; };
88CF1A642A2895D50039F29B /* XHMainVC1.m in Sources */ = {isa = PBXBuildFile; fileRef = 88CF1A602A287D4B0039F29B /* XHMainVC1.m */; };
88CF1A652A2895E70039F29B /* XHMainVC1.m in Sources */ = {isa = PBXBuildFile; fileRef = 88CF1A602A287D4B0039F29B /* XHMainVC1.m */; };
88D115EE29B5D2A8009445EE /* XHCollectionDeviceCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D115ED29B5D2A8009445EE /* XHCollectionDeviceCell.m */; };
88D115F129B5D3ED009445EE /* XHCollectCellModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D115F029B5D3ED009445EE /* XHCollectCellModel.m */; };
88D235DB2AEA548F00D976A4 /* XHDWFSCircleLiderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D235D92AEA548F00D976A4 /* XHDWFSCircleLiderView.m */; };
......@@ -366,7 +372,6 @@
88D3239A2A177CDC00334372 /* XHNsstringTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45AF29A600B100A58A9A /* XHNsstringTool.m */; };
88D3239B2A177CDC00334372 /* HJTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45B529A600B100A58A9A /* HJTools.m */; };
88D3239C2A177CDC00334372 /* XHParentVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45E929A600B500A58A9A /* XHParentVC.m */; };
88D3239D2A177CDC00334372 /* XHCustomSettimesModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F852A0A168A0025FDDE /* XHCustomSettimesModel.m */; };
88D3239E2A177CDC00334372 /* XHCommonMethods.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45B029A600B100A58A9A /* XHCommonMethods.m */; };
88D3239F2A177CDC00334372 /* UIButton+HJButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45E329A600B400A58A9A /* UIButton+HJButton.m */; };
88D323A02A177CDC00334372 /* HJScanView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E7FC3029B3286C00F8585F /* HJScanView.m */; };
......@@ -389,7 +394,6 @@
88D323B62A177CDC00334372 /* XHRecordCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E843AF29B9D40E00263DB0 /* XHRecordCell.m */; };
88D323B72A177CDC00334372 /* UITextView+XHPlaceHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E457D29A600B000A58A9A /* UITextView+XHPlaceHolder.m */; };
88D323B82A177CDC00334372 /* XHMineVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E8438D29B9822100263DB0 /* XHMineVC.m */; };
88D323B92A177CDC00334372 /* XHNoConnectView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F872A0A168A0025FDDE /* XHNoConnectView.m */; };
88D323BA2A177CDC00334372 /* NSString+HJExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45DD29A600B400A58A9A /* NSString+HJExtension.m */; };
88D323BB2A177CDC00334372 /* XHSetFrequencyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E90CA329A74A7C009FAB0E /* XHSetFrequencyView.m */; };
88D323BC2A177CDC00334372 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E456729A600A500A58A9A /* AppDelegate.m */; };
......@@ -405,7 +409,6 @@
88D323C72A177CDC00334372 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 88EF4FC5298BA4E4009835BF /* main.m */; };
88D323C82A177CDC00334372 /* XHCollectCellModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D115F029B5D3ED009445EE /* XHCollectCellModel.m */; };
88D323C92A177CDC00334372 /* ZXSegmentHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E458029A600B000A58A9A /* ZXSegmentHeaderCell.m */; };
88D323CA2A177CDC00334372 /* XHCustomSetTimes.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F892A0A168A0025FDDE /* XHCustomSetTimes.m */; };
88D323CB2A177CDC00334372 /* XHDrawChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E458D29A600B000A58A9A /* XHDrawChartView.m */; };
88D323CC2A177CDC00334372 /* XHSetModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 880A7BE429B0658C00B5F4C4 /* XHSetModel.m */; };
88D323CD2A177CDC00334372 /* ZJAnimationPopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E7FC3929B32A7200F8585F /* ZJAnimationPopView.m */; };
......@@ -413,7 +416,6 @@
88D323D02A177CDC00334372 /* HJBluetoothManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45F429A600B500A58A9A /* HJBluetoothManager.m */; };
88D323D12A177CDC00334372 /* UITextView+XHPinchZoom.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E457B29A600B000A58A9A /* UITextView+XHPinchZoom.m */; };
88D323D22A177CDC00334372 /* XHUINavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45E829A600B500A58A9A /* XHUINavigationController.m */; };
88D323D32A177CDC00334372 /* XHSmartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F8F2A0A168A0025FDDE /* XHSmartView.m */; };
88D323D42A177CDC00334372 /* HJTipsMessageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E7FC1829B3279A00F8585F /* HJTipsMessageView.m */; };
88D323D52A177CDC00334372 /* XHDataModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F4246B2A162CAB00A66148 /* XHDataModel.m */; };
88D323D62A177CDC00334372 /* AppDelegate+XHAppService.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E456829A600A500A58A9A /* AppDelegate+XHAppService.m */; };
......@@ -427,7 +429,6 @@
88D323DE2A177CDC00334372 /* AppDelegate+XHViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E456929A600A500A58A9A /* AppDelegate+XHViewController.m */; };
88D323DF2A177CDC00334372 /* XHCollectionDeviceCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D115ED29B5D2A8009445EE /* XHCollectionDeviceCell.m */; };
88D323E02A177CDC00334372 /* HJTipsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E7FC1929B3279A00F8585F /* HJTipsView.m */; };
88D323E12A177CDC00334372 /* XHCustomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F8B2A0A168A0025FDDE /* XHCustomView.m */; };
88D323E32A177CDC00334372 /* XHMSCodeLoginView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88CAA07529B85AA300825EDC /* XHMSCodeLoginView.m */; };
88D323E42A177CDC00334372 /* XHPersonalVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E8439C29B9BB6B00263DB0 /* XHPersonalVC.m */; };
88D323E52A177CDC00334372 /* XHPersonalViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E8439F29B9BB8900263DB0 /* XHPersonalViewCell.m */; };
......@@ -445,7 +446,6 @@
88D323F22A177CDC00334372 /* XHAgreementVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F07F1429C1C4BF00B2EBE6 /* XHAgreementVC.m */; };
88D323F32A177CDC00334372 /* XHAlterActionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E457629A600B000A58A9A /* XHAlterActionView.m */; };
88D323F42A177CDC00334372 /* XHDRView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314FC32A0A1B600025FDDE /* XHDRView.m */; };
88D323F52A177CDC00334372 /* XHSelectModelView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88314F882A0A168A0025FDDE /* XHSelectModelView.m */; };
88D323F62A177CDC00334372 /* XHResetDeviceNameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 880A7BE729B0939200B5F4C4 /* XHResetDeviceNameView.m */; };
88D323F72A177CDC00334372 /* UIBarButtonItem+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E45E029A600B400A58A9A /* UIBarButtonItem+Extension.m */; };
88D323F82A177CDC00334372 /* XHRecordVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E843B229B9D6B600263DB0 /* XHRecordVC.m */; };
......@@ -710,6 +710,20 @@
390516C62BAA75D000935EDE /* DXHotElecticView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DXHotElecticView.m; sourceTree = "<group>"; };
390F59A62DF9636A00D6D06C /* JoystickIntroManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JoystickIntroManager.h; sourceTree = "<group>"; };
390F59A72DF9636A00D6D06C /* JoystickIntroManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JoystickIntroManager.m; sourceTree = "<group>"; };
390F59DA2E014D2700D6D06C /* XHMainVC1.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XHMainVC1.h; sourceTree = "<group>"; };
390F59DB2E014D2700D6D06C /* XHMainVC1.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XHMainVC1.m; sourceTree = "<group>"; };
390F59DD2E014D2700D6D06C /* XHCustomSettimesModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XHCustomSettimesModel.h; sourceTree = "<group>"; };
390F59DE2E014D2700D6D06C /* XHCustomSettimesModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XHCustomSettimesModel.m; sourceTree = "<group>"; };
390F59E02E014D2700D6D06C /* XHCustomSetTimes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XHCustomSetTimes.h; sourceTree = "<group>"; };
390F59E12E014D2700D6D06C /* XHCustomSetTimes.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XHCustomSetTimes.m; sourceTree = "<group>"; };
390F59E22E014D2700D6D06C /* XHCustomView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XHCustomView.h; sourceTree = "<group>"; };
390F59E32E014D2700D6D06C /* XHCustomView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XHCustomView.m; sourceTree = "<group>"; };
390F59E42E014D2700D6D06C /* XHNoConnectView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XHNoConnectView.h; sourceTree = "<group>"; };
390F59E52E014D2700D6D06C /* XHNoConnectView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XHNoConnectView.m; sourceTree = "<group>"; };
390F59E62E014D2700D6D06C /* XHSelectModelView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XHSelectModelView.h; sourceTree = "<group>"; };
390F59E72E014D2700D6D06C /* XHSelectModelView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XHSelectModelView.m; sourceTree = "<group>"; };
390F59E82E014D2700D6D06C /* XHSmartView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XHSmartView.h; sourceTree = "<group>"; };
390F59E92E014D2700D6D06C /* XHSmartView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XHSmartView.m; sourceTree = "<group>"; };
39514C652C5A0A1000D785DC /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = "<group>"; };
39D57E732DD445C400FACDD5 /* DXDRPlusVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DXDRPlusVC.h; sourceTree = "<group>"; };
39D57E742DD445C400FACDD5 /* DXDRPlusVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DXDRPlusVC.m; sourceTree = "<group>"; };
......@@ -774,18 +788,6 @@
8811BF582A5E8EAA00062535 /* DJMPS2 copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "DJMPS2 copy-Info.plist"; path = "/Users/djm001/Desktop/项目代码文件/DJMHome(Total)/DJMPS2 copy-Info.plist"; sourceTree = "<absolute>"; };
881F90372A496D65000B86F6 /* XHBGRunManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XHBGRunManager.m; sourceTree = "<group>"; };
881F90382A496D65000B86F6 /* XHBGRunManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHBGRunManager.h; sourceTree = "<group>"; };
88314F842A0A168A0025FDDE /* XHCustomSettimesModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHCustomSettimesModel.h; sourceTree = "<group>"; };
88314F852A0A168A0025FDDE /* XHCustomSettimesModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XHCustomSettimesModel.m; sourceTree = "<group>"; };
88314F872A0A168A0025FDDE /* XHNoConnectView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XHNoConnectView.m; sourceTree = "<group>"; };
88314F882A0A168A0025FDDE /* XHSelectModelView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XHSelectModelView.m; sourceTree = "<group>"; };
88314F892A0A168A0025FDDE /* XHCustomSetTimes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XHCustomSetTimes.m; sourceTree = "<group>"; };
88314F8A2A0A168A0025FDDE /* XHSmartView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHSmartView.h; sourceTree = "<group>"; };
88314F8B2A0A168A0025FDDE /* XHCustomView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XHCustomView.m; sourceTree = "<group>"; };
88314F8C2A0A168A0025FDDE /* XHSelectModelView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHSelectModelView.h; sourceTree = "<group>"; };
88314F8D2A0A168A0025FDDE /* XHNoConnectView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHNoConnectView.h; sourceTree = "<group>"; };
88314F8E2A0A168A0025FDDE /* XHCustomSetTimes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHCustomSetTimes.h; sourceTree = "<group>"; };
88314F8F2A0A168A0025FDDE /* XHSmartView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XHSmartView.m; sourceTree = "<group>"; };
88314F902A0A168A0025FDDE /* XHCustomView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHCustomView.h; sourceTree = "<group>"; };
88314FB32A0A1AEF0025FDDE /* XHDRVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XHDRVC.h; sourceTree = "<group>"; };
88314FB42A0A1AEF0025FDDE /* XHDRVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XHDRVC.m; sourceTree = "<group>"; };
88314FC22A0A1B600025FDDE /* XHDRView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XHDRView.h; sourceTree = "<group>"; };
......@@ -921,8 +923,6 @@
88CAA09829B87D6300825EDC /* XHDatePickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHDatePickerView.h; sourceTree = "<group>"; };
88CAA09A29B87EC300825EDC /* XHRegistThirdVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XHRegistThirdVC.h; sourceTree = "<group>"; };
88CAA09B29B87EC300825EDC /* XHRegistThirdVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XHRegistThirdVC.m; sourceTree = "<group>"; };
88CF1A602A287D4B0039F29B /* XHMainVC1.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XHMainVC1.m; sourceTree = "<group>"; };
88CF1A612A287D4C0039F29B /* XHMainVC1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHMainVC1.h; sourceTree = "<group>"; };
88D115EC29B5D2A7009445EE /* XHCollectionDeviceCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XHCollectionDeviceCell.h; sourceTree = "<group>"; };
88D115ED29B5D2A8009445EE /* XHCollectionDeviceCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XHCollectionDeviceCell.m; sourceTree = "<group>"; };
88D115EF29B5D3ED009445EE /* XHCollectCellModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XHCollectCellModel.h; sourceTree = "<group>"; };
......@@ -1091,6 +1091,51 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
390F59DC2E014D2700D6D06C /* Controller */ = {
isa = PBXGroup;
children = (
390F59DA2E014D2700D6D06C /* XHMainVC1.h */,
390F59DB2E014D2700D6D06C /* XHMainVC1.m */,
);
path = Controller;
sourceTree = "<group>";
};
390F59DF2E014D2700D6D06C /* Model */ = {
isa = PBXGroup;
children = (
390F59DD2E014D2700D6D06C /* XHCustomSettimesModel.h */,
390F59DE2E014D2700D6D06C /* XHCustomSettimesModel.m */,
);
path = Model;
sourceTree = "<group>";
};
390F59EA2E014D2700D6D06C /* View */ = {
isa = PBXGroup;
children = (
390F59E02E014D2700D6D06C /* XHCustomSetTimes.h */,
390F59E12E014D2700D6D06C /* XHCustomSetTimes.m */,
390F59E22E014D2700D6D06C /* XHCustomView.h */,
390F59E32E014D2700D6D06C /* XHCustomView.m */,
390F59E42E014D2700D6D06C /* XHNoConnectView.h */,
390F59E52E014D2700D6D06C /* XHNoConnectView.m */,
390F59E62E014D2700D6D06C /* XHSelectModelView.h */,
390F59E72E014D2700D6D06C /* XHSelectModelView.m */,
390F59E82E014D2700D6D06C /* XHSmartView.h */,
390F59E92E014D2700D6D06C /* XHSmartView.m */,
);
path = View;
sourceTree = "<group>";
};
390F59EB2E014D2700D6D06C /* HomePage */ = {
isa = PBXGroup;
children = (
390F59DC2E014D2700D6D06C /* Controller */,
390F59DF2E014D2700D6D06C /* Model */,
390F59EA2E014D2700D6D06C /* View */,
);
path = HomePage;
sourceTree = "<group>";
};
39FF54FE2BF1BB6D007D2FC5 /* YModem */ = {
isa = PBXGroup;
children = (
......@@ -1136,51 +1181,6 @@
path = Text;
sourceTree = "<group>";
};
88314F7F2A0A168A0025FDDE /* HomePage */ = {
isa = PBXGroup;
children = (
88314F802A0A168A0025FDDE /* Controller */,
88314F832A0A168A0025FDDE /* Model */,
88314F862A0A168A0025FDDE /* View */,
);
path = HomePage;
sourceTree = "<group>";
};
88314F802A0A168A0025FDDE /* Controller */ = {
isa = PBXGroup;
children = (
88CF1A612A287D4C0039F29B /* XHMainVC1.h */,
88CF1A602A287D4B0039F29B /* XHMainVC1.m */,
);
path = Controller;
sourceTree = "<group>";
};
88314F832A0A168A0025FDDE /* Model */ = {
isa = PBXGroup;
children = (
88314F842A0A168A0025FDDE /* XHCustomSettimesModel.h */,
88314F852A0A168A0025FDDE /* XHCustomSettimesModel.m */,
);
path = Model;
sourceTree = "<group>";
};
88314F862A0A168A0025FDDE /* View */ = {
isa = PBXGroup;
children = (
88314F8E2A0A168A0025FDDE /* XHCustomSetTimes.h */,
88314F892A0A168A0025FDDE /* XHCustomSetTimes.m */,
88314F902A0A168A0025FDDE /* XHCustomView.h */,
88314F8B2A0A168A0025FDDE /* XHCustomView.m */,
88314F8D2A0A168A0025FDDE /* XHNoConnectView.h */,
88314F872A0A168A0025FDDE /* XHNoConnectView.m */,
88314F8C2A0A168A0025FDDE /* XHSelectModelView.h */,
88314F882A0A168A0025FDDE /* XHSelectModelView.m */,
88314F8A2A0A168A0025FDDE /* XHSmartView.h */,
88314F8F2A0A168A0025FDDE /* XHSmartView.m */,
);
path = View;
sourceTree = "<group>";
};
88314FA42A0A16F70025FDDE /* DRFacial */ = {
isa = PBXGroup;
children = (
......@@ -2045,7 +2045,7 @@
children = (
88DA474C2AE39D9200313BB8 /* Dr03 */,
88314FA42A0A16F70025FDDE /* DRFacial */,
88314F7F2A0A168A0025FDDE /* HomePage */,
390F59EB2E014D2700D6D06C /* HomePage */,
88C3CA7E29CEC148004301FC /* SetOrPesonalPage */,
88F07F1229C1C4BF00B2EBE6 /* Protocol */,
88E843A729B9D33000263DB0 /* RecordPage */,
......@@ -2548,7 +2548,6 @@
buildActionMask = 2147483647;
files = (
88D235DC2AEA54C700D976A4 /* XHDWFSCircleLiderView.m in Sources */,
88CF1A642A2895D50039F29B /* XHMainVC1.m in Sources */,
88D3237A2A17040200334372 /* XHDataModel.m in Sources */,
883150A72A0A2CB70025FDDE /* XHCountDownButton.m in Sources */,
883150A82A0A2CB70025FDDE /* XHMineSetSexVC.m in Sources */,
......@@ -2582,7 +2581,6 @@
883150C32A0A2CB70025FDDE /* XHNsstringTool.m in Sources */,
883150C42A0A2CB70025FDDE /* HJTools.m in Sources */,
883150C52A0A2CB70025FDDE /* XHParentVC.m in Sources */,
883150C62A0A2CB70025FDDE /* XHCustomSettimesModel.m in Sources */,
883150C72A0A2CB70025FDDE /* XHCommonMethods.m in Sources */,
883150C82A0A2CB70025FDDE /* UIButton+HJButton.m in Sources */,
39D57E932DDADDB000FACDD5 /* DXDRPlusTipsView.m in Sources */,
......@@ -2610,11 +2608,17 @@
6C7891802B0B2D190051C70B /* DKNSData+CRC16.m in Sources */,
883150DA2A0A2CB70025FDDE /* XHRecordModel.m in Sources */,
883150DB2A0A2CB70025FDDE /* NSString+HJStringExtension.m in Sources */,
390F5A012E014D2700D6D06C /* XHCustomView.m in Sources */,
390F5A022E014D2700D6D06C /* XHCustomSetTimes.m in Sources */,
390F5A032E014D2700D6D06C /* XHNoConnectView.m in Sources */,
390F5A042E014D2700D6D06C /* XHMainVC1.m in Sources */,
390F5A052E014D2700D6D06C /* XHSmartView.m in Sources */,
390F5A062E014D2700D6D06C /* XHSelectModelView.m in Sources */,
390F5A072E014D2700D6D06C /* XHCustomSettimesModel.m in Sources */,
883150DC2A0A2CB70025FDDE /* XHTimerActionView.m in Sources */,
883150DD2A0A2CB70025FDDE /* XHRecordCell.m in Sources */,
883150DE2A0A2CB70025FDDE /* UITextView+XHPlaceHolder.m in Sources */,
883150DF2A0A2CB70025FDDE /* XHMineVC.m in Sources */,
883150E02A0A2CB70025FDDE /* XHNoConnectView.m in Sources */,
883150E12A0A2CB70025FDDE /* NSString+HJExtension.m in Sources */,
883150E22A0A2CB70025FDDE /* XHSetFrequencyView.m in Sources */,
39F4B6D12BD63A9200FEAA16 /* DXHEUpkeepVC.m in Sources */,
......@@ -2636,7 +2640,6 @@
883150EE2A0A2CB70025FDDE /* main.m in Sources */,
883150EF2A0A2CB70025FDDE /* XHCollectCellModel.m in Sources */,
883150F02A0A2CB70025FDDE /* ZXSegmentHeaderCell.m in Sources */,
883150F12A0A2CB70025FDDE /* XHCustomSetTimes.m in Sources */,
883150F22A0A2CB70025FDDE /* XHDrawChartView.m in Sources */,
883150F32A0A2CB70025FDDE /* XHSetModel.m in Sources */,
883150F42A0A2CB70025FDDE /* ZJAnimationPopView.m in Sources */,
......@@ -2644,7 +2647,6 @@
883150F62A0A2CB70025FDDE /* HJBluetoothManager.m in Sources */,
883150F72A0A2CB70025FDDE /* UITextView+XHPinchZoom.m in Sources */,
883150F82A0A2CB70025FDDE /* XHUINavigationController.m in Sources */,
883150F92A0A2CB70025FDDE /* XHSmartView.m in Sources */,
883150FA2A0A2CB70025FDDE /* HJTipsMessageView.m in Sources */,
883150FB2A0A2CB70025FDDE /* AppDelegate+XHAppService.m in Sources */,
883150FC2A0A2CB70025FDDE /* HJVerifyView.m in Sources */,
......@@ -2660,7 +2662,6 @@
883151032A0A2CB70025FDDE /* AppDelegate+XHViewController.m in Sources */,
883151042A0A2CB70025FDDE /* XHCollectionDeviceCell.m in Sources */,
883151052A0A2CB70025FDDE /* HJTipsView.m in Sources */,
883151062A0A2CB70025FDDE /* XHCustomView.m in Sources */,
883151082A0A2CB70025FDDE /* XHMSCodeLoginView.m in Sources */,
883151092A0A2CB70025FDDE /* XHPersonalVC.m in Sources */,
8831510A2A0A2CB70025FDDE /* XHPersonalViewCell.m in Sources */,
......@@ -2680,7 +2681,6 @@
883151182A0A2CB70025FDDE /* XHAlterActionView.m in Sources */,
39E50AA52BA8272800D48C7D /* DXProgressBarView.m in Sources */,
883151192A0A2CB70025FDDE /* XHDRView.m in Sources */,
8831511A2A0A2CB70025FDDE /* XHSelectModelView.m in Sources */,
8831511B2A0A2CB70025FDDE /* XHResetDeviceNameView.m in Sources */,
8831511C2A0A2CB70025FDDE /* UIBarButtonItem+Extension.m in Sources */,
8831511D2A0A2CB70025FDDE /* XHRecordVC.m in Sources */,
......@@ -2704,7 +2704,6 @@
buildActionMask = 2147483647;
files = (
88D235DE2AEA54D800D976A4 /* XHDWFSCircleLiderView.m in Sources */,
88CF1A632A28959C0039F29B /* XHMainVC1.m in Sources */,
88D3237E2A177CDC00334372 /* XHCountDownButton.m in Sources */,
88D3237F2A177CDC00334372 /* XHMineSetSexVC.m in Sources */,
88D323802A177CDC00334372 /* XHTabBar.m in Sources */,
......@@ -2737,7 +2736,6 @@
88D3239A2A177CDC00334372 /* XHNsstringTool.m in Sources */,
88D3239B2A177CDC00334372 /* HJTools.m in Sources */,
88D3239C2A177CDC00334372 /* XHParentVC.m in Sources */,
88D3239D2A177CDC00334372 /* XHCustomSettimesModel.m in Sources */,
88D3239E2A177CDC00334372 /* XHCommonMethods.m in Sources */,
88D3239F2A177CDC00334372 /* UIButton+HJButton.m in Sources */,
88D323A02A177CDC00334372 /* HJScanView.m in Sources */,
......@@ -2766,10 +2764,16 @@
6C7891822B0B2D190051C70B /* DKNSData+CRC16.m in Sources */,
88D323B32A177CDC00334372 /* NSString+HJStringExtension.m in Sources */,
88D323B42A177CDC00334372 /* XHTimerActionView.m in Sources */,
390F59EC2E014D2700D6D06C /* XHCustomView.m in Sources */,
390F59ED2E014D2700D6D06C /* XHCustomSetTimes.m in Sources */,
390F59EE2E014D2700D6D06C /* XHNoConnectView.m in Sources */,
390F59EF2E014D2700D6D06C /* XHMainVC1.m in Sources */,
390F59F02E014D2700D6D06C /* XHSmartView.m in Sources */,
390F59F12E014D2700D6D06C /* XHSelectModelView.m in Sources */,
390F59F22E014D2700D6D06C /* XHCustomSettimesModel.m in Sources */,
88D323B62A177CDC00334372 /* XHRecordCell.m in Sources */,
88D323B72A177CDC00334372 /* UITextView+XHPlaceHolder.m in Sources */,
88D323B82A177CDC00334372 /* XHMineVC.m in Sources */,
88D323B92A177CDC00334372 /* XHNoConnectView.m in Sources */,
88D323BA2A177CDC00334372 /* NSString+HJExtension.m in Sources */,
88D323BB2A177CDC00334372 /* XHSetFrequencyView.m in Sources */,
88D323BC2A177CDC00334372 /* AppDelegate.m in Sources */,
......@@ -2791,7 +2795,6 @@
88D323C72A177CDC00334372 /* main.m in Sources */,
88D323C82A177CDC00334372 /* XHCollectCellModel.m in Sources */,
88D323C92A177CDC00334372 /* ZXSegmentHeaderCell.m in Sources */,
88D323CA2A177CDC00334372 /* XHCustomSetTimes.m in Sources */,
88D323CB2A177CDC00334372 /* XHDrawChartView.m in Sources */,
88D323CC2A177CDC00334372 /* XHSetModel.m in Sources */,
88D323CD2A177CDC00334372 /* ZJAnimationPopView.m in Sources */,
......@@ -2799,7 +2802,6 @@
88D323D02A177CDC00334372 /* HJBluetoothManager.m in Sources */,
88D323D12A177CDC00334372 /* UITextView+XHPinchZoom.m in Sources */,
88D323D22A177CDC00334372 /* XHUINavigationController.m in Sources */,
88D323D32A177CDC00334372 /* XHSmartView.m in Sources */,
88D323D42A177CDC00334372 /* HJTipsMessageView.m in Sources */,
88D323D52A177CDC00334372 /* XHDataModel.m in Sources */,
88D323D62A177CDC00334372 /* AppDelegate+XHAppService.m in Sources */,
......@@ -2816,7 +2818,6 @@
88D323DE2A177CDC00334372 /* AppDelegate+XHViewController.m in Sources */,
88D323DF2A177CDC00334372 /* XHCollectionDeviceCell.m in Sources */,
88D323E02A177CDC00334372 /* HJTipsView.m in Sources */,
88D323E12A177CDC00334372 /* XHCustomView.m in Sources */,
88D323E32A177CDC00334372 /* XHMSCodeLoginView.m in Sources */,
88D323E42A177CDC00334372 /* XHPersonalVC.m in Sources */,
88D323E52A177CDC00334372 /* XHPersonalViewCell.m in Sources */,
......@@ -2836,7 +2837,6 @@
88D323F32A177CDC00334372 /* XHAlterActionView.m in Sources */,
39E50AA72BA8272800D48C7D /* DXProgressBarView.m in Sources */,
88D323F42A177CDC00334372 /* XHDRView.m in Sources */,
88D323F52A177CDC00334372 /* XHSelectModelView.m in Sources */,
88D323F62A177CDC00334372 /* XHResetDeviceNameView.m in Sources */,
88D323F72A177CDC00334372 /* UIBarButtonItem+Extension.m in Sources */,
88D323F82A177CDC00334372 /* XHRecordVC.m in Sources */,
......@@ -2860,15 +2860,8 @@
buildActionMask = 2147483647;
files = (
88D235DD2AEA54D000D976A4 /* XHDWFSCircleLiderView.m in Sources */,
88CF1A652A2895E70039F29B /* XHMainVC1.m in Sources */,
88D323792A1703F500334372 /* XHDataModel.m in Sources */,
88DA475D2AE39D9200313BB8 /* XHDr03View.m in Sources */,
88314FE72A0A1FEC0025FDDE /* XHCustomSettimesModel.m in Sources */,
88314FE82A0A1FEC0025FDDE /* XHCustomSetTimes.m in Sources */,
88314FE92A0A1FEC0025FDDE /* XHCustomView.m in Sources */,
88314FEA2A0A1FEC0025FDDE /* XHNoConnectView.m in Sources */,
88314FEB2A0A1FEC0025FDDE /* XHSelectModelView.m in Sources */,
88314FEC2A0A1FEC0025FDDE /* XHSmartView.m in Sources */,
88314FCB2A0A1BC30025FDDE /* XHDRVC.m in Sources */,
88314FCC2A0A1BC30025FDDE /* XHDRView.m in Sources */,
6CB139102C12DEAF00544383 /* DXAddBannerVC.m in Sources */,
......@@ -2927,6 +2920,13 @@
88EE69942A04D3C900C37EE2 /* XHTimer.m in Sources */,
88EE69952A04D3C900C37EE2 /* HJDataModel.m in Sources */,
88EE69962A04D3C900C37EE2 /* UIColor+Extensions.m in Sources */,
390F59F32E014D2700D6D06C /* XHCustomView.m in Sources */,
390F59F42E014D2700D6D06C /* XHCustomSetTimes.m in Sources */,
390F59F52E014D2700D6D06C /* XHNoConnectView.m in Sources */,
390F59F62E014D2700D6D06C /* XHMainVC1.m in Sources */,
390F59F72E014D2700D6D06C /* XHSmartView.m in Sources */,
390F59F82E014D2700D6D06C /* XHSelectModelView.m in Sources */,
390F59F92E014D2700D6D06C /* XHCustomSettimesModel.m in Sources */,
88EE69972A04D3C900C37EE2 /* XHRecordModel.m in Sources */,
88EE69982A04D3C900C37EE2 /* NSString+HJStringExtension.m in Sources */,
39F4B6D02BD63A9100FEAA16 /* DXHEUpkeepVC.m in Sources */,
......@@ -3045,7 +3045,6 @@
884E461029A600B600A58A9A /* XHNsstringTool.m in Sources */,
884E461429A600B600A58A9A /* HJTools.m in Sources */,
884E463629A600B600A58A9A /* XHParentVC.m in Sources */,
88314F922A0A168A0025FDDE /* XHCustomSettimesModel.m in Sources */,
884E461129A600B600A58A9A /* XHCommonMethods.m in Sources */,
884E463429A600B600A58A9A /* UIButton+HJButton.m in Sources */,
88E7FC3329B3286C00F8585F /* HJScanView.m in Sources */,
......@@ -3077,10 +3076,16 @@
6C78917F2B0B2D190051C70B /* DKNSData+CRC16.m in Sources */,
88DA475A2AE39D9200313BB8 /* XHDr03View.m in Sources */,
88D235DB2AEA548F00D976A4 /* XHDWFSCircleLiderView.m in Sources */,
390F59FA2E014D2700D6D06C /* XHCustomView.m in Sources */,
390F59FB2E014D2700D6D06C /* XHCustomSetTimes.m in Sources */,
390F59FC2E014D2700D6D06C /* XHNoConnectView.m in Sources */,
390F59FD2E014D2700D6D06C /* XHMainVC1.m in Sources */,
390F59FE2E014D2700D6D06C /* XHSmartView.m in Sources */,
390F59FF2E014D2700D6D06C /* XHSelectModelView.m in Sources */,
390F5A002E014D2700D6D06C /* XHCustomSettimesModel.m in Sources */,
88E843B029B9D40E00263DB0 /* XHRecordCell.m in Sources */,
884E45FF29A600B600A58A9A /* UITextView+XHPlaceHolder.m in Sources */,
88E8438E29B9822100263DB0 /* XHMineVC.m in Sources */,
88314F932A0A168A0025FDDE /* XHNoConnectView.m in Sources */,
884E463129A600B600A58A9A /* NSString+HJExtension.m in Sources */,
88E90CA429A74A7C009FAB0E /* XHSetFrequencyView.m in Sources */,
884E456A29A600A600A58A9A /* AppDelegate.m in Sources */,
......@@ -3102,7 +3107,6 @@
39D57E822DD5BB6F00FACDD5 /* DXDRPlusSelectView.m in Sources */,
88D115F129B5D3ED009445EE /* XHCollectCellModel.m in Sources */,
884E460029A600B600A58A9A /* ZXSegmentHeaderCell.m in Sources */,
88314F952A0A168A0025FDDE /* XHCustomSetTimes.m in Sources */,
884E460529A600B600A58A9A /* XHDrawChartView.m in Sources */,
880A7BE529B0658C00B5F4C4 /* XHSetModel.m in Sources */,
88E7FC3B29B32A7200F8585F /* ZJAnimationPopView.m in Sources */,
......@@ -3110,7 +3114,6 @@
884E463B29A600B600A58A9A /* HJBluetoothManager.m in Sources */,
884E45FE29A600B600A58A9A /* UITextView+XHPinchZoom.m in Sources */,
884E463529A600B600A58A9A /* XHUINavigationController.m in Sources */,
88314F972A0A168A0025FDDE /* XHSmartView.m in Sources */,
88E7FC1C29B3279B00F8585F /* HJTipsMessageView.m in Sources */,
88F4246C2A162CAB00A66148 /* XHDataModel.m in Sources */,
884E456B29A600A600A58A9A /* AppDelegate+XHAppService.m in Sources */,
......@@ -3127,7 +3130,6 @@
884E456C29A600A600A58A9A /* AppDelegate+XHViewController.m in Sources */,
88D115EE29B5D2A8009445EE /* XHCollectionDeviceCell.m in Sources */,
88E7FC1D29B3279B00F8585F /* HJTipsView.m in Sources */,
88314F962A0A168A0025FDDE /* XHCustomView.m in Sources */,
88CAA07629B85AA300825EDC /* XHMSCodeLoginView.m in Sources */,
88E8439D29B9BB6B00263DB0 /* XHPersonalVC.m in Sources */,
88E843A029B9BB8A00263DB0 /* XHPersonalViewCell.m in Sources */,
......@@ -3138,7 +3140,6 @@
88EC9D7E29BC541900E61419 /* XHMineSetAgeView.m in Sources */,
88F07F1129C193EB00B2EBE6 /* XHCommandModel.m in Sources */,
884E463229A600B600A58A9A /* UIPickerView+XHPickerView.m in Sources */,
88CF1A622A287D4C0039F29B /* XHMainVC1.m in Sources */,
88574C4F29D40A500078E8BF /* HJLocation.m in Sources */,
88EC9D7729BC18A500E61419 /* XHBGRunManager.m in Sources */,
6CB327CC2AEF8CD900ABAEC3 /* DXDeviceListVC.m in Sources */,
......@@ -3148,7 +3149,6 @@
39E50AA42BA8272800D48C7D /* DXProgressBarView.m in Sources */,
884E45FC29A600B600A58A9A /* XHAlterActionView.m in Sources */,
88314FC42A0A1B600025FDDE /* XHDRView.m in Sources */,
88314F942A0A168A0025FDDE /* XHSelectModelView.m in Sources */,
880A7BE829B0939200B5F4C4 /* XHResetDeviceNameView.m in Sources */,
884E463329A600B600A58A9A /* UIBarButtonItem+Extension.m in Sources */,
88E843B329B9D6B600263DB0 /* XHRecordVC.m in Sources */,
......@@ -3325,7 +3325,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.3.0;
MARKETING_VERSION = 1.3.1;
PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMDrWater;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
......@@ -3371,7 +3371,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.3.0;
MARKETING_VERSION = 1.3.1;
PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMDrWater;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
......
DJMHomeTY.xcworkspace/xcuserdata/nana.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -52,12 +52,12 @@
landmarkType = "7">
<Locations>
<Location
uuid = "D6A24779-6660-40D2-BFFD-EC58A7A6F0F0 - 14f58d4f479ed9d6"
uuid = "D6A24779-6660-40D2-BFFD-EC58A7A6F0F0 - 8abfd16435e47c0"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[XHDRVC setIsVerifySucceed:]"
moduleName = "DJMHomeDR"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/nana/Desktop/liwei0229/DrWater/DJMHomeTY/Page/DRFacial/Controller/XHDRVC.m"
startingColumnNumber = "9223372036854775807"
......@@ -66,12 +66,12 @@
endingLineNumber = "719">
</Location>
<Location
uuid = "D6A24779-6660-40D2-BFFD-EC58A7A6F0F0 - 3ad9328a99095e56"
uuid = "D6A24779-6660-40D2-BFFD-EC58A7A6F0F0 - 268742d39dc9c040"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__29-[XHDRVC setIsVerifySucceed:]_block_invoke_3"
moduleName = "DJMHomeDR"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/nana/Desktop/liwei0229/DrWater/DJMHomeTY/Page/DRFacial/Controller/XHDRVC.m"
startingColumnNumber = "9223372036854775807"
......@@ -146,12 +146,12 @@
landmarkType = "7">
<Locations>
<Location
uuid = "726243AE-D041-4708-A980-4AEE9DC209D8 - 14f58d4f479ed3c5"
uuid = "726243AE-D041-4708-A980-4AEE9DC209D8 - 8abfd16435e4dd3"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[XHDRVC setIsVerifySucceed:]"
moduleName = "DJMHomeDR"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/nana/Desktop/liwei0229/DrWater/DJMHomeTY/Page/DRFacial/Controller/XHDRVC.m"
startingColumnNumber = "9223372036854775807"
......@@ -160,12 +160,12 @@
endingLineNumber = "672">
</Location>
<Location
uuid = "726243AE-D041-4708-A980-4AEE9DC209D8 - 5a4587bf34656e33"
uuid = "726243AE-D041-4708-A980-4AEE9DC209D8 - 461bf7e630a5f025"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__29-[XHDRVC setIsVerifySucceed:]_block_invoke"
moduleName = "DJMHomeDR"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/nana/Desktop/liwei0229/DrWater/DJMHomeTY/Page/DRFacial/Controller/XHDRVC.m"
startingColumnNumber = "9223372036854775807"
......@@ -192,12 +192,12 @@
landmarkType = "7">
<Locations>
<Location
uuid = "FBB3579D-0AA4-45CB-8ECE-21B9CCDD4947 - 14f58d4f479edefe"
uuid = "FBB3579D-0AA4-45CB-8ECE-21B9CCDD4947 - 8abfd16435e40e8"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[XHDRVC setIsVerifySucceed:]"
moduleName = "DJMHomeDR"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/nana/Desktop/liwei0229/DrWater/DJMHomeTY/Page/DRFacial/Controller/XHDRVC.m"
startingColumnNumber = "9223372036854775807"
......@@ -206,12 +206,12 @@
endingLineNumber = "695">
</Location>
<Location
uuid = "FBB3579D-0AA4-45CB-8ECE-21B9CCDD4947 - 3ad9328a990a593f"
uuid = "FBB3579D-0AA4-45CB-8ECE-21B9CCDD4947 - 268742d39dcac729"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__29-[XHDRVC setIsVerifySucceed:]_block_invoke_2"
moduleName = "DJMHomeDR"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/nana/Desktop/liwei0229/DrWater/DJMHomeTY/Page/DRFacial/Controller/XHDRVC.m"
startingColumnNumber = "9223372036854775807"
......@@ -330,69 +330,5 @@
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "CD7B83B6-97F4-4D23-9290-C097DEC3FFA4"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DRFacial/Controller/DXDRPlusVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "388"
endingLineNumber = "388"
landmarkName = "-didUpdateValueForCharacteristicValue:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "B43E24FF-EA1A-4A12-9729-DAFA654F7864"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DRFacial/Controller/DXDRPlusVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "401"
endingLineNumber = "401"
landmarkName = "-didUpdateValueForCharacteristicValue:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "B0345BE1-A4C2-4D4B-9408-FE1565A9A895"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DRFacial/Controller/DXDRPlusVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "390"
endingLineNumber = "390"
landmarkName = "-didUpdateValueForCharacteristicValue:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "E64C4929-C544-4A5B-A026-608E05B6021F"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DRFacial/Controller/DXDRPlusVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "394"
endingLineNumber = "394"
landmarkName = "-didUpdateValueForCharacteristicValue:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
DJMHomeTY/Page/DRFacial/Controller/DXDRPlusVC.m
......@@ -1102,8 +1102,10 @@
}];
[SVProgressHUD showInfoWithStatus:[NSString stringWithFormat:@"请拿起%@手柄开始操作",self.currentHandle == 20?@"20M白灯":@"3/10M蓝灯"]];
// if ([self.currentModel.pre_parameters.stress20M integerValue] != 0) {
//
// }
[SVProgressHUD showInfoWithStatus:[NSString stringWithFormat:@"请拿起%@手柄开始操作",[self.currentModel.pre_parameters.stress20M integerValue] != 0?@"20M白灯":@"3/10M蓝灯"]];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[SVProgressHUD dismiss];
......@@ -1136,53 +1138,61 @@
if(self.totalTime>0){
// if (self.isChangeHandle == 0) {
// if (self.totalTime == [self.currentModel.post_parameters.time integerValue]) {
//
if (self.isChangeHandle == 0) {
if (self.totalTime == [self.currentModel.post_parameters.time integerValue]) {
// self.smartView.step1Lb.backgroundColor = XHColorRGB(230, 230, 230);
// self.smartView.step1Lb.textColor = XHColorRGB(51, 51, 51);
//
// self.smartView.step2Lb.backgroundColor = XHColorRGB(164, 47, 36);
// self.smartView.step2Lb.textColor = XHColorRGB(255, 255, 255);
// [self stopDr02DAction];
// self.current3MStress = [self.currentModel.post_parameters.stress3M integerValue];
// self.current10MStress = [self.currentModel.post_parameters.stress10M integerValue];
// self.current20MStress = [self.currentModel.post_parameters.stress20M integerValue];
//// [HJGetBluetoothManager writeStr:[DR_02_D_send_UltrasoundStop withCrc16Modbus]];//暂停
// if ([self.currentModel.post_parameters.stress20M integerValue] != 0) {
// [HJGetBluetoothManager writeStr:[DR_02_D_send_Select20M withCrc16Modbus]];
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
// if (self.isLit) {
// [self changeLitStressWith3M:self.current3MStress And10M:self.current10MStress And20M:self.current20MStress];
// }else{
// [self changeStressWith3M:self.current3MStress And10M:self.current10MStress And20M:self.current20MStress];
// }
//
// });
// }else{
// [HJGetBluetoothManager writeStr:[DR_02_D_send_Select3And10M withCrc16Modbus]];
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
// if (self.isLit) {
// [self changeLitStressWith3M:self.current3MStress And10M:self.current10MStress And20M:self.current20MStress];
// }else{
// [self changeStressWith3M:self.current3MStress And10M:self.current10MStress And20M:self.current20MStress];
// }
// });
// }
// HJAlertView *alertView = [[HJAlertView alloc] init];
// alertView.parentView = [UIApplication sharedApplication].keyWindow;
// alertView.title = HJLocalizedString(@"提示");
// alertView.message = HJLocalizedString(@"请切换手柄继续护理");
// [alertView setButtonTitles:[NSMutableArray arrayWithObjects:HJLocalizedString(@"确定"), nil]];
// [alertView show];
// alertView.onButtonTouchUpInside = ^(HJAlertView * _Nonnull alertView, NSInteger buttonIndex) {
//
// [alertView close];
// self.isChangeHandle = 1;
// };
// return;
// }
// }
self.smartView.step1Btn.selected = NO;
self.smartView.step2Btn.selected = YES;
self.smartView.step1Lb.backgroundColor = XHColorRGB(205, 205, 205);
self.smartView.step2Lb.backgroundColor = XHColorRGB(164, 47, 36);
[self stopDr02DAction];
self.current3MStress = [self.currentModel.post_parameters.stress3M integerValue];
self.current10MStress = [self.currentModel.post_parameters.stress10M integerValue];
self.current20MStress = [self.currentModel.post_parameters.stress20M integerValue];
// [HJGetBluetoothManager writeStr:[DR_02_D_send_UltrasoundStop withCrc16Modbus]];//暂停
if ([self.currentModel.post_parameters.stress20M integerValue] != 0) {
[HJGetBluetoothManager writeStr:[DR_02_D_send_Select20M withCrc16Modbus]];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
if (self.isLit) {
[self changeLitStressWith3M:self.current3MStress And10M:self.current10MStress And20M:self.current20MStress];
}else{
[self changeStressWith3M:self.current3MStress And10M:self.current10MStress And20M:self.current20MStress];
}
});
}else{
[HJGetBluetoothManager writeStr:[DR_02_D_send_Select3And10M withCrc16Modbus]];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
if (self.isLit) {
[self changeLitStressWith3M:self.current3MStress And10M:self.current10MStress And20M:self.current20MStress];
}else{
[self changeStressWith3M:self.current3MStress And10M:self.current10MStress And20M:self.current20MStress];
}
});
}
HJAlertView *alertView = [[HJAlertView alloc] init];
alertView.parentView = [UIApplication sharedApplication].keyWindow;
alertView.title = HJLocalizedString(@"提示");
alertView.message = HJLocalizedString(@"请切换手柄继续护理");
[alertView setButtonTitles:[NSMutableArray arrayWithObjects:HJLocalizedString(@"确定"), nil]];
[alertView show];
alertView.onButtonTouchUpInside = ^(HJAlertView * _Nonnull alertView, NSInteger buttonIndex) {
[alertView close];
self.isChangeHandle = 1;
};
return;
}
}
......
DJMHomeTY/Page/DRFacial/View/DXDRPlusSmartView.m
......@@ -779,16 +779,16 @@
selectedButton.selected = YES;
UIButton *stepBtn = [selectedButton viewWithTag:108];
stepBtn.selected = YES;
if (self.delegate && [self.delegate respondsToSelector:@selector(changeVideoProgressWithHandelType:)]) {
NSInteger handel;
if ([selectedButton.titleLabel.text containsString:@"20M"]) {
handel = 20;
}else{
handel = 3;
}
[self.delegate changeVideoProgressWithHandelType:handel];
}
// stepBtn.selected = YES;
// if (self.delegate && [self.delegate respondsToSelector:@selector(changeVideoProgressWithHandelType:)]) {
// NSInteger handel;
// if ([selectedButton.titleLabel.text containsString:@"20M"]) {
// handel = 20;
// }else{
// handel = 3;
// }
// [self.delegate changeVideoProgressWithHandelType:handel];
// }
// 3. 自动滚动到可见区域
[self scrollToMakeButtonVisible:selectedButton];
}
......
DJMHomeTY/Page/HomePage/Controller/XHMainVC1.m
......@@ -49,14 +49,10 @@
@property (nonatomic,strong) NSTimer *timer;
/// 总时间
@property (nonatomic,assign) NSInteger totalTime;
/// 子时间
@property (nonatomic,assign) NSInteger subtotalTime;
/// 运行时间
@property (nonatomic,assign) NSInteger runningTime;
/// 记录运行时间
@property (nonatomic,assign) NSInteger recordTime;
/// 子记录运行时间
@property (nonatomic,assign) NSInteger subrecordTime;
//3M强度
@property (nonatomic,assign) NSInteger set3MStrengthNum;
//10M强度
......@@ -84,62 +80,18 @@
#pragma mark - ==========懒加载==========
-(NSArray *)programArr{
if (_programArr == nil) {
//0/3/4/5/7
// _programArr = @[
// @[@{@"totaltimes":@720,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@15,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
// @[@{@"totaltimes":@1440,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@20,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
// @[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@20,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
// @[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@20,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
// @[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@15,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
// @[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@5,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@3}],
// @[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@20,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
// @[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@10,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@8}],
// @[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@5,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@5}],
// @[@{@"totaltimes":@1440,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@5,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@5}]
// ];
// _programArr = @[
// @[@{@"totaltimes":@720,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@15,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],//眼部护理
//
// @[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@20,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],//轮廓清晰
// @[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@15,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],//面部饱满
// @[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@5,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@3}],// 褪红舒敏
//
// @[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@10,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@8}]// 嫩滑提亮
if(TargetType == 4){
_programArr = @[
@[@{@"totaltimes":@720,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@10,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@0}],//眼部护理
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@15,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],//轮廓清晰
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@10,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@10}],//面部饱满
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@5,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@5}],// 褪红舒敏
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@15,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],// 嫩滑提亮
@[@{@"totaltimes":@1200,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@10,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@10}],// 关节淡化
@[@{@"totaltimes":@1800,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@15,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],// 身体塑形
@[@{@"totaltimes":@1800,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@15,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}]// 身体淡纹
];
}else{
_programArr = @[
@[@{@"totaltimes":@720,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@15,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
@[@{@"totaltimes":@1440,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@20,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@20,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@20,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@15,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@5,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@3}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@20,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@10,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@8}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@5,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@5}],
@[@{@"totaltimes":@1440,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@5,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@5}]
];
}
_programArr = @[
@[@{@"totaltimes":@720,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@15,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
@[@{@"totaltimes":@1440,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@20,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@20,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@20,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@15,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@5,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@3}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@20,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@10,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@8}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@5,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@5}],
@[@{@"totaltimes":@1440,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@5,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@5}]
];
}
return _programArr;
}
......@@ -154,7 +106,7 @@
if (TargetType != 5) {
if(TargetType == 4){
XHGetDataManager.deviceCode = DrDeviceDr02BName;
self.title = @"K9";
self.title = @"Dr-02-B";
}else{
NSArray *arr = @[TYDeviceName,PS2DeviceName,@"",DrDeviceFacialName,Dr02DeviceName,PS2DeviceName];
XHGetDataManager.deviceCode = arr[TargetType-1];
......@@ -195,16 +147,6 @@
if(self.topTitleBtn.hidden == true){
self.topTitleBtn.hidden = false;
}
// if ([XHGetDataManager.deviceCode isEqualToString:@"K9"]) {
//
// self.topTitleBtn.hidden = true;
//
// }else{
// if(self.topTitleBtn.hidden == true){
// self.topTitleBtn.hidden = false;
// }
// }
}
}
......@@ -285,15 +227,6 @@
weakSelf.myCustomView.hidden = false;
weakSelf.mySmartView.hidden = true;
weakSelf.myNoconnectView.hidden = true;
// if ([XHGetDataManager.deviceCode isEqualToString:@"K9"]) {
// weakSelf.mySwitchModelBtn.hidden = true;
// weakSelf.topTitleBtn.hidden = true;
// weakSelf.titLb.hidden = true;
// }else{
// weakSelf.mySwitchModelBtn.hidden = false;
// weakSelf.topTitleBtn.hidden = false;
// weakSelf.titLb.hidden = false;
// }
}
[weakSelf setNavState:false];
......@@ -311,15 +244,6 @@
weakSelf.mySwitchModelBtn.hidden = true;
weakSelf.topTitleBtn.hidden = true;
}
// if ([XHGetDataManager.deviceCode isEqualToString:@"K9"]) {
// weakSelf.mySwitchModelBtn.hidden = true;
// weakSelf.topTitleBtn.hidden = true;
// weakSelf.titLb.hidden = true;
// }else{
// weakSelf.mySwitchModelBtn.hidden = false;
// weakSelf.topTitleBtn.hidden = false;
// weakSelf.titLb.hidden = false;
// }
}
}
......@@ -348,16 +272,11 @@
self.titLb = [UILabel myUILabelSuperView:self.view withNSTextAlignment:NSTextAlignmentCenter withContent:state?HJLocalizedString(@"自定义模式"):HJLocalizedString(@"智能模式") withFont:XHFontSize(12) withTextColor:XHColorHex(0x939393) withResize:true];
[self.titLb mas_makeConstraints:^(MASConstraintMaker *make) {
if(state){
if ([XHGetDataManager.deviceCode isEqualToString:@"K9"]) {
make.centerX.mas_equalTo(self.view.centerX).offset(-12*IPhone6ScaleWidth);
}else{
make.centerX.mas_equalTo(self.view.centerX).offset(-12*IPhone6ScaleWidth);
}
make.centerX.mas_equalTo(self.view.centerX).offset(-12*IPhone6ScaleWidth);
}else{
make.centerX.mas_equalTo(self.view.centerX).offset(-7*IPhone6ScaleWidth);
}
make.top.mas_equalTo(self.view.mas_top).offset(HJNavHeight + 10);
make.top.mas_equalTo(self.view.mas_top).offset(HJNavHeight-12);
}];
UIButton *mySwitchModelBtn = [UIButton myUIButtonSuperView:self.view withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(SwitchModelBtn:) withTag:10000 withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
......@@ -377,12 +296,11 @@
self.titLb.hidden = true;
self.mySwitchModelBtn.hidden = true;
// self.mySwitchModelBtn.enabled = false;
self.mySwitchModelBtn.enabled = false;
UIButton *SwitchModelBtn = [UIButton myUIButtonSuperView:self.navigationController.navigationBar withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(SwitchModelBtn:) withTag:100000 withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
[SwitchModelBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.centerX.mas_equalTo(self.navigationController.navigationBar);
// make.centerY.centerX.mas_equalTo(self.titLb);
make.height.mas_equalTo(64*IPhone6ScaleHeight);
make.width.mas_equalTo(CGSizeMake(self.titLb.width+25*IPhone6ScaleWidth, 64*IPhone6ScaleHeight));
}];
......@@ -412,7 +330,6 @@
}];
self.mySwitchModelBtn = mySwitchModelBtn;
self.mySwitchModelBtn.selected = true;
// self.mySwitchModelBtn.selected = false;
self.titLb.hidden = true;
self.mySwitchModelBtn.hidden = true;
}
......@@ -439,12 +356,6 @@
[UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent;
}
-(void)SwitchModelBtn:(UIButton*)sender{
// self.myCustomView.strengthLb1.text = _s3MStrengthNum==0?@"0":[NSString stringWithFormat:@"%.f",_s3MStrengthNum];
// self.myCustomView.strengthLb2.text = _s10MStrengthNum==0?@"0":[NSString stringWithFormat:@"%.f",_s10MStrengthNum];
self.subrecordTime = 0;
self.mySmartView.operationTimeLb.text = [[HJTools shared] secondToTime:(self.subtotalTime-self.subrecordTime)];
self.mySmartView.totalTimeLb.text = [[HJTools shared] secondToTime:(self.totalTime-self.recordTime)];
self.myCustomView.operationTimeLb.text = [[HJTools shared] secondToTime:(self.totalTime-self.recordTime)];
if(!self.isStartted){
NSLog(@"=-==-:%d",sender.selected);
[self hideAutoOrCustomView:sender.selected];
......@@ -464,59 +375,8 @@
[self initMyData:sender.selected];
}
}else{
// [self showError:HJLocalizedString(@"当前模式正在进行中，请结束后再切换模式!")];
if (self.remaintime>0) {
if (self.isStart) {
[HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"06000B31020200"] withCrc16Modbus]];//暂停
[self hideAutoOrCustomView:sender.selected];
self.titLb.text = sender.selected?HJLocalizedString(@"自定义模式"):HJLocalizedString(@"智能模式");
[self.titLb mas_updateConstraints:^(MASConstraintMaker *make) {
if(!sender.selected){
make.centerX.mas_equalTo(self.view.centerX).offset(-12*IPhone6ScaleWidth);
}else{
// make.centerX.mas_equalTo(self.view.centerX).offset(-7*IPhone6ScaleWidth);
make.centerX.mas_equalTo(self.view.centerX).offset(-10*IPhone6ScaleWidth);
}
}];
sender.selected = !sender.selected;
XHGetDataManager.isOrNotOutoModel = !sender.selected;
NSLog(@"=-=-:%d",XHGetDataManager.isOrNotOutoModel);
if (sender.selected) {//自定义模式
[self initMyData:sender.selected];
}
}else{
[self hideAutoOrCustomView:sender.selected];
self.titLb.text = sender.selected?HJLocalizedString(@"自定义模式"):HJLocalizedString(@"智能模式");
[self.titLb mas_updateConstraints:^(MASConstraintMaker *make) {
if(!sender.selected){
make.centerX.mas_equalTo(self.view.centerX).offset(-12*IPhone6ScaleWidth);
}else{
// make.centerX.mas_equalTo(self.view.centerX).offset(-7*IPhone6ScaleWidth);
make.centerX.mas_equalTo(self.view.centerX).offset(-10*IPhone6ScaleWidth);
}
}];
sender.selected = !sender.selected;
XHGetDataManager.isOrNotOutoModel = !sender.selected;
NSLog(@"=-=-:%d",XHGetDataManager.isOrNotOutoModel);
if (sender.selected) {//自定义模式
[self initMyData:sender.selected];
}
}
}else{
// HJSelfWeak;
// [self getUseTimes:^(BOOL getTimesSuccessful) {
// HJSelfStrong;
// if(getTimesSuccessful == false){
// [strongSelf deviceValidTime];
// }
// }];
}
[self showError:HJLocalizedString(@"当前模式正在进行中，请结束后再切换模式!")];
}
[self initMyData:sender.selected];
}
#pragma mark UI 显示ModelVie
-(void)showModelView{
......@@ -524,89 +384,28 @@
self.mySelectModelView.selectModelIIndex = self.modelSelectindex;
[self.view addSubview:self.mySelectModelView];
HJSelfWeak;
// __block NSInteger tag = 0;
__block NSInteger index = weakSelf.modelSelectindex;
self.mySelectModelView.sendModelBlock = ^(UIButton * _Nonnull sender) {
// tag = 1;
if (sender.tag != Home_SelectModelSureBtntag) {
index = sender.tag-Home_SelectModel1Btntag;
NSLog(@"");
if(sender.tag!=Home_SelectModelSureBtntag){
weakSelf.modelSelectindex = sender.tag-Home_SelectModel1Btntag;
}else{
if (index == weakSelf.modelSelectindex) {
if (index == 0 && self.subrecordTime == 0) {
weakSelf.modelSelectindex = index;
weakSelf.subrecordTime = 0;
[weakSelf.mySelectModelView dismissAlert];
[weakSelf updateUI];
}else{
[weakSelf.mySelectModelView dismissAlert];
}
}else{
weakSelf.modelSelectindex = index;
weakSelf.subrecordTime = 0;
[weakSelf.mySelectModelView dismissAlert];
[weakSelf updateUI];
}
[weakSelf.mySelectModelView dismissAlert];
[weakSelf updateUI];
}
// if(sender.tag!=Home_SelectModelSureBtntag){
// weakSelf.modelSelectindex = sender.tag-Home_SelectModel1Btntag;
// NSLog(@"");
// }else{
// if (weakSelf.modelSelectindex != sender.tag - Home_SelectModel1Btntag) {
// weakSelf.subrecordTime = 0;
// }
//
// [weakSelf.mySelectModelView dismissAlert];
// [weakSelf updateUI];
// }
};
}
-(void)updateUI{
__block XHMainVC1 *mainVC = self;
mainVC.mySmartView.SelectModeOrNot = true;
mainVC.mySmartView.seletModelIndex = self.modelSelectindex;
mainVC.mySmartView.operationTimeLb.text = [[HJTools shared] secondToTime:[mainVC.programArr[self.modelSelectindex][0][@"totaltimes"] integerValue]];
mainVC.mySmartView.operationItemLb.text = HJLocalizedString(@"请操作左脸");
mainVC.subtotalTime = [mainVC.programArr[self.modelSelectindex][0][@"totaltimes"] integerValue];
mainVC.totalTime = [mainVC.programArr[self.modelSelectindex][0][@"totaltimes"] integerValue];
mainVC.set3MStrengthNum = [mainVC.programArr[mainVC.modelSelectindex][0][@"3MTakt"] integerValue];
// mainVC.set3MStrengthNum = 0;
// mainVC.set3MStrengthNum = [mainVC.programArr[mainVC.modelSelectindex][0][@"3MTakt"] integerValue];
mainVC.set3MStrengthNum = 0;
mainVC.set10MStrengthNum = [mainVC.programArr[mainVC.modelSelectindex][0][@"10MTakt"] integerValue];
if (self.modelSelectindex == 5 || self.modelSelectindex == 6 || self.modelSelectindex == 7) {
if (self.modelSelectindex == 5) {
self.mySmartView.faceImage.image = [UIImage imageNamed:@"k9_gj"];
}else if (self.modelSelectindex == 6){
self.mySmartView.faceImage.image = [UIImage imageNamed:@"k9_sx"];
}else if (self.modelSelectindex == 7){
self.mySmartView.faceImage.image = [UIImage imageNamed:@"k9_dw"];
}
mainVC.mySmartView.centerLine.hidden = YES;
mainVC.mySmartView.operationItemLb.text = HJLocalizedString(@"");
[mainVC.mySmartView.operationTimeLb mas_remakeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(mainVC.mySmartView.faceImage.mas_top).offset(-20*IPhone6ScaleHeight);
make.centerX.mas_equalTo(mainVC.mySmartView.SelectModelView);
}];
}else{
self.mySmartView.faceImage.image = [UIImage imageNamed:@"Home_Face"];
mainVC.mySmartView.centerLine.hidden = NO;
mainVC.mySmartView.operationItemLb.text = HJLocalizedString(@"请操作左脸");
[mainVC.mySmartView.operationTimeLb mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(mainVC.mySmartView.centerLine.mas_right).offset(10*IPhone6ScaleWidth);
make.centerY.mas_equalTo(mainVC.mySmartView.centerLine);
make.height.mas_equalTo(mainVC.mySmartView.centerLine);
}];
}
//20230608向上取整取结果
if(TargetType ==5 ||TargetType == 4){
if([XHGetDataManager.deviceCode isEqual:Dr021DeviceName]||[XHGetDataManager.deviceCode isEqual:Dr02DeviceName]||[XHGetDataManager.deviceCode isEqual:Dr022DeviceName]||[XHGetDataManager.deviceCode isEqual:DrDeviceDr02BName]){
......@@ -647,11 +446,10 @@
}
if (sender.tag ==Home_SelectPlanBtnTag) {
// if(self.isStartted){//方案已经开始不能切换
// [self showError:HJLocalizedString(@"请结束当前方案后再切换")];
// return;
// }
[HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"06000B31020200"] withCrc16Modbus]];//暂停
if(self.isStartted){//方案已经开始不能切换
[self showError:HJLocalizedString(@"请结束当前方案后再切换")];
return;
}
[self showModelView];
}else if (sender.tag ==Home_customSetFrequecytBtnTag){
[self showCustomView];
......@@ -709,24 +507,13 @@
self.runningTime = 0;
self.recordTime = 0;
self.remaintime = 0;
self.subrecordTime = 0;
self.subtotalTime = 0;
if(XHGetDataManager.isOrNotOutoModel){
self.myCustomView.operationTimeLb.text = [[HJTools shared] secondToTime:(self.totalTime-self.recordTime)];
self.mySmartView.operationTimeLb.text = [[HJTools shared] secondToTime:(self.subtotalTime-self.subrecordTime)];
self.mySmartView.totalTimeLb.text = [[HJTools shared] secondToTime:(self.subtotalTime-self.subrecordTime)];
self.myCustomView.endedBtn.hidden = true;
self.mySmartView.endedBtn.hidden = true;
}else{
if (self.modelSelectindex != 5 && self.modelSelectindex != 6 && self.modelSelectindex != 7) {
self.mySmartView.operationItemLb.text = HJLocalizedString(@"请操作左脸");
}
self.mySmartView.endedBtn.hidden = true;
self.mySmartView.operationTimeLb.text = [[HJTools shared] secondToTime:(self.subtotalTime-self.subrecordTime)];
self.mySmartView.totalTimeLb.text = [[HJTools shared] secondToTime:(self.subtotalTime-self.subrecordTime)];
self.myCustomView.endedBtn.hidden = true;
self.mySmartView.operationItemLb.text = HJLocalizedString(@"请操作左脸");
self.mySmartView.endedBtn.hidden = true;
self.mySmartView.operationTimeLb.text = [[HJTools shared] secondToTime:(self.totalTime-self.recordTime)];
}
[HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"06000B31020200"] withCrc16Modbus]];//暂停
[self stopAction];
......@@ -1036,20 +823,9 @@
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.02 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
if(weakSelf.titLb.hidden){
// weakSelf.titLb.hidden = false;
// if ([XHGetDataManager.deviceCode isEqualToString:@"K9"]) {
// weakSelf.mySwitchModelBtn.hidden = true;
// weakSelf.topTitleBtn.hidden = true;
// weakSelf.titLb.hidden = true;
// }else{
// weakSelf.mySwitchModelBtn.hidden = false;
// weakSelf.topTitleBtn.hidden = false;
// weakSelf.titLb.hidden = false;
// }
weakSelf.titLb.hidden = false;
weakSelf.mySwitchModelBtn.hidden = false;
weakSelf.topTitleBtn.hidden = false;
weakSelf.titLb.hidden = false;
}
//获取手柄连接状态
[HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"05000B330252"] withCrc16Modbus]];
......@@ -1524,7 +1300,7 @@
[paramsDic setObject:@"test" forKey:@"ordernumber"];
[paramsDic setObject:[NSString isNull:self.dataModel.orderMap.verification]?@"0":self.dataModel.orderMap.verification forKey:@"ordernumber"];
// [paramsDic setObject:XHGetDataManager.clientId forKey:@"customerID"];
[paramsDic setObject:self.guestureId?self.guestureId:@"0" forKey:@"cid"];
[paramsDic setObject:self.guestureId forKey:@"cid"];
[paramsDic setObject:[NSString isNull:self.verificationNum]?@"0":self.verificationNum forKey:@"number"];
NSLog(@"=-=-=---=-=-=-=paramsDicparamsDicparamsDic2:%@",updateDic);
[HJUserDefaults setObject:paramsDic forKey:@"updateDictyTYLDM"];
......@@ -1576,7 +1352,6 @@
}
}else{
self.myCustomView.operationTimeLb.text = [[HJTools shared] secondToTime:(self.totalTime-self.recordTime)];
[SVProgressHUD showInfoWithStatus:@"护理已结束"];
[self updateLDMRecord];
#pragma mark RequirementChangeRecord_h
self.myCustomView.endedBtn.hidden = true;
......@@ -1590,123 +1365,48 @@
}
}else{
if(self.totalTime-self.recordTime>0){
if (self.subtotalTime == self.subrecordTime) {
[SVProgressHUD showInfoWithStatus:@"护理已结束"];
[HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"06000B31020200"] withCrc16Modbus]];//暂停
[self stopAction];
__block XHMainVC1 *mainVC = self;
self.subrecordTime = 0;
mainVC.mySmartView.operationTimeLb.text = [[HJTools shared] secondToTime:[mainVC.programArr[self.modelSelectindex][0][@"totaltimes"] integerValue]];
self.subtotalTime = [mainVC.programArr[self.modelSelectindex][0][@"totaltimes"] integerValue];
if (self.modelSelectindex != 5 && self.modelSelectindex != 6 && self.modelSelectindex != 7) {
self.mySmartView.operationItemLb.text = HJLocalizedString(@"请操作左脸");
}
// self.mySmartView.operationItemLb.text = HJLocalizedString(@"请操作左脸");
}else{
self.runningTime++;
self.subrecordTime++;
self.recordTime++;
if(self.subrecordTime%20==0){
[self saveLocationRecord];
}
if(self.subrecordTime%3==0){
/// 工作提示音
[self playSoundEffect:@"working.wav"];
self.runningTime++;
self.recordTime++;
if(self.recordTime%20==0){
[self saveLocationRecord];
}
if(self.recordTime%3==0){
/// 工作提示音
[self playSoundEffect:@"working.wav"];
}
if(self.runningTime>=1){
if(self.runningTime==1){//10M 3min钟
[self upenergyLbMixOrNot:0];
}else if(self.runningTime==treatTimes){//混合3min钟
[self upenergyLbMixOrNot:1];
}else if((self.runningTime==(self.totalTime/2))||(((self.runningTime%(2*treatTimes))== 0)&& (self.runningTime !=0))){
self.runningTime = 0;
}
if(self.runningTime>=1){
if(self.runningTime==1){//10M 3min钟
[self upenergyLbMixOrNot:0];
}else if(self.runningTime==treatTimes){//混合3min钟
[self upenergyLbMixOrNot:1];
}else if((self.runningTime==(self.subtotalTime/2))||(((self.runningTime%(2*treatTimes))== 0)&& (self.runningTime !=0))){
self.runningTime = 0;
}
if((self.subrecordTime==(self.subtotalTime/2))){
//20230612切换
self.runningTime = 0;
if (self.modelSelectindex != 5 && self.modelSelectindex != 6 && self.modelSelectindex != 7) {
self.mySmartView.operationItemLb.text = HJLocalizedString(@"请操作右脸");
}
// self.mySmartView.operationItemLb.text = HJLocalizedString(@"请操作右脸");
[self playSoundEffect:@"tips.wav"];
}
if((self.recordTime==(self.totalTime/2))){
//20230612切换
self.runningTime = 0;
self.mySmartView.operationItemLb.text = HJLocalizedString(@"请操作右脸");
[self playSoundEffect:@"tips.wav"];
}
self.mySmartView.operationTimeLb.text = [[HJTools shared] secondToTime:(self.subtotalTime-self.subrecordTime)];
self.mySmartView.totalTimeLb.text = [[HJTools shared] secondToTime:(self.totalTime-self.recordTime)];
}
self.mySmartView.operationTimeLb.text = [[HJTools shared] secondToTime:(self.totalTime-self.recordTime)];
}else{
self.isStartted = false;
self.isStart = false;
[self updateLDMRecord];
self.runningTime = 0;
self.recordTime = 0;
self.remaintime = 0;
self.subrecordTime = 0;
self.mySmartView.operationTimeLb.text = [[HJTools shared] secondToTime:(self.subtotalTime-self.subrecordTime)];
self.mySmartView.totalTimeLb.text = [[HJTools shared] secondToTime:(self.totalTime-self.recordTime)];
// self.mySmartView.operationItemLb.text = HJLocalizedString(@"请操作左脸");
if (self.modelSelectindex != 5 && self.modelSelectindex != 6 && self.modelSelectindex != 7) {
self.mySmartView.operationItemLb.text = HJLocalizedString(@"请操作左脸");
}
self.mySmartView.operationTimeLb.text = [[HJTools shared] secondToTime:(self.totalTime-self.recordTime)];
self.mySmartView.operationItemLb.text = HJLocalizedString(@"请操作左脸");
#pragma mark RequirementChangeRecord_h
self.mySmartView.endedBtn.hidden = true;
[self upenergyLbMixOrNot:0];
[SVProgressHUD showInfoWithStatus:@"护理已结束"];
[HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"06000B31020200"] withCrc16Modbus]];//暂停
[self stopAction];
}
// if(self.subtotalTime-self.subrecordTime>0){
// self.runningTime++;
// self.subrecordTime++;
// self.recordTime++;
// if(self.subrecordTime%20==0){
// [self saveLocationRecord];
// }
// if(self.subrecordTime%3==0){
// /// 工作提示音
// [self playSoundEffect:@"working.wav"];
// }
// if(self.runningTime>=1){
// if(self.runningTime==1){//10M 3min钟
// [self upenergyLbMixOrNot:0];
// }else if(self.runningTime==treatTimes){//混合3min钟
// [self upenergyLbMixOrNot:1];
// }else if((self.runningTime==(self.subtotalTime/2))||(((self.runningTime%(2*treatTimes))== 0)&& (self.runningTime !=0))){
// self.runningTime = 0;
// }
// if((self.subrecordTime==(self.subtotalTime/2))){
// //20230612切换
// self.runningTime = 0;
// self.mySmartView.operationItemLb.text = HJLocalizedString(@"请操作右脸");
// [self playSoundEffect:@"tips.wav"];
// }
// }
// self.mySmartView.operationTimeLb.text = [[HJTools shared] secondToTime:(self.subtotalTime-self.subrecordTime)];
// self.mySmartView.totalTimeLb.text = [[HJTools shared] secondToTime:(self.totalTime-self.recordTime)];
// }else{
//
// self.isStartted = false;
// self.isStart = false;
// [self updateLDMRecord];
// self.runningTime = 0;
// self.recordTime = 0;
// self.remaintime = 0;
// self.subrecordTime = 0;
// self.mySmartView.operationTimeLb.text = [[HJTools shared] secondToTime:(self.subtotalTime-self.subrecordTime)];
// self.mySmartView.totalTimeLb.text = [[HJTools shared] secondToTime:(self.totalTime-self.recordTime)];
// self.mySmartView.operationItemLb.text = HJLocalizedString(@"请操作左脸");
//#pragma mark RequirementChangeRecord_h
// self.mySmartView.endedBtn.hidden = true;
// [self upenergyLbMixOrNot:0];
// [SVProgressHUD showInfoWithStatus:@"护理已结束"];
// [HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"06000B31020200"] withCrc16Modbus]];//暂停
// [self stopAction];
// }
}
}
/// 是否混合 20230612
......@@ -1717,20 +1417,14 @@
self.set10MStrengthNum = [self.programArr[self.modelSelectindex][0][@"10MTakt"] integerValue];
[HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"09000B310211%@%@%@%@",[NSString ToLongHex:(treat3MEnergy) withLength:2],[NSString ToLongHex:(self.set3MStrengthNum) withLength:2],[NSString ToLongHex:(treat10MEnergy) withLength:2],[NSString ToLongHex:(self.set10MStrengthNum) withLength:2]] withCrc16Modbus]];
}else{
self.set3MStrengthNum = [self.programArr[self.modelSelectindex][0][@"3MTakt"] integerValue];
self.set3MStrengthNum = 0;
self.set10MStrengthNum = [self.programArr[self.modelSelectindex][0][@"10MTakt"] integerValue];
[HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"09000B310211%@%@%@%@",[NSString ToLongHex:(treat3MEnergy) withLength:2],[NSString ToLongHex:(self.set3MStrengthNum) withLength:2],[NSString ToLongHex:(treat10MEnergy) withLength:2],[NSString ToLongHex:(self.set10MStrengthNum) withLength:2]] withCrc16Modbus]];
// self.set3MStrengthNum = 0;
// self.set10MStrengthNum = [self.programArr[self.modelSelectindex][0][@"10MTakt"] integerValue];
// [HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"09000B310211%@%@%@%@",[NSString ToLongHex:(0) withLength:2],[NSString ToLongHex:(0) withLength:2],[NSString ToLongHex:(treat10MEnergy) withLength:2],[NSString ToLongHex:(self.set10MStrengthNum) withLength:2]] withCrc16Modbus]];
[HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"09000B310211%@%@%@%@",[NSString ToLongHex:(0) withLength:2],[NSString ToLongHex:(0) withLength:2],[NSString ToLongHex:(treat10MEnergy) withLength:2],[NSString ToLongHex:(self.set10MStrengthNum) withLength:2]] withCrc16Modbus]];
}
// if((self.recordTime != 1)||(self.recordTime != 0)){
// [self playSoundEffect:@"tips.wav"];
// }
if(TargetType ==5||TargetType ==4){
if([XHGetDataManager.deviceCode isEqual:Dr021DeviceName]||[XHGetDataManager.deviceCode isEqual:Dr02DeviceName]||[XHGetDataManager.deviceCode isEqual:Dr022DeviceName]||[XHGetDataManager.deviceCode isEqual:DrDeviceDr02BName]){
self.mySmartView.strengthLb1.text =self.set3MStrengthNum==0?@"0":[NSString stringWithFormat:@"%.f",ceilf(self.set3MStrengthNum/5.0)];
self.mySmartView.strengthLb2.text =self.set10MStrengthNum==0?@"0":[NSString stringWithFormat:@"%.f",ceilf(self.set10MStrengthNum/5.0)];
......@@ -1749,10 +1443,8 @@
dispatch_async(dispatch_get_main_queue(), ^{
if (XHGetDataManager.isOrNotOutoModel) {
weakSelf.myCustomView.strengStartBtn.selected = false;
weakSelf.mySmartView.startBtn.selected = false;
}else{
weakSelf.mySmartView.startBtn.selected = false;
weakSelf.myCustomView.strengStartBtn.selected = false;
}
});
self.isStart = false;
......@@ -1796,28 +1488,9 @@
}
-(void)setIsVerifySucceed:(BOOL)isVerifySucceed{
if (isVerifySucceed) {
// if(XHGetDataManager.isOrNotOutoModel){
//
//
// }
if(XHGetDataManager.isOrNotOutoModel){
// self.remaintime = self.remaintime;
// self.totalTime = self.remaintime;
self.subtotalTime = self.remaintime;
self.remaintime = self.remaintime;
self.totalTime = self.remaintime;
__block XHMainVC1 *mainVC = self;
mainVC.mySmartView.operationTimeLb.text = [[HJTools shared] secondToTime:[mainVC.programArr[self.modelSelectindex][0][@"totaltimes"] integerValue]];
mainVC.mySmartView.totalTimeLb.text = [[HJTools shared] secondToTime:self.remaintime];
mainVC.subtotalTime = [mainVC.programArr[self.modelSelectindex][0][@"totaltimes"] integerValue];
}else{
self.subtotalTime = self.remaintime;
self.remaintime = self.remaintime;
self.totalTime = self.remaintime;
__block XHMainVC1 *mainVC = self;
mainVC.mySmartView.operationTimeLb.text = [[HJTools shared] secondToTime:[mainVC.programArr[self.modelSelectindex][0][@"totaltimes"] integerValue]];
mainVC.mySmartView.totalTimeLb.text = [[HJTools shared] secondToTime:self.remaintime];
mainVC.subtotalTime = [mainVC.programArr[self.modelSelectindex][0][@"totaltimes"] integerValue];
}
}
}
......
DJMHomeTY/Page/HomePage/View/XHCustomView.m
......@@ -161,30 +161,24 @@
make.height.mas_equalTo(10*IPhone6ScaleHeight);
make.width.mas_equalTo(20*IPhone6ScaleHeight);
}];//
UIImageView *faceImg = [UIImageView myUIImageViewSuperView:myView withImageName:(TargetType==5)?@"DrTY_DeviceConnectedImg":(TargetType==4)?@"dr02BMain1":@"Main_device"];//
UIImageView *faceImg = [UIImageView myUIImageViewSuperView:myView withImageName:(TargetType==5)?@"DrTY_DeviceConnectedImg":(TargetType==4)?@"dr02BMain":@"Main_device"];//
[faceImg mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(myView);
make.top.mas_equalTo(strengthLb2Bottom.mas_bottom).offset(53*IPhone6ScaleHeight);
// make.height.mas_equalTo(127.25*IPhone6ScaleHeight);
// make.width.mas_equalTo(110*IPhone6ScaleWidth);
make.size.mas_equalTo(CGSizeMake(203, 123));
make.height.mas_equalTo(127.25*IPhone6ScaleHeight);
make.width.mas_equalTo(110*IPhone6ScaleWidth);
}];
self.faceImage = faceImg;
// UILabel *rightLb = [UILabel myUILabelSuperView:myView withNSTextAlignment:NSTextAlignmentLeft withContent:HJLocalizedString(HJLocalizedString(@"00:12:00")) withFont:XHFontSize(16) withTextColor:XHBtnTextColor withResize:true];
// [rightLb mas_makeConstraints:^(MASConstraintMaker *make) {
// make.centerX.mas_equalTo(myView);
// make.top.mas_equalTo(faceImg.mas_bottom).offset(15*IPhone6ScaleHeight);
// make.height.mas_equalTo(16.5*IPhone6ScaleHeight);
//
// }];
// self.operationTimeLb = rightLb;
UILabel *rightLb = [UILabel myUILabelSuperView:myView withNSTextAlignment:NSTextAlignmentLeft withContent:HJLocalizedString(HJLocalizedString(@"00:12:00")) withFont:XHFontSize(16) withTextColor:XHBtnTextColor withResize:true];
[rightLb mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(myView);
make.top.mas_equalTo(faceImg.mas_bottom).offset(15*IPhone6ScaleHeight);
make.height.mas_equalTo(16.5*IPhone6ScaleHeight);
}];
self.operationTimeLb = rightLb;
UIButton *startBtn = [UIButton myUIButtonSuperView:myView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(selectPlanOrSatrtAction:) withTag:Home_StartBtnTag withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
if((TargetType == 2)){
......@@ -201,37 +195,14 @@
[startBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self);
make.height.width.mas_equalTo(85*IPhone6ScaleWidth);
// make.top.mas_equalTo(rightLb.mas_bottom).offset(29.5*IPhone6ScaleHeight);
make.bottom.mas_equalTo(-110*IPhone6ScaleHeight);
make.top.mas_equalTo(rightLb.mas_bottom).offset(29.5*IPhone6ScaleHeight);
}];
self.strengStartBtn = startBtn;
UILabel *totalTitleLb = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentCenter withContent:HJLocalizedString(HJLocalizedString(@"剩余总时长")) withFont:XHFontSize(15) withTextColor:XHTextFieldTextPlaceholderColor withResize:true];
[totalTitleLb mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.SelectModelView);
make.bottom.equalTo(self.strengStartBtn.mas_top).offset(-70);
}];
_operationTimeLb = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentCenter withContent:HJLocalizedString(HJLocalizedString(@"00:12:00")) withFont:XHFontSizeBold(24) withTextColor:XHBtnTextColor withResize:true];
[_operationTimeLb mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.SelectModelView);
make.top.equalTo(totalTitleLb.mas_bottom).offset(10);
}];
UIButton *disinfectBtn = [UIButton myUIButtonSuperView:self.SelectModelView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(selectPlanOrSatrtAction:) withTag:10000001 withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
if((TargetType == 2)||(TargetType == 4)){
[disinfectBtn setImage:HJSetImg(@"djm_dr02_disinfect_off") forState:UIControlStateNormal];
[disinfectBtn setImage:HJSetImg(@"djm_dr02_disinfect_on") forState:UIControlStateSelected];
}else{
[disinfectBtn setImage:HJSetImg(@"DrTY_Disinfect_Nor") forState:UIControlStateNormal];
[disinfectBtn setImage:HJSetImg(@"DrTY_Disinfect_Sel") forState:UIControlStateSelected];
......@@ -242,11 +213,7 @@
make.right.mas_equalTo(startBtn.mas_left).offset(-29.5*IPhone6ScaleWidth);
}];
self.disinfectBtn = disinfectBtn;
if ([XHGetDataManager.deviceCode isEqualToString:@"K9"]) {
self.disinfectBtn.hidden = true;
}else{
self.disinfectBtn.hidden = false;
}
#pragma mark RequirementChangeRecord_h
UIButton *endedBtn = [UIButton myUIButtonSuperView:self.SelectModelView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(selectPlanOrSatrtAction:) withTag:10000002 withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
if((TargetType == 2)||(TargetType == 4)){
......
DJMHomeTY/Page/HomePage/View/XHNoConnectView.m
......@@ -38,9 +38,9 @@
[lb mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self);
if([[UIDevice currentDevice].name containsString:@"14 Pro"]||[[UIDevice currentDevice].name containsString:@"15"]){
make.top.mas_equalTo(self.mas_top).offset(HJNavHeight + 10);
make.top.mas_equalTo(self.mas_top).offset(HJNavHeight);
}else{
make.top.mas_equalTo(self.mas_top).offset(HJNavHeight+10);
make.top.mas_equalTo(self.mas_top).offset(HJNavHeight-12);
}
}];
......@@ -50,10 +50,9 @@
make.top.mas_equalTo(self).mas_equalTo(159*IPhone6ScaleHeight);
}];
//DrTY_DisconnectLogo
UIImageView *deviceImg = [UIImageView myUIImageViewSuperView:img withImageName:(TargetType==5)?@"DrTY_DisconnectLogo":(TargetType==4&&XHGetDataManager.machineIndex==0)?@"Ps2_Device_Img": (TargetType==4&&XHGetDataManager.machineIndex==1)?@"dr02BMain1":@"Home_DeviceLogo"];//Ps2_Device_Img //
UIImageView *deviceImg = [UIImageView myUIImageViewSuperView:img withImageName:(TargetType==5)?@"DrTY_DisconnectLogo":(TargetType==4&&XHGetDataManager.machineIndex==0)?@"Ps2_Device_Img": (TargetType==4&&XHGetDataManager.machineIndex==1)?@"dr02BNo":@"Home_DeviceLogo"];//Ps2_Device_Img //
[deviceImg mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(statusLb.mas_bottom).offset(40.5*IPhone6ScaleHeight);
make.size.mas_equalTo(CGSizeMake(203, 123));
make.centerX.mas_equalTo(self);
}];
......
DJMHomeTY/Page/HomePage/View/XHSelectModelView.m
......@@ -30,7 +30,7 @@
bgV.layer.shadowRadius = 20;
bgV.layer.cornerRadius = 12;
[bgV mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self).offset(210*IPhone6ScaleHeight);
make.top.mas_equalTo(self).offset(160*IPhone6ScaleHeight);
make.left.mas_equalTo(self).offset(15*IPhone6ScaleWidth);
make.right.mas_equalTo(self).offset(-15*IPhone6ScaleWidth);
make.bottom.mas_equalTo(self).offset(-35*IPhone6ScaleWidth);
......@@ -57,18 +57,9 @@
NSArray *itemSelArrimg;
NSArray *itemArr;
if((TargetType == 2)||(TargetType == 4)){
// itemNorArrimg = @[@"Home_Slect_eye_n",@"Home_Slect_deepGrain_n",@"Home_Slect_up_n",@"Home_Slect_face_n",@"Home_Slect_skin_n",@"Home_Slect_newskin_n",@"Home_Slect_anti-aging_n",@"Home_Slect_absorption_n",@"Home_Slect_acne_n",@"Home_Slect_papules_n"];
// itemSelArrimg = @[@"Home_Slect_eye_s",@"Home_Slect_deepGrain_s",@"Home_Slect_up_s",@"Home_Slect_face_s",@"Home_Slect_skin_s",@"Home_Slect_newskin_s",@"Home_Slect_anti-aging_s",@"Home_Slect_absorption_s",@"Home_Slect_acne_s",@"Home_Slect_papules_s"];
// itemArr = @[HJLocalizedString(@"眼部护理"),HJLocalizedString(@"深纹"),HJLocalizedString(@"提升"),HJLocalizedString(@"轮廓清晰"),HJLocalizedString(@"面部饱满"),HJLocalizedString(@"褪红舒敏"),HJLocalizedString(@"抗衰"),HJLocalizedString(@"嫩滑提亮"),HJLocalizedString(@"粉刺痤疮"),HJLocalizedString(@"丘疹脓疱性痤疮")];
// itemNorArrimg = @[@"Home_Slect_eye_n",@"Home_Slect_face_n",@"Home_Slect_skin_n",@"Home_Slect_newskin_n",@"Home_Slect_absorption_n",@"Home_Slect_absorption_n",@"Home_Slect_absorption_n",@"Home_Slect_absorption_n"];
// itemSelArrimg = @[@"Home_Slect_eye_s",@"Home_Slect_face_s",@"Home_Slect_skin_s",@"Home_Slect_newskin_s",@"Home_Slect_absorption_s",@"Home_Slect_absorption_s",@"Home_Slect_absorption_s",@"Home_Slect_absorption_s"];
itemNorArrimg = @[@"k9_yb_nol",@"k9_lk_nol",@"k9_mb_nol",@"k9_sh_nol",@"k9_nh_nol",@"k9_sc_nol",@"k9_st_nol",@"k9_dw_nol"];
itemSelArrimg = @[@"k9_yb_sel",@"k9_lk_sel",@"k9_mb_sel",@"k9_sh_sel",@"k9_nh_sel",@"k9_sc_sel",@"k9_st_sel",@"k9_dw_sel"];
itemArr = @[HJLocalizedString(@"眼部护理"),HJLocalizedString(@"轮廓清晰"),HJLocalizedString(@"面部饱满"),HJLocalizedString(@"褪红舒敏"),HJLocalizedString(@"嫩滑提亮"),HJLocalizedString(@"关节色沉淡化"),HJLocalizedString(@"身体塑形"),HJLocalizedString(@"身体淡纹")];
itemNorArrimg = @[@"Home_Slect_eye_n",@"Home_Slect_deepGrain_n",@"Home_Slect_up_n",@"Home_Slect_face_n",@"Home_Slect_skin_n",@"Home_Slect_newskin_n",@"Home_Slect_anti-aging_n",@"Home_Slect_absorption_n",@"Home_Slect_acne_n",@"Home_Slect_papules_n"];
itemSelArrimg = @[@"Home_Slect_eye_s",@"Home_Slect_deepGrain_s",@"Home_Slect_up_s",@"Home_Slect_face_s",@"Home_Slect_skin_s",@"Home_Slect_newskin_s",@"Home_Slect_anti-aging_s",@"Home_Slect_absorption_s",@"Home_Slect_acne_s",@"Home_Slect_papules_s"];
itemArr = @[HJLocalizedString(@"眼纹"),HJLocalizedString(@"深纹"),HJLocalizedString(@"提升"),HJLocalizedString(@"面部紧致"),HJLocalizedString(@"皮肤焕新"),HJLocalizedString(@"敏感性皮肤焕新"),HJLocalizedString(@"抗衰"),HJLocalizedString(@"辅助面部吸收"),HJLocalizedString(@"粉刺痤疮"),HJLocalizedString(@"丘疹脓疱性痤疮")];
}else{
itemNorArrimg = @[@"Home_Slect_eye_n_r",@"Home_Slect_deepGrain_n_r",@"Home_Slect_up_n_r",@"Home_Slect_face_n_r",@"Home_Slect_skin_n_r",@"Home_Slect_newskin_n_r",@"Home_Slect_anti-aging_n_r",@"Home_Slect_absorption_n_r",@"Home_Slect_acne_n_r",@"Home_Slect_papules_n_r"];
......@@ -79,7 +70,7 @@
for (int i = 0; i<itemArr.count; i++) {
UIButton *btn = [UIButton myUIButtonSuperView:bgV withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(SelectActionOrSureBtn:) withTag:Home_SelectModel1Btntag+i withNormalImg:HJSetImg(itemNorArrimg[i]) withSelectedImg:HJSetImg(itemSelArrimg[i]) withHighlightedImg:nil withTitle:HJLocalizedString(itemArr[i]) withFont:XHFontSize(9) withTitleNormalColor:XHColorHex(0x939393) withTitleSelectedColor:XHColorHex(0x000000)];//
if((TargetType == 2)||(TargetType == 4)){
[btn layoutButtonWithEdgeInsetsStyle:HJButtonEdgeInsetsStyleTop imageTitleSpace:160.0f];
[btn layoutButtonWithEdgeInsetsStyle:HJButtonEdgeInsetsStyleTop imageTitleSpace:85.0f];
}else{
[btn layoutButtonWithEdgeInsetsStyle:HJButtonEdgeInsetsStyleTop imageTitleSpace:160.0f];
}
......@@ -95,13 +86,13 @@
make.left.mas_equalTo(self).offset((HJScreenWidth-112*IPhone6ScaleWidth*2-60*IPhone6ScaleWidth)/2 +(60*IPhone6ScaleWidth+52*IPhone6ScaleWidth)*(i%3));
}];
}
UIButton *btn = [self viewWithTag:Home_SelectModel8Btntag];
UIButton *btn = [self viewWithTag:Home_SelectModel10Btntag];
UIButton *sureBtn = [UIButton myUIButtonSuperView:bgV withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(SelectActionOrSureBtn:) withTag:Home_SelectModelSureBtntag withNormalImg:nil withSelectedImg:nil withHighlightedImg:nil withTitle:@"确定" withFont:XHFontSize(17) withTitleNormalColor:XHColorHex(0xffffff) withTitleSelectedColor:XHColorHex(0xffffff)];
sureBtn.backgroundColor = XHBtnColor;
sureBtn.layer.cornerRadius = 10.0f;
[sureBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(bgV);
make.top.mas_equalTo(btn.mas_bottom).offset(60*IPhone6ScaleHeight);
make.top.mas_equalTo(btn.mas_bottom).offset(23*IPhone6ScaleHeight);
make.height.mas_equalTo(45*IPhone6ScaleHeight);
make.width.mas_equalTo(300*IPhone6ScaleWidth);
......@@ -111,8 +102,6 @@
self.selBtn.selected = NO;
self.selBtn= button;
button.selected = YES;
if (self.sendModelBlock) {
self.sendModelBlock(button);
}
......
DJMHomeTY/Page/HomePage/View/XHSmartView.h
......@@ -26,11 +26,6 @@ NS_ASSUME_NONNULL_BEGIN
#pragma mark RequirementChangeRecord_h
@property (nonatomic,strong) UIButton *endedBtn;
@property (nonatomic,strong) UIButton *disinfectBtn;//消毒
@property (nonatomic,strong) UILabel *totalTimeLb;//总时间
@property (nonatomic,strong) UIImageView *faceImage;//
@property (nonatomic,strong) UIButton *selectPlanBtn;
@property (nonatomic,strong) UIView *SelectModelView;//已选择模式
@property (nonatomic,strong) UIView *centerLine;
@end
NS_ASSUME_NONNULL_END
DJMHomeTY/Page/HomePage/View/XHSmartView.m
......@@ -9,14 +9,14 @@
@interface XHSmartView ()
@property (nonatomic,strong) UIView *noSelectModelView;//未选择模式
@property (nonatomic,strong) UIView *SelectModelView;//已选择模式
@property (nonatomic,strong) UIImageView *faceImage;//
@property (nonatomic,strong) NSArray *modelArr;
@property (nonatomic,strong) UIButton *selectPlanBtn;
@end
......@@ -32,9 +32,7 @@
if(TargetType == 5){
self.modelArr = @[HJLocalizedString(@"明眸淡纹"),HJLocalizedString(@"抚平舒纹"),HJLocalizedString(@"童颜提拉"),HJLocalizedString(@"轮廓紧致"),HJLocalizedString(@"美肌焕新"),HJLocalizedString(@"舒敏焕新"),HJLocalizedString(@"抗衰"),HJLocalizedString(@"嫩颜促吸"),HJLocalizedString(@"平痘护肤"),HJLocalizedString(@"平痘抑菌")];
}else{
// self.modelArr = @[HJLocalizedString(@"眼纹"),HJLocalizedString(@"深纹"),HJLocalizedString(@"提升"),HJLocalizedString(@"面部紧致"),HJLocalizedString(@"皮肤焕新"),HJLocalizedString(@"敏感性皮肤焕新"),HJLocalizedString(@"抗衰"),HJLocalizedString(@"辅助面部吸收"),HJLocalizedString(@"粉刺痤疮"),HJLocalizedString(@"丘疹脓疱性痤疮")];
// self.modelArr = @[HJLocalizedString(@"眼纹"),HJLocalizedString(@"深纹"),HJLocalizedString(@"提升"),HJLocalizedString(@"面部紧致"),HJLocalizedString(@"皮肤焕新"),HJLocalizedString(@"敏感性皮肤焕新"),HJLocalizedString(@"抗衰"),HJLocalizedString(@"辅助面部吸收"),HJLocalizedString(@"粉刺痤疮"),HJLocalizedString(@"丘疹脓疱性痤疮")];
self.modelArr = @[HJLocalizedString(@"眼部护理"),HJLocalizedString(@"轮廓清晰"),HJLocalizedString(@"面部饱满"),HJLocalizedString(@"褪红舒敏"),HJLocalizedString(@"嫩滑提亮"),HJLocalizedString(@"关节色沉淡化"),HJLocalizedString(@"身体塑形"),HJLocalizedString(@"身体淡纹")];
self.modelArr = @[HJLocalizedString(@"眼纹"),HJLocalizedString(@"深纹"),HJLocalizedString(@"提升"),HJLocalizedString(@"面部紧致"),HJLocalizedString(@"皮肤焕新"),HJLocalizedString(@"敏感性皮肤焕新"),HJLocalizedString(@"抗衰"),HJLocalizedString(@"辅助面部吸收"),HJLocalizedString(@"粉刺痤疮"),HJLocalizedString(@"丘疹脓疱性痤疮")];
}
[self creatNoSelectModelView];
......@@ -68,15 +66,14 @@
UIImageView *deviceImg = [UIImageView myUIImageViewSuperView:myView withImageName:(TargetType==5)?@"DrTY_DeviceConnectedImg":(TargetType==4)?@"dr02BMain1":@"Main_device"];
UIImageView *deviceImg = [UIImageView myUIImageViewSuperView:myView withImageName:(TargetType==5)?@"DrTY_DeviceConnectedImg":(TargetType==4)?@"dr02BMain":@"Main_device"];
[deviceImg mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(selectPlan.mas_bottom).offset(85*IPhone6ScaleHeight);
make.centerX.mas_equalTo(self);
make.size.mas_equalTo(CGSizeMake(203, 123));
}];
UIButton *startBtn = [UIButton myUIButtonSuperView:myView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(selectPlanOrSatrtAction:) withTag:Home_SelectPlanBtnTag withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
UIButton *startBtn = [UIButton myUIButtonSuperView:myView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(selectPlanOrSatrtAction:) withTag:Home_StartBtnTag withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
// startBtn.layer.cornerRadius = 42.5f*IPhone6ScaleWidth;
// startBtn.layer.backgroundColor = XHColorHex(0x8C8C8C).CGColor;
if((TargetType == 2)||(TargetType == 4)){
......@@ -86,7 +83,7 @@
[startBtn setImage:HJSetImg(@"DrTY_Stop") forState:UIControlStateNormal];
[startBtn setImage:HJSetImg(@"DrTY_Start") forState:UIControlStateSelected];
}
// startBtn.enabled = false;
startBtn.enabled = false;
[startBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self);
make.height.width.mas_equalTo(85*IPhone6ScaleWidth);
......@@ -130,139 +127,139 @@
make.top.mas_equalTo(self).offset(110*IPhone6ScaleHeight);
}];
self.selectPlanBtn = selectPlan;
// UILabel *strengthLb = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentCenter withContent:@"0" withFont:XHFontSizeBold(40) withTextColor:XHBtnTextColor withResize:true];
// [strengthLb mas_makeConstraints:^(MASConstraintMaker *make) {
// make.top.mas_equalTo(selectPlan.mas_bottom).offset(43*IPhone6ScaleHeight);
// make.centerX.mas_equalTo(self.SelectModelView);
// make.height.mas_equalTo(30*IPhone6ScaleHeight);
// make.width.mas_equalTo(80*IPhone6ScaleWidth);
// }];
// self.strengthLb1 = strengthLb;
//
// UIButton *left3Mbtn = [UIButton myUIButtonSuperView:self.SelectModelView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(addOrDecreceBtnAction:) withTag:Home_SmartStrength3MDecBtnTag withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
// if((TargetType == 2)||(TargetType == 4)){
// [left3Mbtn setImage:HJSetImg(@"btn_less") forState:UIControlStateNormal];
// [left3Mbtn setImage:HJSetImg(@"btn_less") forState:UIControlStateSelected];
// }else{
// [left3Mbtn setImage:HJSetImg(@"DrTY_N_Dec") forState:UIControlStateNormal];
// [left3Mbtn setImage:HJSetImg(@"DrTY_N_Dec") forState:UIControlStateSelected];
// }
//
// [left3Mbtn mas_makeConstraints:^(MASConstraintMaker *make) {
// make.centerY.mas_equalTo(strengthLb);
// make.right.mas_equalTo(strengthLb.mas_left).offset(-30*IPhone6ScaleWidth);
// make.width.height.mas_equalTo(49.9*IPhone6ScaleWidth);
// }];
//
//
// UIButton *right3Mbtn = [UIButton myUIButtonSuperView:self.SelectModelView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(addOrDecreceBtnAction:) withTag:Home_SmartStrength3MAddBtnTag withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
// if((TargetType == 2)||(TargetType == 4)){
// [right3Mbtn setImage:HJSetImg(@"btn_plus") forState:UIControlStateNormal];
// [right3Mbtn setImage:HJSetImg(@"btn_plus") forState:UIControlStateSelected];
// }else{
// [right3Mbtn setImage:HJSetImg(@"DrTY_N_Add") forState:UIControlStateNormal];
// [right3Mbtn setImage:HJSetImg(@"DrTY_N_Add") forState:UIControlStateSelected];
// }
//
// [right3Mbtn mas_makeConstraints:^(MASConstraintMaker *make) {
// make.centerY.mas_equalTo(strengthLb);
// make.left.mas_equalTo(strengthLb.mas_right).offset(30*IPhone6ScaleWidth);
// make.width.height.mas_equalTo(49.9*IPhone6ScaleWidth);
// }];
//
//
// UILabel *strengthLb1Bottom = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentCenter withContent:(TargetType==5)?HJLocalizedString(@"3M 档位"):HJLocalizedString(@"3M 强度(W/cm²)") withFont:XHFontSize(10) withTextColor:XHBtnTextColor withResize:true];
// [strengthLb1Bottom mas_makeConstraints:^(MASConstraintMaker *make) {
// make.top.mas_equalTo(strengthLb.mas_bottom).offset(0*IPhone6ScaleHeight);
// make.centerX.mas_equalTo(self.SelectModelView);
// make.height.mas_equalTo(13*IPhone6ScaleHeight);
// make.width.mas_equalTo(strengthLb);
// }];
// UIImageView *myImg1 = [UIImageView myUIImageViewSuperView:self.SelectModelView withImageName:@"Home_circle"];
// [myImg1 mas_makeConstraints:^(MASConstraintMaker *make) {
// make.top.mas_equalTo(strengthLb.mas_bottom).offset(0*IPhone6ScaleHeight);
// if(iPhone6||iPhone6P||iPhoneSE){
// if(TargetType == 5){
// make.left.mas_equalTo(strengthLb1Bottom.mas_left).offset(10*IPhone6ScaleWidth);
// }else{
// make.left.mas_equalTo(strengthLb1Bottom).offset(-0.5*IPhone6ScaleWidth);
// }
// }else{
// if(TargetType == 5){
// make.left.mas_equalTo(strengthLb1Bottom.mas_left).offset(14*IPhone6ScaleWidth);
// }else{
// make.left.mas_equalTo(strengthLb1Bottom).offset(-0.5*IPhone6ScaleWidth);
// }
// }
// make.height.mas_equalTo(10*IPhone6ScaleHeight);
// make.width.mas_equalTo(20*IPhone6ScaleHeight);
// }];
// UILabel *strengthLb2 = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentCenter withContent:@"0" withFont:XHFontSizeBold(40) withTextColor:XHBtnTextColor withResize:true];
// [strengthLb2 mas_makeConstraints:^(MASConstraintMaker *make) {
// if(iPhone6||iPhone6P||iPhoneSE){
// make.top.mas_equalTo(strengthLb.mas_bottom).offset(59.5*IPhone6ScaleHeight);
// }else{
// make.top.mas_equalTo(strengthLb.mas_bottom).offset(29.5*IPhone6ScaleHeight);
// }
//
// make.centerX.mas_equalTo(self.SelectModelView);
// make.height.mas_equalTo(30*IPhone6ScaleHeight);
// make.width.mas_equalTo(80*IPhone6ScaleWidth);
// }];
// self.strengthLb2 = strengthLb2;
//
// UIButton *left10Mbtn = [UIButton myUIButtonSuperView:self.SelectModelView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(addOrDecreceBtnAction:) withTag:Home_SmartStrength10MDecBtnTag withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
// if((TargetType == 2)||(TargetType == 4)){
// [left10Mbtn setImage:HJSetImg(@"btn_less") forState:UIControlStateNormal];
// [left10Mbtn setImage:HJSetImg(@"btn_less") forState:UIControlStateSelected];
// }else{
// [left10Mbtn setImage:HJSetImg(@"DrTY_N_Dec") forState:UIControlStateNormal];
// [left10Mbtn setImage:HJSetImg(@"DrTY_N_Dec") forState:UIControlStateSelected];
// }
//
// [left10Mbtn mas_makeConstraints:^(MASConstraintMaker *make) {
// make.centerY.mas_equalTo(strengthLb2);
// make.right.mas_equalTo(strengthLb2.mas_left).offset(-30*IPhone6ScaleWidth);
// make.width.height.mas_equalTo(49.9*IPhone6ScaleWidth);
// }];
//
// UIButton *right10Mbtn = [UIButton myUIButtonSuperView:self.SelectModelView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(addOrDecreceBtnAction:) withTag:Home_SmartStrength10MAddBtnTag withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
//
// if((TargetType == 2)||(TargetType == 4)){
// [right10Mbtn setImage:HJSetImg(@"btn_plus") forState:UIControlStateNormal];
// [right10Mbtn setImage:HJSetImg(@"btn_plus") forState:UIControlStateSelected];
// }else{
// [right10Mbtn setImage:HJSetImg(@"DrTY_N_Add") forState:UIControlStateNormal];
// [right10Mbtn setImage:HJSetImg(@"DrTY_N_Add") forState:UIControlStateSelected];
// }
//
//
// [right10Mbtn mas_makeConstraints:^(MASConstraintMaker *make) {
// make.centerY.mas_equalTo(strengthLb2);
// make.left.mas_equalTo(strengthLb2.mas_right).offset(30*IPhone6ScaleWidth);
// make.width.height.mas_equalTo(49.9*IPhone6ScaleWidth);
// }];
//
// UILabel *strengthLb2Bottom = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentCenter withContent:(TargetType==5)?HJLocalizedString(@"10M 档位"):HJLocalizedString(@"10M 强度(W/cm²)") withFont:XHFontSize(10) withTextColor:XHBtnTextColor withResize:true];
// [strengthLb2Bottom mas_makeConstraints:^(MASConstraintMaker *make) {
// make.top.mas_equalTo(strengthLb2.mas_bottom).offset(0*IPhone6ScaleHeight);
// make.centerX.mas_equalTo(self.SelectModelView);
// make.height.mas_equalTo(13*IPhone6ScaleHeight);
// make.width.mas_equalTo(strengthLb);
// }];
// UIImageView *myImg = [UIImageView myUIImageViewSuperView:self.SelectModelView withImageName:@"Home_circle"];
// [myImg mas_makeConstraints:^(MASConstraintMaker *make) {
// make.top.mas_equalTo(strengthLb2.mas_bottom).offset(0*IPhone6ScaleHeight);
//// make.left.mas_equalTo(strengthLb2Bottom).offset(-0.5*IPhone6ScaleWidth);
// make.centerX.mas_equalTo(myImg1);
// make.height.mas_equalTo(10*IPhone6ScaleHeight);
// make.width.mas_equalTo(20*IPhone6ScaleHeight);
// }];
UILabel *strengthLb = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentCenter withContent:@"0" withFont:XHFontSizeBold(40) withTextColor:XHBtnTextColor withResize:true];
[strengthLb mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(selectPlan.mas_bottom).offset(43*IPhone6ScaleHeight);
make.centerX.mas_equalTo(self.SelectModelView);
make.height.mas_equalTo(30*IPhone6ScaleHeight);
make.width.mas_equalTo(80*IPhone6ScaleWidth);
}];
self.strengthLb1 = strengthLb;
UIButton *left3Mbtn = [UIButton myUIButtonSuperView:self.SelectModelView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(addOrDecreceBtnAction:) withTag:Home_SmartStrength3MDecBtnTag withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
if((TargetType == 2)||(TargetType == 4)){
[left3Mbtn setImage:HJSetImg(@"btn_less") forState:UIControlStateNormal];
[left3Mbtn setImage:HJSetImg(@"btn_less") forState:UIControlStateSelected];
}else{
[left3Mbtn setImage:HJSetImg(@"DrTY_N_Dec") forState:UIControlStateNormal];
[left3Mbtn setImage:HJSetImg(@"DrTY_N_Dec") forState:UIControlStateSelected];
}
[left3Mbtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(strengthLb);
make.right.mas_equalTo(strengthLb.mas_left).offset(-30*IPhone6ScaleWidth);
make.width.height.mas_equalTo(49.9*IPhone6ScaleWidth);
}];
UIButton *right3Mbtn = [UIButton myUIButtonSuperView:self.SelectModelView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(addOrDecreceBtnAction:) withTag:Home_SmartStrength3MAddBtnTag withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
if((TargetType == 2)||(TargetType == 4)){
[right3Mbtn setImage:HJSetImg(@"btn_plus") forState:UIControlStateNormal];
[right3Mbtn setImage:HJSetImg(@"btn_plus") forState:UIControlStateSelected];
}else{
[right3Mbtn setImage:HJSetImg(@"DrTY_N_Add") forState:UIControlStateNormal];
[right3Mbtn setImage:HJSetImg(@"DrTY_N_Add") forState:UIControlStateSelected];
}
[right3Mbtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(strengthLb);
make.left.mas_equalTo(strengthLb.mas_right).offset(30*IPhone6ScaleWidth);
make.width.height.mas_equalTo(49.9*IPhone6ScaleWidth);
}];
UILabel *strengthLb1Bottom = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentCenter withContent:(TargetType==5)?HJLocalizedString(@"3M 档位"):HJLocalizedString(@"3M 强度(W/cm²)") withFont:XHFontSize(10) withTextColor:XHBtnTextColor withResize:true];
[strengthLb1Bottom mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(strengthLb.mas_bottom).offset(0*IPhone6ScaleHeight);
make.centerX.mas_equalTo(self.SelectModelView);
make.height.mas_equalTo(13*IPhone6ScaleHeight);
make.width.mas_equalTo(strengthLb);
}];
UIImageView *myImg1 = [UIImageView myUIImageViewSuperView:self.SelectModelView withImageName:@"Home_circle"];
[myImg1 mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(strengthLb.mas_bottom).offset(0*IPhone6ScaleHeight);
if(iPhone6||iPhone6P||iPhoneSE){
if(TargetType == 5){
make.left.mas_equalTo(strengthLb1Bottom.mas_left).offset(10*IPhone6ScaleWidth);
}else{
make.left.mas_equalTo(strengthLb1Bottom).offset(-0.5*IPhone6ScaleWidth);
}
}else{
if(TargetType == 5){
make.left.mas_equalTo(strengthLb1Bottom.mas_left).offset(14*IPhone6ScaleWidth);
}else{
make.left.mas_equalTo(strengthLb1Bottom).offset(-0.5*IPhone6ScaleWidth);
}
}
make.height.mas_equalTo(10*IPhone6ScaleHeight);
make.width.mas_equalTo(20*IPhone6ScaleHeight);
}];
UILabel *strengthLb2 = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentCenter withContent:@"0" withFont:XHFontSizeBold(40) withTextColor:XHBtnTextColor withResize:true];
[strengthLb2 mas_makeConstraints:^(MASConstraintMaker *make) {
if(iPhone6||iPhone6P||iPhoneSE){
make.top.mas_equalTo(strengthLb.mas_bottom).offset(59.5*IPhone6ScaleHeight);
}else{
make.top.mas_equalTo(strengthLb.mas_bottom).offset(29.5*IPhone6ScaleHeight);
}
make.centerX.mas_equalTo(self.SelectModelView);
make.height.mas_equalTo(30*IPhone6ScaleHeight);
make.width.mas_equalTo(80*IPhone6ScaleWidth);
}];
self.strengthLb2 = strengthLb2;
UIButton *left10Mbtn = [UIButton myUIButtonSuperView:self.SelectModelView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(addOrDecreceBtnAction:) withTag:Home_SmartStrength10MDecBtnTag withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
if((TargetType == 2)||(TargetType == 4)){
[left10Mbtn setImage:HJSetImg(@"btn_less") forState:UIControlStateNormal];
[left10Mbtn setImage:HJSetImg(@"btn_less") forState:UIControlStateSelected];
}else{
[left10Mbtn setImage:HJSetImg(@"DrTY_N_Dec") forState:UIControlStateNormal];
[left10Mbtn setImage:HJSetImg(@"DrTY_N_Dec") forState:UIControlStateSelected];
}
[left10Mbtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(strengthLb2);
make.right.mas_equalTo(strengthLb2.mas_left).offset(-30*IPhone6ScaleWidth);
make.width.height.mas_equalTo(49.9*IPhone6ScaleWidth);
}];
UIButton *right10Mbtn = [UIButton myUIButtonSuperView:self.SelectModelView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(addOrDecreceBtnAction:) withTag:Home_SmartStrength10MAddBtnTag withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
if((TargetType == 2)||(TargetType == 4)){
[right10Mbtn setImage:HJSetImg(@"btn_plus") forState:UIControlStateNormal];
[right10Mbtn setImage:HJSetImg(@"btn_plus") forState:UIControlStateSelected];
}else{
[right10Mbtn setImage:HJSetImg(@"DrTY_N_Add") forState:UIControlStateNormal];
[right10Mbtn setImage:HJSetImg(@"DrTY_N_Add") forState:UIControlStateSelected];
}
[right10Mbtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(strengthLb2);
make.left.mas_equalTo(strengthLb2.mas_right).offset(30*IPhone6ScaleWidth);
make.width.height.mas_equalTo(49.9*IPhone6ScaleWidth);
}];
UILabel *strengthLb2Bottom = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentCenter withContent:(TargetType==5)?HJLocalizedString(@"10M 档位"):HJLocalizedString(@"10M 强度(W/cm²)") withFont:XHFontSize(10) withTextColor:XHBtnTextColor withResize:true];
[strengthLb2Bottom mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(strengthLb2.mas_bottom).offset(0*IPhone6ScaleHeight);
make.centerX.mas_equalTo(self.SelectModelView);
make.height.mas_equalTo(13*IPhone6ScaleHeight);
make.width.mas_equalTo(strengthLb);
}];
UIImageView *myImg = [UIImageView myUIImageViewSuperView:self.SelectModelView withImageName:@"Home_circle"];
[myImg mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(strengthLb2.mas_bottom).offset(0*IPhone6ScaleHeight);
// make.left.mas_equalTo(strengthLb2Bottom).offset(-0.5*IPhone6ScaleWidth);
make.centerX.mas_equalTo(myImg1);
make.height.mas_equalTo(10*IPhone6ScaleHeight);
make.width.mas_equalTo(20*IPhone6ScaleHeight);
}];
UIImageView *faceImg = [UIImageView myUIImageViewSuperView:self.SelectModelView withImageName:((TargetType ==1)||(TargetType ==4))?@"Home_Face":@"DrTY_Face"];
// faceImg.backgroundColor = [UIColor lightGrayColor];
[faceImg mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self.SelectModelView);
make.top.mas_equalTo(selectPlan.mas_bottom).offset(90*IPhone6ScaleHeight);
make.top.mas_equalTo(strengthLb2Bottom.mas_bottom).offset(33*IPhone6ScaleHeight);
make.height.mas_equalTo(194*IPhone6ScaleWidth);
make.width.mas_equalTo(117*IPhone6ScaleWidth);
}];
......@@ -270,12 +267,12 @@
UIView *centerLine = [UIView myUIViewSuperView:self.SelectModelView withBackgroundColor:XHBtnTextColor];
[centerLine mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(faceImg.mas_top).offset(-20*IPhone6ScaleHeight);
make.top.mas_equalTo(faceImg.mas_bottom).offset(9*IPhone6ScaleHeight);
make.centerX.mas_equalTo(self.SelectModelView);
make.width.mas_equalTo(1.0*IPhone6ScaleWidth);
make.height.mas_equalTo(16.5*IPhone6ScaleHeight);
}];
self.centerLine = centerLine;
UILabel *leftLb = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentRight withContent:HJLocalizedString(HJLocalizedString(@"请操作左脸")) withFont:XHFontSize(16) withTextColor:XHBtnTextColor withResize:true];
[leftLb mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(centerLine.mas_right).offset(-10*IPhone6ScaleWidth);
......@@ -308,7 +305,7 @@
[startBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self);
make.height.width.mas_equalTo(85*IPhone6ScaleWidth);
make.bottom.mas_equalTo(-110*IPhone6ScaleHeight);
make.top.mas_equalTo(rightLb.mas_bottom).offset(29.5*IPhone6ScaleHeight);
}];
self.startBtn = startBtn;
......@@ -328,11 +325,7 @@
make.right.mas_equalTo(startBtn.mas_left).offset(-29.5*IPhone6ScaleWidth);
}];
self.disinfectBtn = disinfectBtn;
if ([XHGetDataManager.deviceCode isEqualToString:@"K9"]) {
self.disinfectBtn.hidden = true;
}else{
self.disinfectBtn.hidden = false;
}
#pragma mark RequirementChangeRecord_h
UIButton *endedBtn = [UIButton myUIButtonSuperView:self.SelectModelView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(selectPlanOrSatrtAction:) withTag:10000002 withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
if((TargetType == 2)||(TargetType == 4)){
......@@ -353,24 +346,11 @@
endedBtn.hidden = true;
self.SelectModelView.hidden = true;
UILabel *totalTitleLb = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentCenter withContent:HJLocalizedString(HJLocalizedString(@"剩余总时长")) withFont:XHFontSize(15) withTextColor:XHTextFieldTextPlaceholderColor withResize:true];
[totalTitleLb mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.SelectModelView);
make.bottom.equalTo(self.startBtn.mas_top).offset(-70);
}];
_totalTimeLb = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentCenter withContent:HJLocalizedString(HJLocalizedString(@"00:00:00")) withFont:XHFontSizeBold(24) withTextColor:XHBtnTextColor withResize:true];
[_totalTimeLb mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.SelectModelView);
make.top.equalTo(totalTitleLb.mas_bottom).offset(10);
}];
#pragma mark 20231019 RequirementChangeRecord
// left3Mbtn.hidden = true;
// left10Mbtn.hidden = true;
// right3Mbtn.hidden = true;
// right10Mbtn.hidden = true;
left3Mbtn.hidden = true;
left10Mbtn.hidden = true;
right3Mbtn.hidden = true;
right10Mbtn.hidden = true;
}
-(void)selectPlanOrSatrtAction:(UIButton*)sender{
......
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