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

DJMHomeTY.xcodeproj/project.pbxproj

@@ -1051,8 +1051,8 @@
 			isa = PBXGroup;
 			isa = PBXGroup;
 			children = (
 			children = (
 				39FF54FF2BF1BB6D007D2FC5 /* YModemUtil.h */,
 				39FF54FF2BF1BB6D007D2FC5 /* YModemUtil.h */,
-				39FF55002BF1BB6D007D2FC5 /* YModem.c */,
 				39FF55012BF1BB6D007D2FC5 /* YModemUtil.m */,
 				39FF55012BF1BB6D007D2FC5 /* YModemUtil.m */,
+				39FF55002BF1BB6D007D2FC5 /* YModem.c */,
 				39FF55022BF1BB6D007D2FC5 /* YModem.h */,
 				39FF55022BF1BB6D007D2FC5 /* YModem.h */,
 			);
 			);
 			path = YModem;
 			path = YModem;

DJMHomeTY.xcworkspace/xcuserdata/nana.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3,4 +3,22 @@
    uuid = "A5958A80-317D-49F0-AE28-91C51D24B77C"
    uuid = "A5958A80-317D-49F0-AE28-91C51D24B77C"
    type = "0"
    type = "0"
    version = "2.0">
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "A780A0EA-6207-4FF5-A63C-51F03B0D8C64"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "351"
+            endingLineNumber = "351"
+            landmarkName = "-deviceControlWithTag:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>
 </Bucket>

DJMHomeTY/Page/DRFacial/Controller/DXHotElectricVC.m

@@ -739,14 +739,14 @@
         XHGetDataManager.machineVersion = [NSString stringWithFormat:@"V%ld.%ld",versions,versions1];
         XHGetDataManager.machineVersion = [NSString stringWithFormat:@"V%ld.%ld",versions,versions1];
         NSLog(@"XHGetDataManager.machineVersion:%@",XHGetDataManager.machineVersion);
         NSLog(@"XHGetDataManager.machineVersion:%@",XHGetDataManager.machineVersion);
         
         
-//        if(!self.isChecked){
-//            [self checkDeviceVersionWithResult:^(BOOL isUpdate) {
-//
-//            } binUrl:^(NSString *url) {
-//
-//            }];
-//        }
-//        [self bindMyDevice];
+        if(!self.isChecked){
+            [self checkDeviceVersionWithResult:^(BOOL isUpdate) {
+
+            } binUrl:^(NSString *url) {
+
+            }];
+        }
+        [self bindMyDevice];
     }
     }
     //版本号
     //版本号