Skip to content

D
DrWater
Commit 156dfa0d by 李威
Options

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

# Conflicts:
#	DJMHomeTY/Global/Manager/XHHttpRequestManager.m
#	DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m
parents ce3d07de 53ecd4ee
Showing with 1099 additions and 344 deletions
DJMHomeTY.xcodeproj/project.pbxproj
...@@ -3129,7 +3129,7 @@ ...@@ -3129,7 +3129,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageWater; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageWater;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 8Z4G7AGK6D; DEVELOPMENT_TEAM = 8Z4G7AGK6D;
GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch"; GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch";
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
...@@ -3154,7 +3154,7 @@ ...@@ -3154,7 +3154,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.2.1; MARKETING_VERSION = 1.2.2;
PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMDrWater; PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMDrWater;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
...@@ -3174,7 +3174,7 @@ ...@@ -3174,7 +3174,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageWater; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageWater;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 8Z4G7AGK6D; DEVELOPMENT_TEAM = 8Z4G7AGK6D;
GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch"; GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch";
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
...@@ -3199,7 +3199,7 @@ ...@@ -3199,7 +3199,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.2.1; MARKETING_VERSION = 1.2.2;
PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMDrWater; PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMDrWater;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
......
DJMHomeTY.xcworkspace/xcuserdata/lushaoxiong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
...@@ -7,77 +7,62 @@ ...@@ -7,77 +7,62 @@
<BreakpointProxy <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
uuid = "01B63D50-B381-43B6-9426-1CE3AC60EAA5" uuid = "8E79E0B6-5E3A-4942-95A9-4129987DD18C"
shouldBeEnabled = "No" shouldBeEnabled = "No"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Base/Controller/XHParentVC.m" filePath = "DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "371" startingLineNumber = "289"
endingLineNumber = "371" endingLineNumber = "289"
landmarkName = "-command" landmarkName = "-updateRecord:"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
<Location <Location
uuid = "01B63D50-B381-43B6-9426-1CE3AC60EAA5 - 946be021714874e7" uuid = "8E79E0B6-5E3A-4942-95A9-4129987DD18C - 633e2f4dec526b58"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__21-[XHParentVC command]_block_invoke_2"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "368"
endingLineNumber = "368"
offsetFromSymbolStart = "80">
</Location>
<Location
uuid = "01B63D50-B381-43B6-9426-1CE3AC60EAA5 - 946be02171487404"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "__21-[XHParentVC command]_block_invoke_2" symbolName = "-[XHParentVC updateRecord:]"
moduleName = "HJMDrWarter" moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Global/Base/Controller/XHParentVC.m" urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "371" startingLineNumber = "254"
endingLineNumber = "371" endingLineNumber = "254"
offsetFromSymbolStart = "80"> offsetFromSymbolStart = "756">
</Location> </Location>
<Location <Location
uuid = "01B63D50-B381-43B6-9426-1CE3AC60EAA5 - 946be02171487404" uuid = "8E79E0B6-5E3A-4942-95A9-4129987DD18C - 633e2f4dec526b58"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "__21-[XHParentVC command]_block_invoke_2" symbolName = "-[XHParentVC updateRecord:]"
moduleName = "HJMDrWarter" moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Global/Base/Controller/XHParentVC.m" urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "371" startingLineNumber = "254"
endingLineNumber = "371" endingLineNumber = "254"
offsetFromSymbolStart = "77"> offsetFromSymbolStart = "928">
</Location> </Location>
<Location <Location
uuid = "01B63D50-B381-43B6-9426-1CE3AC60EAA5 - 883590787588ea12" uuid = "8E79E0B6-5E3A-4942-95A9-4129987DD18C - 7f605f14e892f54e"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "__21-[XHParentVC command]_block_invoke_2" symbolName = "-[XHParentVC updateRecord:]"
moduleName = "DJMHomeDR" moduleName = "DJMHomeDR"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Global/Base/Controller/XHParentVC.m" urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "371" startingLineNumber = "254"
endingLineNumber = "371" endingLineNumber = "254"
offsetFromSymbolStart = "80"> offsetFromSymbolStart = "756">
</Location> </Location>
</Locations> </Locations>
</BreakpointContent> </BreakpointContent>
...@@ -85,125 +70,77 @@ ...@@ -85,125 +70,77 @@
<BreakpointProxy <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
uuid = "B1D833A0-B08F-4CF1-AFE5-8C270C404D8C" uuid = "E359E523-3519-496C-8634-30B842625020"
shouldBeEnabled = "No" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/Scan/Controller/HJScanVC.m" filePath = "DJMHomeTY/Page/DeviceListPage/Controller/DXDeviceListVC.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "374" startingLineNumber = "316"
endingLineNumber = "374" endingLineNumber = "316"
landmarkName = "-verify" landmarkName = "-machineButton:button:"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
<Location <Location
uuid = "B1D833A0-B08F-4CF1-AFE5-8C270C404D8C - 78ece01543109a3" uuid = "E359E523-3519-496C-8634-30B842625020 - 972ab115af337de3"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "__18-[HJScanVC verify]_block_invoke" symbolName = "-[DXDeviceListVC machineButton:button:]"
moduleName = "HJMDrWarter" moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Page/Scan/Controller/HJScanVC.m" urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DeviceListPage/Controller/DXDeviceListVC.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "369" startingLineNumber = "308"
endingLineNumber = "369" endingLineNumber = "308"
offsetFromSymbolStart = "148"> offsetFromSymbolStart = "560">
</Location> </Location>
<Location <Location
uuid = "B1D833A0-B08F-4CF1-AFE5-8C270C404D8C - 78ece01543109a3" uuid = "E359E523-3519-496C-8634-30B842625020 - 972ab115af337de3"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "__18-[HJScanVC verify]_block_invoke" symbolName = "-[DXDeviceListVC machineButton:button:]"
moduleName = "HJMDrWarter" moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Page/Scan/Controller/HJScanVC.m" urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DeviceListPage/Controller/DXDeviceListVC.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "369" startingLineNumber = "308"
endingLineNumber = "369" endingLineNumber = "308"
offsetFromSymbolStart = "134"> offsetFromSymbolStart = "100">
</Location> </Location>
<Location <Location
uuid = "B1D833A0-B08F-4CF1-AFE5-8C270C404D8C - 1bd0be5850f197b5" uuid = "E359E523-3519-496C-8634-30B842625020 - 972ab115af337d00"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "__18-[HJScanVC verify]_block_invoke" symbolName = "-[DXDeviceListVC machineButton:button:]"
moduleName = "DJMHomeDR"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Page/Scan/Controller/HJScanVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "369"
endingLineNumber = "369"
offsetFromSymbolStart = "148">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "8E79E0B6-5E3A-4942-95A9-4129987DD18C"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "254"
endingLineNumber = "254"
landmarkName = "-updateRecord:"
landmarkType = "7">
<Locations>
<Location
uuid = "8E79E0B6-5E3A-4942-95A9-4129987DD18C - 633e2f4dec526b58"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[XHParentVC updateRecord:]"
moduleName = "HJMDrWarter" moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Global/Base/Controller/XHParentVC.m" urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DeviceListPage/Controller/DXDeviceListVC.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "254" startingLineNumber = "311"
endingLineNumber = "254" endingLineNumber = "311"
offsetFromSymbolStart = "756"> offsetFromSymbolStart = "100">
</Location> </Location>
<Location <Location
uuid = "8E79E0B6-5E3A-4942-95A9-4129987DD18C - 633e2f4dec526b58" uuid = "E359E523-3519-496C-8634-30B842625020 - 972ab115af337cdb"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "-[XHParentVC updateRecord:]" symbolName = "-[DXDeviceListVC machineButton:button:]"
moduleName = "HJMDrWarter" moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Global/Base/Controller/XHParentVC.m" urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DeviceListPage/Controller/DXDeviceListVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "254"
endingLineNumber = "254"
offsetFromSymbolStart = "928">
</Location>
<Location
uuid = "8E79E0B6-5E3A-4942-95A9-4129987DD18C - 7f605f14e892f54e"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[XHParentVC updateRecord:]"
moduleName = "DJMHomeDR"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "254" startingLineNumber = "316"
endingLineNumber = "254" endingLineNumber = "316"
offsetFromSymbolStart = "756"> offsetFromSymbolStart = "100">
</Location> </Location>
</Locations> </Locations>
</BreakpointContent> </BreakpointContent>
...@@ -211,209 +148,65 @@ ...@@ -211,209 +148,65 @@
<BreakpointProxy <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
uuid = "8AD93C61-9019-4363-808A-69101A996276" uuid = "AE62525A-FDB8-4523-909B-B4D7A3305DB3"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Base/Controller/XHParentVC.m" filePath = "DJMHomeTY/Global/Manager/HJBluetoothManager.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "575" startingLineNumber = "802"
endingLineNumber = "575" endingLineNumber = "802"
landmarkName = "-getLocationWithLocality:withLongitude:withLatitude:" landmarkName = "-checkDeviceVersionWithResult:binUrl:"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
<Location <Location
uuid = "8AD93C61-9019-4363-808A-69101A996276 - 2a054354c3ea9abf" uuid = "AE62525A-FDB8-4523-909B-B4D7A3305DB3 - 5097582193a1d78c"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "-[XHParentVC getLocationWithLocality:withLongitude:withLatitude:]" symbolName = "-[HJBluetoothManager checkDeviceVersionWithResult:binUrl:]"
moduleName = "HJMDrWarter" moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Global/Base/Controller/XHParentVC.m" urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Global/Manager/HJBluetoothManager.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "570" startingLineNumber = "804"
endingLineNumber = "570" endingLineNumber = "804"
offsetFromSymbolStart = "168"> offsetFromSymbolStart = "324">
</Location> </Location>
<Location <Location
uuid = "8AD93C61-9019-4363-808A-69101A996276 - 2a054354c3ea9a02" uuid = "AE62525A-FDB8-4523-909B-B4D7A3305DB3 - bd31bb23d9dd3bb1"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "-[XHParentVC getLocationWithLocality:withLongitude:withLatitude:]" symbolName = "__58-[HJBluetoothManager checkDeviceVersionWithResult:binUrl:]_block_invoke"
moduleName = "HJMDrWarter" moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Global/Base/Controller/XHParentVC.m" urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Global/Manager/HJBluetoothManager.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "575" startingLineNumber = "802"
endingLineNumber = "575" endingLineNumber = "802"
offsetFromSymbolStart = "168"> offsetFromSymbolStart = "440">
</Location> </Location>
<Location <Location
uuid = "8AD93C61-9019-4363-808A-69101A996276 - e19f0f3988c67f27" uuid = "AE62525A-FDB8-4523-909B-B4D7A3305DB3 - c30f25783034ae47"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "-[XHParentVC getLocationWithLocality:withLongitude:withLatitude:]" symbolName = "__58-[HJBluetoothManager checkDeviceVersionWithResult:binUrl:]_block_invoke_2"
moduleName = "HJMDrWarter" moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Global/Base/Controller/XHParentVC.m" urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Global/Manager/HJBluetoothManager.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "575" startingLineNumber = "803"
endingLineNumber = "575" endingLineNumber = "803"
offsetFromSymbolStart = "168"> offsetFromSymbolStart = "40">
</Location> </Location>
</Locations> </Locations>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "E359E523-3519-496C-8634-30B842625020"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DeviceListPage/Controller/DXDeviceListVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "308"
endingLineNumber = "308"
landmarkName = "-machineButton:button:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "BF862B8C-C4F8-42EA-923B-656CEBFA3E6B"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "921"
endingLineNumber = "921"
landmarkName = "-startAction"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "C261B36B-9056-4731-B957-88851E89905D"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "918"
endingLineNumber = "918"
landmarkName = "-startAction"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "AF495839-53C7-4AB3-A46C-4727378C1E9A"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "915"
endingLineNumber = "915"
landmarkName = "-startAction"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "01C1E398-0132-40DC-9905-49C2E358CD2B"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "473"
endingLineNumber = "473"
landmarkName = "-getUseTimes:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "5806CDE6-86DB-461E-AE86-DA9637FB7568"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "476"
endingLineNumber = "476"
landmarkName = "-getUseTimes:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "0BAFAC0F-9E29-4597-982A-72FDC6A074B9"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "483"
endingLineNumber = "483"
landmarkName = "-getUseTimes:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "29A8A863-68B3-4B69-9E1E-8B8A95CE11F7"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "487"
endingLineNumber = "487"
landmarkName = "-getUseTimes:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "18FF4E36-5E4F-4768-BCA4-BC56F0A2BF4C"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "489"
endingLineNumber = "489"
landmarkName = "-getUseTimes:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints> </Breakpoints>
</Bucket> </Bucket>
DJMHomeTY/AppDelegate/AppDelegate.m
...@@ -31,9 +31,32 @@ ...@@ -31,9 +31,32 @@
NSArray *appLanguages = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"]; NSArray *appLanguages = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"];
NSString *languageName = [appLanguages objectAtIndex:0]; // NSString *languageName = [appLanguages objectAtIndex:0];
// NSArray *languageArry = [NSLocale preferredLanguages];
// NSString *languageName = languageArry.firstObject;
NSString *languageName = [[[NSBundle mainBundle] preferredLocalizations] firstObject];
XHGetDataManager.languageName = languageName; XHGetDataManager.languageName = languageName;
[XHDataManager sharedManager].simparlanguage = ([XHGetDataManager.languageName rangeOfString:@"zh-Hans"].location ==NSNotFound);
// [XHDataManager sharedManager].simparlanguage = ([XHGetDataManager.languageName rangeOfString:@"zh-Hans"].location ==NSNotFound);
if ([XHGetDataManager.languageName hasPrefix:@"zh"]) {
if ([XHGetDataManager.languageName rangeOfString:@"Hans"].location != NSNotFound) {
[XHDataManager sharedManager].simparlanguage = 0; // 简体中文
} else { // zh-Hant\zh-HK\zh-TW
[XHDataManager sharedManager].simparlanguage = 2; // 繁体
}
}else{
[XHDataManager sharedManager].simparlanguage = 2; // 英文
}
NSLog(@"=--==--==-:%d:%@",XHGetDataManager.simparlanguage,XHGetDataManager.languageName); NSLog(@"=--==--==-:%d:%@",XHGetDataManager.simparlanguage,XHGetDataManager.languageName);
......
DJMHomeTY/Assets.xcassets/HFX/drmianling_Logo1.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "drmianling_Logo1@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "drmianling_Logo1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DJMHomeTY/Global/Base/Controller/XHParentVC.m
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#import "HJVerifyView.h" #import "HJVerifyView.h"
#import <AudioToolbox/AudioToolbox.h> #import <AudioToolbox/AudioToolbox.h>
#import <CoreBluetooth/CoreBluetooth.h>
#import "MCSoundBoard.h" #import "MCSoundBoard.h"
#import "HJScanVC.h" #import "HJScanVC.h"
...@@ -22,13 +23,14 @@ ...@@ -22,13 +23,14 @@
#import "XHMineVC.h" #import "XHMineVC.h"
#import "XHSetHomeVC.h" #import "XHSetHomeVC.h"
#import "HJLocation.h" #import "HJLocation.h"
@interface XHParentVC ()<UIGestureRecognizerDelegate,VerifyViewDelegate,TipsViewDelegate,LocationDelegate> @interface XHParentVC ()<UIGestureRecognizerDelegate,VerifyViewDelegate,TipsViewDelegate,LocationDelegate,CBCentralManagerDelegate>
{ {
BOOL _tipDisplay; BOOL _tipDisplay;
} }
@property (nonatomic,strong) HJVerifyView *verifyView; @property (nonatomic,strong) HJVerifyView *verifyView;
@property (nonatomic, strong) UIActivityIndicatorView * activityIndicator; @property (nonatomic, strong) UIActivityIndicatorView * activityIndicator;
@property (nonatomic,strong) XHSetOrPersonalView *myView; @property (nonatomic,strong) XHSetOrPersonalView *myView;
@property (nonatomic, strong) CBCentralManager *centralManager;
@end @end
@implementation XHParentVC @implementation XHParentVC
...@@ -64,7 +66,40 @@ ...@@ -64,7 +66,40 @@
[self addNotification]; [self addNotification];
[self initNavView]; [self initNavView];
[self startLocation1]; [self startLocation1];
self.centralManager = [[CBCentralManager alloc] initWithDelegate:self queue:nil];
}
- (void)centralManagerDidUpdateState:(CBCentralManager *)central {
if (central.state == CBManagerStatePoweredOff) {
// 蓝牙未开启，显示提醒弹窗
UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"手机蓝牙未开启" message:@"请前往设置开启手机蓝牙" preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:nil];
UIAlertAction *settingsAction = [UIAlertAction actionWithTitle:@"设置" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
NSURL *settingsURL = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
if ([[UIApplication sharedApplication] canOpenURL:settingsURL]) {
[[UIApplication sharedApplication] openURL:settingsURL options:@{} completionHandler:nil];
}
}];
CBManagerState state;
[alertController addAction:cancelAction];
[alertController addAction:settingsAction];
[self presentViewController:alertController animated:YES completion:nil];
} else if (central.state == CBManagerStateUnauthorized)
{
UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"APP蓝牙未授权" message:@"请前往设置授权APP蓝牙权限" preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:nil];
UIAlertAction *settingsAction = [UIAlertAction actionWithTitle:@"设置" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
NSURL *settingsURL = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
if ([[UIApplication sharedApplication] canOpenURL:settingsURL]) {
[[UIApplication sharedApplication] openURL:settingsURL options:@{} completionHandler:nil];
}
}];
CBManagerState state;
[alertController addAction:cancelAction];
[alertController addAction:settingsAction];
[self presentViewController:alertController animated:YES completion:nil];
NSLog(@"设备未授权状态");
}
} }
-(void)startLocation1{ -(void)startLocation1{
__block NSString *string; __block NSString *string;
...@@ -401,19 +436,19 @@ ...@@ -401,19 +436,19 @@
-(void)Verify:(NSString*)str{ -(void)Verify:(NSString*)str{
if (self.isConnected) { if (self.isConnected) {
NSString *language; // NSString *language;
if ( [XHGetDataManager.languageName rangeOfString:@"zh-H"].location !=NSNotFound) { // if ( [XHGetDataManager.languageName rangeOfString:@"zh-H"].location !=NSNotFound) {
language = @"0"; // language = @"0";
}else{ // }else{
language = @"1"; // language = @"1";
} // }
//@"1234",@"DJM92050474" //@"1234",@"DJM92050474"
NSDictionary *updateDic = @{@"employeeNumber":[NSString isNull:XHGetDataManager.uniqueNumber]?@"-1":XHGetDataManager.uniqueNumber, NSDictionary *updateDic = @{@"employeeNumber":[NSString isNull:XHGetDataManager.uniqueNumber]?@"-1":XHGetDataManager.uniqueNumber,
@"verification":self.isOrderCommand?@"1234":@"-1",//@"1234" @"verification":self.isOrderCommand?@"1234":@"-1",//@"1234"
@"consumableNumber":[NSString isNull:str]?@"-1":str, @"consumableNumber":[NSString isNull:str]?@"-1":str,
@"deviceid":XHGetDataManager.deviceID, @"deviceid":XHGetDataManager.deviceID,
@"language":language @"language":[NSString stringWithFormat:@"%d",XHGetDataManager.simparlanguage]
}; };
HJSelfWeak; HJSelfWeak;
[SVProgressHUD showWithStatus:HJLocalizedString(@"正在验证，请稍后…")]; [SVProgressHUD showWithStatus:HJLocalizedString(@"正在验证，请稍后…")];
...@@ -471,6 +506,7 @@ ...@@ -471,6 +506,7 @@
HJSelfWeak; HJSelfWeak;
[[XHHttpRequestManager shareManager] postHttpRequestURL1:GetConLimitNumURL isJson:true parameters:@{@"deviceid":XHGetDataManager.deviceID} success:^(id responseObject) { [[XHHttpRequestManager shareManager] postHttpRequestURL1:GetConLimitNumURL isJson:true parameters:@{@"deviceid":XHGetDataManager.deviceID} success:^(id responseObject) {
NSLog(@"1responseObjectresponseObjectresponseObject:%@",responseObject); NSLog(@"1responseObjectresponseObjectresponseObject:%@",responseObject);
if([XHCommonMethods isEmptyOrNull:[NSString stringWithFormat:@"%@",responseObject[@"data"][@"availNumber"]]]){ if([XHCommonMethods isEmptyOrNull:[NSString stringWithFormat:@"%@",responseObject[@"data"][@"availNumber"]]]){
GetUseTimessuccesedBlock(false); GetUseTimessuccesedBlock(false);
}else{ }else{
......
DJMHomeTY/Global/Define/XHURL.h
...@@ -139,7 +139,10 @@ ...@@ -139,7 +139,10 @@
#define GetRecordPageURL [NSString stringWithFormat:@"%@%@",URL,@"/record/getGestationRecordByDeviceid"] #define GetRecordPageURL [NSString stringWithFormat:@"%@%@",URL,@"/record/getGestationRecordByDeviceid"]
/*获取使用剩余次数*/ /*获取使用剩余次数*/
#define GetConLimitNumURL [NSString stringWithFormat:@"%@%@",URL,@"/openapi/device/getConLimitNum"] //#define GetConLimitNumURL [NSString stringWithFormat:@"%@%@",URL,@"/openapi/device/getConLimitNum"]
/*获取使用剩余次数*/
#define GetConLimitNumURL [NSString stringWithFormat:@"%@%@",URL,@"/ldm/api/getConLimitNum"]
/*获取设备状态Dr-02-1 获取设备模单机或蓝牙*/ /*获取设备状态Dr-02-1 获取设备模单机或蓝牙*/
#define GetDeviceStausURL [NSString stringWithFormat:@"%@%@",URL,@"/openapi/device/getSpecialConf"] #define GetDeviceStausURL [NSString stringWithFormat:@"%@%@",URL,@"/openapi/device/getSpecialConf"]
......
DJMHomeTY/Global/Manager/HJBluetoothManager.m
...@@ -217,6 +217,7 @@ static HJBluetoothManager *sharedinstance = nil; ...@@ -217,6 +217,7 @@ static HJBluetoothManager *sharedinstance = nil;
} }
if (central.state == CBCentralManagerStatePoweredOff) if (central.state == CBCentralManagerStatePoweredOff)
{ {
NSLog(@"设备关闭状态"); NSLog(@"设备关闭状态");
[self stopScanning]; [self stopScanning];
_servicePeripheral = nil; _servicePeripheral = nil;
......
DJMHomeTY/Global/Manager/HJLocation.m
...@@ -138,8 +138,12 @@ ...@@ -138,8 +138,12 @@
// [manager requestAlwaysAuthorization]; // [manager requestAlwaysAuthorization];
[_manager requestWhenInUseAuthorization];//使用的时候获取定位信息 [_manager requestWhenInUseAuthorization];//使用的时候获取定位信息
} }
NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"];
if (appName == nil || appName.length == 0) {
appName = @"DJMsp2";
}
if([CLLocationManager authorizationStatus] == kCLAuthorizationStatusDenied){ if([CLLocationManager authorizationStatus] == kCLAuthorizationStatusDenied){
UIAlertView *alvertView=[[UIAlertView alloc]initWithTitle:HJLocalizedString(@"提示") message:HJLocalizedString(@"请到手机系统的\n【设置】->【隐私】->【定位服务】->【%@】->【使用应用期间】或者【始终】开启定位服务的访问权限") delegate:nil cancelButtonTitle:HJLocalizedString(@"确定") otherButtonTitles: nil]; UIAlertView *alvertView=[[UIAlertView alloc]initWithTitle:HJLocalizedString(@"提示") message:[NSString stringWithFormat:HJLocalizedString(@"请到手机系统的\n【设置】->【隐私】->【定位服务】->【%@】->【使用应用期间】或者【始终】开启定位服务的访问权限"),appName ] delegate:nil cancelButtonTitle:HJLocalizedString(@"确定") otherButtonTitles: nil];
[alvertView show]; [alvertView show];
} }
......
DJMHomeTY/Global/Manager/XHDataManager.h
...@@ -62,8 +62,8 @@ ...@@ -62,8 +62,8 @@
@property (nonatomic, assign) BOOL isBind; @property (nonatomic, assign) BOOL isBind;
/// 当前语言环境 /// 当前语言环境
@property (nonatomic,copy) NSString *languageName; @property (nonatomic,copy) NSString *languageName;
/// 当前语言是否为非简体中文 0 是 1 非 /// 当前语言0简中 1英文 2繁体
@property (nonatomic,assign) BOOL simparlanguage; @property (nonatomic,assign) int simparlanguage;
/// 是否 第一次进入 /// 是否 第一次进入
@property (nonatomic, assign) BOOL isFirstInto; @property (nonatomic, assign) BOOL isFirstInto;
......
DJMHomeTY/Global/Manager/XHDataManager.m
...@@ -306,12 +306,14 @@ ...@@ -306,12 +306,14 @@
return [[[self userDefaults] objectForKey:IsBind] boolValue]; return [[[self userDefaults] objectForKey:IsBind] boolValue];
} }
- (void)setSimparlanguage:(BOOL)simparlanguage{ - (void)setSimparlanguage:(int)simparlanguage{
[[self userDefaults] setObject:[NSNumber numberWithBool:simparlanguage] forKey:@"simparlanguage"]; [[self userDefaults] setObject:[NSNumber numberWithInt:simparlanguage] forKey:@"simparlanguage"];
[[self userDefaults] synchronize]; [[self userDefaults] synchronize];
NSLog(@"%d",simparlanguage);
} }
- (BOOL)simparlanguage{ - (int)simparlanguage{
return [[[self userDefaults] objectForKey:@"simparlanguage"] boolValue]; NSLog(@"%d",[[[self userDefaults] objectForKey:@"simparlanguage"] intValue]);
return [[[self userDefaults] objectForKey:@"simparlanguage"] intValue];
} }
#pragma mark ------当前语言 #pragma mark ------当前语言
-(void)setLanguageName:(NSString *)languageName{ -(void)setLanguageName:(NSString *)languageName{
......
DJMHomeTY/Global/Manager/XHHttpRequestManager.m
...@@ -29,7 +29,10 @@ ...@@ -29,7 +29,10 @@
manager.responseSerializer = [AFJSONResponseSerializer serializer]; manager.responseSerializer = [AFJSONResponseSerializer serializer];
} }
manager.requestSerializer.timeoutInterval = 50; manager.requestSerializer.timeoutInterval = 50;
[manager.requestSerializer setValue:XHGetDataManager.token forHTTPHeaderField:@"token"]; [manager.requestSerializer setValue:[NSString stringWithFormat:@"%d",XHGetDataManager.simparlanguage] forHTTPHeaderField:@"Accept-Language"];
NSLog(@"%d",XHGetDataManager.simparlanguage );
[manager GET:url parameters:updateDic headers:nil progress:^(NSProgress * _Nonnull downloadProgress) { [manager GET:url parameters:updateDic headers:nil progress:^(NSProgress * _Nonnull downloadProgress) {
} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { } success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
...@@ -63,7 +66,7 @@ ...@@ -63,7 +66,7 @@
// [manager.requestSerializer setValue:XHGetDataManager.token forHTTPHeaderField:@"Authorization"];//Headers // [manager.requestSerializer setValue:XHGetDataManager.token forHTTPHeaderField:@"Authorization"];//Headers
[manager.requestSerializer setValue:XHGetDataManager.token forHTTPHeaderField:@"token"]; [manager.requestSerializer setValue:XHGetDataManager.token forHTTPHeaderField:@"token"];
NSLog(@"%@",XHGetDataManager.token );
[manager.requestSerializer setValue:[NSString stringWithFormat:@"%d",XHGetDataManager.simparlanguage] forHTTPHeaderField:@"Accept-Language"]; [manager.requestSerializer setValue:[NSString stringWithFormat:@"%d",XHGetDataManager.simparlanguage] forHTTPHeaderField:@"Accept-Language"];
...@@ -78,6 +81,11 @@ ...@@ -78,6 +81,11 @@
success(responseObject); success(responseObject);
} }
} }
// else if ([responseObject[@"code"] integerValue] == 12024){
// if (success) {
// success(responseObject);
// }
// }
// if ([responseObject[@"code"] integerValue] == 200) { // if ([responseObject[@"code"] integerValue] == 200) {
// if (success) { // if (success) {
// success(responseObject); // success(responseObject);
...@@ -172,18 +180,18 @@ ...@@ -172,18 +180,18 @@
} }
#pragma mark ========== 验证并获取时间 ========== #pragma mark ========== 验证并获取时间 ==========
-(void)getVerifyTimeWithConsumableNumber:(NSString *)consumableNumber isFailTips:(BOOL)isTips withSuccess:(HttpRequestSuccessBlock)success withFail:(HttpRequestFailBlock)fail networkRequestsFail:(NetworkRequestsFail)networkFail{ -(void)getVerifyTimeWithConsumableNumber:(NSString *)consumableNumber isFailTips:(BOOL)isTips withSuccess:(HttpRequestSuccessBlock)success withFail:(HttpRequestFailBlock)fail networkRequestsFail:(NetworkRequestsFail)networkFail{
NSString *language; // NSString *language;
if ( [XHGetDataManager.languageName rangeOfString:@"zh-H"].location !=NSNotFound) { // if ( [XHGetDataManager.languageName rangeOfString:@"zh-H"].location !=NSNotFound) {
language = @"0"; // language = @"0";
}else{ // }else{
language = @"1"; // language = @"1";
} // }
NSDictionary *uploadDic = @{@"employeeNumber":[NSString isNull:XHGetDataManager.uniqueNumber]?@"-1":XHGetDataManager.uniqueNumber, NSDictionary *uploadDic = @{@"employeeNumber":[NSString isNull:XHGetDataManager.uniqueNumber]?@"-1":XHGetDataManager.uniqueNumber,
@"verification":@"1234",// @"verification":@"1234",//
@"consumableNumber":consumableNumber, @"consumableNumber":consumableNumber,
@"deviceid":XHGetDataManager.deviceID, @"deviceid":XHGetDataManager.deviceID,
@"language":language}; @"language":[NSString stringWithFormat:@"%d",XHGetDataManager.simparlanguage]};
[SVProgressHUD show]; [SVProgressHUD show];
[self postHttpRequestURL:VerifyURL isJson:true parameters:uploadDic success:^(id responseObject) { [self postHttpRequestURL:VerifyURL isJson:true parameters:uploadDic success:^(id responseObject) {
......
DJMHomeTY/Global/Text/Base.lproj/InfoPlist.strings
...@@ -5,3 +5,12 @@ ...@@ -5,3 +5,12 @@
Created by 1688 on 2018/6/7. Created by 1688 on 2018/6/7.
Copyright © 2018年 黄箭. All rights reserved. Copyright © 2018年 黄箭. All rights reserved.
*/ */
NSAppleMusicUsageDescription = "我们需要您的許可才能訪問相冊。";
NSBluetoothPeripheralUsageDescription = "我們需要您的藍牙來啟動外设。";
NSBluetoothAlwaysUsageDescription = "我們需要您的藍牙來与周围的设备进行通信。";
NSCameraUsageDescription = "我们需要您的許可才能訪問相機，您的相機將用於掃描DJM設備相關二維碼，從而對設備進行操控。";
NSLocationAlwaysUsageDescription = "我们需要您的允许通过定位信息与周围的设备进行通信。";
NSLocationUsageDescription = "我们需要您的允许通过定位信息与周围的设备进行通信。";
NSLocationWhenInUseUsageDescription = "我们需要您的允许通过定位信息与周围的设备进行通信。";
NSPhotoLibraryAddUsageDescription = "我们需要您的許可才能訪問這些與DJM設備相關的照片，並通過這些DJM相關的照片獲取DJM設備的操控所需信息。";
NSPhotoLibraryUsageDescription = "我们需要您的許可才能訪問這些與DJM設備相關的照片，並通過這些DJM相關的照片獲取DJM設備的操控所需信息。";
DJMHomeTY/Global/Text/Base.lproj/Localizable.strings
"版本更新" = "版本更新";
"检测到新版本(%@)，请及时更新" = "檢測到新版本(%@)，請及時更新";
"更新" = "更新";
"取消" = "取消";
"仪器未连接" = "儀器未連接";
"请扫描[精华液瓶]二维码" = "請掃描[精華液瓶]二維碼";
"请扫描[耗材]二维码" = "請掃描[耗材]二維碼";
"查询管控状态失败。" = "查詢管控狀態失敗。";
"正在验证，请稍后…" = "正在驗證，請稍後…";
"验证成功！" = "驗證成功！";
"本次理疗未结束，是否退出？" = "本次理療未結束，是否退出？";
"确定" = "確定";
"知道了" = "知道了";
"提示" = "提示";
"验证" = "驗證";
"工号不能为空!" = "工號不能為空!";
"订单号不能为空!" = "訂單號不能為空!";
"产品号不能为空!" = "產品號不能為空!";
"完成" = "完成";
"请到手机系统的\n【设置】->【隐私】->【定位服务】->【%@】->【使用应用期间】或者【始终】开启定位服务的访问权限" = "請到手機系統的\n【設置】->【隱私】->【定位服務】->【%@】->【使用應用期間】或者【始終】開啟定位服務的訪問權限";
"网络请求失败" = "網路請求失敗";
"登录已过期或失效，请重新登录！" = "登錄已過期或失效，請重新登錄！";
"手机未开启蓝牙，请开启蓝牙重试！" = "手機未開啟藍牙，請開啟藍牙重試！";
"连接成功" = "連接成功";
"断开连接" = "斷開連接";
"方案正在进行中，是否确定退出？" = "方案正在進行中，是否確定退出？";
"已达极限值60W" = "已達極限值60W";
"下额线" = "下額線";
"法令纹" = "法令紋";
"苹果肌" = "蘋果肌";
"眼部" = "眼部";
"额头" = "額頭";
"下额线\n 5mins" = "下額線\n 5分鐘";
"法令纹\n5mins" = "法令紋\n5分鐘";
"苹果肌\n5mins" = "蘋果肌\n5分鐘";
"眼部\n5mins" = "眼部\n5分鐘";
"额头\n5mins" = "額頭\n5分鐘";
"手机未开启蓝牙，请开启蓝牙重试！" = "手機未開啟藍牙，請開啟藍牙重試！";
"连接成功" = "連接成功";
"断开连接" = "斷開連接";
"温度过高" = "溫度過高";
"最佳温度" = "最佳溫度";
"建议本次操作结束后进行设备保养，如因长期未保养导致管道堵塞，造成售后维修属于人为损坏，需自行承担费用" = "建議本次操作結束後進行設備保養，如因長期未保養導致管道堵塞，造成售後維修屬於人為損壞，需自行承擔費用";
"我知道了" = "我知道了";
"正在升级固件" = "正在升級固件";
"已完成" = "已完成";
"请勿断开蓝牙" = "請勿斷開藍牙";
"结束" = "結束";
"请确认精华液已用完" = "請確認精華液已用完";
"护理未开始" = "護理未開始";
"手机未开启蓝牙，请开启蓝牙重试！" = "手機未開啟藍牙，請開啟藍牙重試！";
"请扫描耗材二维码" = "請掃描耗材二維碼";
"更新完成" = "更新完成";
"清洁中..." = "清潔中...";
"请验证耗材有效性" = "請驗證耗材有效性";
"设备清洁已完成，请开始护理洁面" = "設備清潔已完成，請開始護理潔面";
"当前护理已完成，是否继续操作？" = "當前護理已完成，是否繼續操作？";
"护理已完成..." = "護理已完成...";
"有新版本升级" = "有新版本升級";
"正在准备升级..." = "正在準備升級...";
"操作指引" = "操作指引";
"取空瓶灌装 30℃左右的温水，安装在精华液瓶的位置，并安装好废水瓶" = "取空瓶灌裝 30℃左右的溫水，安裝在精華液瓶的位置，並安裝好廢水瓶";
"在手柄上把流量调节到最大，点击“▶”进行保养" = "在手柄上把流量調節到最大，點擊“▶”進行保養";
"清洁件用透明盖子或手指堵住探头，间隔一段时间松开" = "清潔件用透明蓋子或手指堵住探頭，間隔一段時間鬆開";
"50秒后结束保养，请卸下瓶子" = "50秒後結束保養，請卸下瓶子";
"最后，请记得清洗废水瓶" = "最後，請記得清洗廢水瓶";
"45秒后结束保养，请卸下瓶子" = "45秒後結束保養，請卸下瓶子";
"保养已完成，点击确定按钮退出" = "保養已完成，點擊確定按鈕退出";
"建议本次使用结束后进行设备保养" = "建議本次使用結束後進行設備保養";
"① 清洁设备" = "① 清潔設備";
"② 面部护理" = "② 面部護理";
"UV灯" = "UV燈";
"全脸清洁" = "全臉清潔";
"清洁设备不可调节负压、流速" = "清潔設備不可調節負壓、流速";
"负压调节" = "負壓調節";
"精华液流速" = "精華液流速";
"流速以拔起探头不会滴水为佳" = "流速以拔起探頭不會滴水為佳";
"清洁设备不可调节负压、流速" = "清潔設備不可調節負壓、流速";
"自定义模式" = "自訂模式";
"智能模式" = "智能模式";
"当前模式正在进行中，请结束后再切换模式!" = "當前模式正在進行中，請結束後再切換模式！";
"请操作左脸" = "請操作左臉";
"请连接上设备后重试" = "請連接上設備後重試";
"请结束当前方案后再切换" = "請結束當前方案後再切換";
"请暂停后再开始消毒" = "請暫停後再開始消毒";
"即将结束本次服务，结束后可重新选择护理方案" = "即將結束本次服務，結束後可重新選擇護理方案";
"断开连接" = "斷開連接";
"手柄未连接" = "手柄未連接";
"方案正在进行中，是否确定退出？" = "方案正在進行中，是否確定退出？";
"有新版本升级" = "有新版本升級";
"正在准备升级..." = "正在準備升級...";
"调节变频时间 | 5ms" = "調節變頻時間 | 5毫秒";
"调节变频时间 | 7ms" = "調節變頻時間 | 7毫秒";
"调节变频时间" = "調節變頻時間";
"3M 档位" = "3M 檔位";
"3M 强度(W/cm²)" = "3M 強度(W/cm²)";
"10M 档位" = "10M 檔位";
"10M 强度(W/cm²)" = "10M 強度(W/cm²)";
"设备离线" = "設備離線";
"选择护理方案" = "選擇護理方案";
"眼纹" = "眼紋";
"深纹" = "深紋";
"提升" = "提升";
"面部紧致" = "面部緊緻";
"皮肤焕新" = "皮膚焕新";
"敏感性皮肤焕新" = "敏感性皮膚焕新";
"抗衰" = "抗衰";
"辅助面部吸收" = "輔助面部吸收";
"粉刺痤疮" = "粉刺痤疮";
"丘疹脓疱性痤疮" = "丘疹脓疱性痤疮";
"明眸淡纹" = "明眸淡紋";
"抚平舒纹" = "撫平舒紋";
"童颜提拉" = "童顏提拉";
"轮廓紧致" = "輪廓緊緻";
"美肌焕新" = "美肌焕新";
"舒敏焕新" = "舒敏焕新";
"嫩颜促吸" = "嫩顏促吸";
"平痘护肤" = "平痘護膚";
"平痘抑菌" = "平痘抑菌";
"个人中心" = "個人中心";
"设备设置" = "設備設置";
"使用时长：00:14:00" = "使用時長：00:14:00";
"LDM(家居版)" = "LDM(家居版)";
"Dr强效向控旋磁仪" = "Dr強效向控旋磁儀";
"高光水滴仪" = "高光水滴儀";
"添加设备" = "添加設備";
"Dr.水滴高光仪" = "Dr.水滴高光儀";
"Dr.Hi飞秀" = "Dr.Hi飛秀";
"D3果冻仪器" = "D3果凍儀器";
"去连接" = "去連接";
"水滴高光仪" = "水滴高光儀";
"帮助与反馈" = "幫助與反饋";
"关于" = "關於";
"退出登录" = "退出登錄";
"暂未开放此功能，敬请期待!" = "暫未開放此功能，敬請期待！";
"是否确定退出登录？" = "是否確定退出登錄？";
"个人资料" = "個人資料";
"昵称" = "暱稱";
"年龄" = "年齡";
"性别" = "性別";
"男" = "男";
"女" = "女";
"注销账户并清除用户数据" = "注銷賬戶並清除用戶數據";
"是否确定注销账户并清除用户数据？" = "是否確定注銷賬戶並清除用戶數據？";
"修改密码" = "修改密碼";
"修改年龄" = "修改年齡";
"选择性别" = "選擇性別";
"男生" = "男生";
"女生" = "女生";
"修改昵称" = "修改暱稱";
"请输入昵称" = "請輸入暱稱";
"网络请求失败" = "網絡請求失敗";
"发送验证码" = "發送驗證碼";
"登录成功！" = "登錄成功！";
"完善资料" = "完善資料";
"出生日期" = "出生日期";
"请输入邮箱号码" = "請輸入郵箱號碼";
"已阅读并同意" = "已閱讀並同意";
"《用户使用协议》" = "《用戶使用協議》";
"请输入手机号码" = "請輸入手機號碼";
"验证码" = "驗證碼";
"获取验证码" = "獲取驗證碼";
"请阅读并同意用户使用协议" = "請閱讀並同意用戶使用協議";
"请输入正确格式的手机号码" = "請輸入正確格式的手機號碼";
"请设置昵称" = "請設置暱稱";
"下一步" = "下一步";
"图片中未识别到二维码" = "圖片中未識別到二維碼";
"返回" = "返回";
"重试" = "重試";
"正在验证，请稍后…" = "正在驗證，請稍後…";
"验证成功！" = "驗證成功！";
"请到手机系统的\n【设置】->【隐私】->【照片】->【%@】开启照片的访问权限" = "請到手機系統的\n【設置】->【隱私】->【照片】->【%@】開啟照片的訪問權限";
"照片读取权限未开启" = "照片讀取權限未開啟";
"请到手机系统的\n【设置】->【隐私】->【相机】->【%@】开启相机的访问权限" = "請到手機系統的\n【設置】->【隱私】->【相機】->【%@】開啟相機的訪問權限";
"相机权限未开启" = "相機權限未開啟";
"只支持iOS8.0以上系统！" = "只支持iOS8.0以上系統！";
"选择设备型号" = "選擇設備型號";
"查看排行" = "查看排行";
"设置" = "設置";
"设备类型" = "設備類型";
"设置手柄频率" = "設置手柄頻率";
"设备消毒程序" = "設備消毒程序";
"应用程序版本" = "應用程序版本";
"固件版本" = "固件版本";
"自动播放视频" = "自動播放視頻";
"设备id" = "設備id";
"输入密码" = "輸入密碼";
"修改" = "修改";
"密码错误" = "密碼錯誤";
"请完善手柄频率设置" = "請完善手柄頻率設置";
"请输入手柄标签上的初始频率" = "請輸入手柄標簽上的初始頻率";
"暂不设置" = "暫不設置";
"请输入手柄频率" = "請輸入手柄頻率";
"请输入3M手柄上的频率" = "請輸入3M手柄上的頻率";
"请输入10M手柄上的频率" = "請輸入10M手柄上的頻率";
"修改设备名称" = "修改設備名稱";
"选择操作模式" = "選擇操作模式";
DJMHomeTY/Global/Text/en.lproj/InfoPlist.strings
...@@ -6,12 +6,23 @@ ...@@ -6,12 +6,23 @@
Copyright © 2018年 黄箭. All rights reserved. Copyright © 2018年 黄箭. All rights reserved.
*/ */
NSAppleMusicUsageDescription = "We need your permission to access the album."; //NSAppleMusicUsageDescription = "We need your permission to access the album.";
NSBluetoothPeripheralUsageDescription = "We need your bluetooth to start device."; //NSBluetoothPeripheralUsageDescription = "We need your bluetooth to start device.";
NSBluetoothAlwaysUsageDescription = "We need to communicate with peripherals via Bluetooth"; //NSBluetoothAlwaysUsageDescription = "We need to communicate with peripherals via Bluetooth";
NSCameraUsageDescription = "We needs your permission to access the camera. Your camera will be used to scan the QR code of the DJM device to control the DJM device."; //NSCameraUsageDescription = "We needs your permission to access the camera. Your camera will be used to scan the QR code of the DJM device to control the DJM device.";
NSLocationAlwaysUsageDescription = "We need your permission to communicate with surrounding DJM devices via location information."; //NSLocationAlwaysUsageDescription = "We need your permission to communicate with surrounding DJM devices via location information.";
NSLocationUsageDescription = "We need your permission to communicate with surrounding DJM devices via location information."; //NSLocationUsageDescription = "We need your permission to communicate with surrounding DJM devices via location information.";
NSLocationWhenInUseUsageDescription = "We need your permission to communicate with surrounding DJM devices via location information."; //NSLocationWhenInUseUsageDescription = "We need your permission to communicate with surrounding DJM devices via location information.";
NSPhotoLibraryAddUsageDescription = "We needs your permission to access these DJM-related photos, and obtain the information required for the operation of the DJM equipment through these DJM-related photos."; //NSPhotoLibraryAddUsageDescription = "We needs your permission to access these DJM-related photos, and obtain the information required for the operation of the DJM equipment through these DJM-related photos.";
NSPhotoLibraryUsageDescription = "We needs your permission to access these DJM-related photos, and obtain the information required for the operation of the DJM equipment through these DJM-related photos."; //NSPhotoLibraryUsageDescription = "We needs your permission to access these DJM-related photos, and obtain the information required for the operation of the DJM equipment through these DJM-related photos.";
NSAppleMusicUsageDescription = "我们需要您的許可才能訪問相冊。";
NSBluetoothPeripheralUsageDescription = "我們需要您的藍牙來啟動外设。";
NSBluetoothAlwaysUsageDescription = "我們需要您的藍牙來与周围的设备进行通信。";
NSCameraUsageDescription = "我们需要您的許可才能訪問相機，您的相機將用於掃描DJM設備相關二維碼，從而對設備進行操控。";
NSLocationAlwaysUsageDescription = "我们需要您的允许通过定位信息与周围的设备进行通信。";
NSLocationUsageDescription = "我们需要您的允许通过定位信息与周围的设备进行通信。";
NSLocationWhenInUseUsageDescription = "我们需要您的允许通过定位信息与周围的设备进行通信。";
NSPhotoLibraryAddUsageDescription = "我们需要您的許可才能訪問這些與DJM設備相關的照片，並通過這些DJM相關的照片獲取DJM設備的操控所需信息。";
NSPhotoLibraryUsageDescription = "我们需要您的許可才能訪問這些與DJM設備相關的照片，並通過這些DJM相關的照片獲取DJM設備的操控所需信息。";
DJMHomeTY/Global/Text/en.lproj/Localizable.strings
//"版本更新" = "Version Update";
//"检测到新版本(%@)，请及时更新" = "New version detected (%@), please update in time";
//"更新" = "Update";
//"取消" = "Cancel";
//"仪器未连接" = "Device not connected";
//"请扫描[精华液瓶]二维码" = "Please scan the QR code for [Essence Bottle]";
//"请扫描[耗材]二维码" = "Please scan the QR code for [Consumables]";
//"查询管控状态失败。" = "Failed to query control status.";
//"正在验证，请稍后…" = "Validating, please wait…";
//"验证成功！" = "Validation successful!";
//"本次理疗未结束，是否退出？" = "This therapy session is not finished, do you want to exit?";
//"确定" = "Confirm";
//"知道了" = "Got it";
//"提示" = "Tip";
//"验证" = "Validation";
//"工号不能为空!" = "Employee ID cannot be empty!";
//"订单号不能为空!" = "Order number cannot be empty!";
//"产品号不能为空!" = "Product number cannot be empty!";
//"完成" = "Complete";
//"请到手机系统的\n【设置】->【隐私】->【定位服务】->【%@】->【使用应用期间】或者【始终】开启定位服务的访问权限" = "Please go to the phone's system settings\n【Settings】->【Privacy】->【Location Services】->【%@】->【Allow While Using App】or【Always】to enable location service access";
//"网络请求失败" = "Network request failed";
//"登录已过期或失效，请重新登录！" = "Login has expired or become invalid, please log in again!";
//"手机未开启蓝牙，请开启蓝牙重试！" = "Bluetooth is not enabled on the phone, please enable Bluetooth and try again!";
//"连接成功" = "Connection successful";
//"断开连接" = "Disconnect";
//"方案正在进行中，是否确定退出？" = "The program is in progress, are you sure you want to exit?";
//"已达极限值60W" = "Maximum limit reached: 60W";
//"下额线" = "Lower jawline";
//"法令纹" = "Nasolabial folds";
//"苹果肌" = "Apple cheeks";
//"眼部" = "Eye area";
//"额头" = "Forehead";
//"下额线\n 5mins" = "Lower jawline\n 5mins";
//"法令纹\n5mins" = "Nasolabial folds\n5mins";
//"苹果肌\n5mins" = "Apple cheeks\n5mins";
//"眼部\n5mins" = "Eye area\n5mins";
//"额头\n5mins" = "Forehead\n5mins";
//"手机未开启蓝牙，请开启蓝牙重试！" = "Bluetooth is not enabled on the phone, please enable Bluetooth and try again!";
//"连接成功" = "Connection successful";
//"断开连接" = "Disconnect";
//"温度过高" = "Temperature too high";
//"最佳温度" = "Optimal temperature";
//"建议本次操作结束后进行设备保养，如因长期未保养导致管道堵塞，造成售后维修属于人为损坏，需自行承担费用" = "It is recommended to perform equipment maintenance after this operation. If blockage of the pipeline occurs due to long-term lack of maintenance, resulting in damage requiring after-sales repair, the cost shall be borne by the user";
//"我知道了" = "Got it";
//"正在升级固件" = "Firmware upgrade in progress";
//"已完成" = "Completed";
//"请勿断开蓝牙" = "Please do not disconnect Bluetooth";
//"结束" = "End";
//"请确认精华液已用完" = "Please confirm that the essence has been used up";
//"护理未开始" = "Care has not started";
//"手机未开启蓝牙，请开启蓝牙重试！" = "Bluetooth is not enabled on the phone, please enable Bluetooth and try again!";
//"请扫描耗材二维码" = "Please scan the consumables QR code";
//"更新完成" = "Update completed";
//"清洁中..." = "Cleaning...";
//"请验证耗材有效性" = "Please verify the validity of the consumables";
//"设备清洁已完成，请开始护理洁面" = "Device cleaning completed, please start facial cleansing";
//"当前护理已完成，是否继续操作？" = "Current care is completed, do you want to continue?";
//"护理已完成..." = "Care completed...";
//"有新版本升级" = "New version upgrade available";
//"正在准备升级..." = "Preparing for upgrade...";
//"操作指引" = "Operation Guide";
//"取空瓶灌装 30℃左右的温水，安装在精华液瓶的位置，并安装好废水瓶" = "Fill an empty bottle with water at around 30°C, install it in the position of the essence bottle, and install the waste water bottle";
//"在手柄上把流量调节到最大，点击“▶”进行保养" = "Adjust the flow rate to maximum on the handle, click on '▶' to perform maintenance";
//"清洁件用透明盖子或手指堵住探头，间隔一段时间松开" = "Use a transparent cover or finger to cover the probe, release it after a period of time";
//"50秒后结束保养，请卸下瓶子" = "Maintenance will end in 50 seconds, please remove the bottle";
//"最后，请记得清洗废水瓶" = "Finally, remember to clean the waste water bottle";
//"45秒后结束保养，请卸下瓶子" = "Maintenance will end in 45 seconds, please remove the bottle";
//"保养已完成，点击确定按钮退出" = "Maintenance completed, click 'Confirm' to exit";
//"建议本次使用结束后进行设备保养" = "Suggest maintenance after use";
//"① 清洁设备" = "① Clean device";
//"② 面部护理" = "② Facial care";
//"UV灯" = "UV lamp";
//"全脸清洁" = "Full face cleaning";
//"清洁设备不可调节负压、流速" = "Cleaning device can't adjust pressure or flow";
//"负压调节" = "Negative pressure adjustment";
//"精华液流速" = "Essence flow rate";
//"流速以拔起探头不会滴水为佳" = "Best flow rate: no dripping when probe is pulled ou";
//"清洁设备不可调节负压、流速" = "Cleaning device can't adjust pressure or flow";
//
//
//"自定义模式" = "Custom Mode";
//"智能模式" = "Smart Mode";
//"当前模式正在进行中，请结束后再切换模式!" = "The current mode is in progress. Please end it before switching modes!";
//"请操作左脸" = "Please operate the left side of the face";
//"请连接上设备后重试" = "Please connect the device and try again";
//"请结束当前方案后再切换" = "Please end the current plan before switching";
//"请暂停后再开始消毒" = "Please pause before starting disinfection";
//"即将结束本次服务，结束后可重新选择护理方案" = "The current service is about to end. After it ends, you can choose a care plan again";
//"断开连接" = "Disconnect";
//"手柄未连接" = "Handle not connected";
//"方案正在进行中，是否确定退出？" = "The plan is in progress. Are you sure you want to exit?";
//"有新版本升级" = "New version available for upgrade";
//"正在准备升级..." = "Preparing for upgrade...";
//"调节变频时间 | 5ms" = "Adjusting frequency time | 5ms";
//"调节变频时间 | 7ms" = "Adjusting frequency time | 7ms";
//"调节变频时间" = "Adjusting frequency time";
//"3M 档位" = "3M level";
//"3M 强度(W/cm²)" = "3M intensity (W/cm²)";
//"10M 档位" = "10M level";
//"10M 强度(W/cm²)" = "10M intensity (W/cm²)";
//"设备离线" = "Device offline";
//"选择护理方案" = "Select care plan";
//"眼纹" = "Eye wrinkles";
//"深纹" = "Deep wrinkles";
//"提升" = "Lifting";
//"面部紧致" = "Facial tightening";
//"皮肤焕新" = "Skin renewal";
//"敏感性皮肤焕新" = "Sensitive skin renewal";
//"抗衰" = "Anti-aging";
//"辅助面部吸收" = "Assist facial absorption";
//"粉刺痤疮" = "Acne and pimples";
//"丘疹脓疱性痤疮" = "Papules and pustules";
//"明眸淡纹" = "Brighten eyes and diminish fine lines";
//"抚平舒纹" = "Smooth and soothe wrinkles";
//"童颜提拉" = "Youthful lift";
//"轮廓紧致" = "Contouring and firming";
//"美肌焕新" = "Beautiful skin renewal";
//"舒敏焕新" = "Soothing skin renewal";
//"嫩颜促吸" = "Tender complexion absorption";
//"平痘护肤" = "Acne-care skincare";
//"平痘抑菌" = "Acne inhibition";
//"个人中心" = "Personal Center";
//"设备设置" = "Device Settings";
//"使用时长：00:14:00" = "Usage duration: 00:14:00";
//"LDM(家居版)" = "LDM (Home Edition)";
//"Dr强效向控旋磁仪" = "Dr. Strong Rotating Magnetic Instrument";
//"高光水滴仪" = "Highlight Droplet Instrument";
//"添加设备" = "Add Device";
//"Dr.水滴高光仪" = "Dr. Droplet Highlighter";
//"Dr.Hi飞秀" = "Dr. Hi Feixiu";
//"D3果冻仪器" = "D3 Jelly Instrument";
//"去连接" = "Go to Connect";
//"水滴高光仪" = "Droplet Highlight Instrument";
//"帮助与反馈" = "Help and Feedback";
//"关于" = "About";
//"退出登录" = "Log Out";
//"暂未开放此功能，敬请期待!" = "This function is not yet available. Please stay tuned!";
//"是否确定退出登录？" = "Are you sure you want to log out?";
//"个人资料" = "Profile";
//"昵称" = "Nickname";
//"年龄" = "Age";
//"性别" = "Gender";
//"男" = "Male";
//"女" = "Female";
//"注销账户并清除用户数据" = "Log out and clear user data";
//"是否确定注销账户并清除用户数据？" = "Are you sure you want to log out and clear user data?";
//"修改密码" = "Change Password";
//"修改年龄" = "Change Age";
//"选择性别" = "Select Gender";
//"男生" = "Male";
//"女生" = "Female";
//"修改昵称" = "Change Nickname";
//"请输入昵称" = "Please enter a nickname";
//"网络请求失败" = "Network request failed";
//"发送验证码" = "Send Verification Code";
//"登录成功！" = "Login Successful!";
//"完善资料" = "Complete Information";
//"出生日期" = "Date of Birth";
//"请输入邮箱号码" = "Please enter email address";
//"已阅读并同意" = "I have read and agree to the";
//"《用户使用协议》" = "User Agreement";
//"请输入手机号码" = "Please enter phone number";
//"验证码" = "Verification Code";
//"获取验证码" = "Get Verification Code";
//"请阅读并同意用户使用协议" = "Please read and agree to the user agreement";
//"请输入正确格式的手机号码" = "Please enter a correct format phone number";
//"请设置昵称" = "Please set a nickname";
//"下一步" = "Next";
//"图片中未识别到二维码" = "QR code not detected in the image";
//"返回" = "Back";
//"重试" = "Retry";
//"正在验证，请稍后…" = "Verifying, please wait...";
//"验证成功！" = "Verification Successful!";
//"请到手机系统的\n【设置】->【隐私】->【照片】->【%@】开启照片的访问权限" = "Please go to the phone's\n【Settings】->【Privacy】->【Photos】->【%@】and enable access to photos";
//"照片读取权限未开启" = "Photo access permission not enabled";
//"请到手机系统的\n【设置】->【隐私】->【相机】->【%@】开启相机的访问权限" = "Please go to the phone's\n【Settings】->【Privacy】->【Camera】->【%@】and enable access to the camera";
//"相机权限未开启" = "Camera access permission not enabled";
//"只支持iOS8.0以上系统！" = "Only supports iOS8.0 and above systems!";
//"选择设备型号" = "Select Device Model";
//"查看排行" = "View Rankings";
//"设置" = "Settings";
//"设备类型" = "Device Type";
//"设置手柄频率" = "Set Handle Frequency";
//"设备消毒程序" = "Device Disinfection Program";
//"应用程序版本" = "App Version";
//"固件版本" = "Firmware Version";
//"自动播放视频" = "Auto-play Videos";
//"设备id" = "Device ID";
//"输入密码" = "Enter Password";
//"修改" = "Modify";
//"密码错误" = "Incorrect Password";
//"请完善手柄频率设置" = "Please complete the handle frequency settings";
//"请输入手柄标签上的初始频率" = "Please enter the initial frequency on the handle label";
//"暂不设置" = "Not Set for Now";
//"请输入手柄频率" = "Please enter the handle frequency";
//"请输入3M手柄上的频率" = "Please enter the frequency on the 3M handle";
//"请输入10M手柄上的频率" = "Please enter the frequency on the 10M handle";
//"修改设备名称" = "Modify Device Name";
//"选择操作模式" = "Select Operation Mode";
"版本更新" = "版本更新";
"检测到新版本(%@)，请及时更新" = "檢測到新版本(%@)，請及時更新";
"更新" = "更新";
"取消" = "取消";
"仪器未连接" = "儀器未連接";
"请扫描[精华液瓶]二维码" = "請掃描[精華液瓶]二維碼";
"请扫描[耗材]二维码" = "請掃描[耗材]二維碼";
"查询管控状态失败。" = "查詢管控狀態失敗。";
"正在验证，请稍后…" = "正在驗證，請稍後…";
"验证成功！" = "驗證成功！";
"本次理疗未结束，是否退出？" = "本次理療未結束，是否退出？";
"确定" = "確定";
"知道了" = "知道了";
"提示" = "提示";
"验证" = "驗證";
"工号不能为空!" = "工號不能為空!";
"订单号不能为空!" = "訂單號不能為空!";
"产品号不能为空!" = "產品號不能為空!";
"完成" = "完成";
"请到手机系统的\n【设置】->【隐私】->【定位服务】->【%@】->【使用应用期间】或者【始终】开启定位服务的访问权限" = "請到手機系統的\n【設置】->【隱私】->【定位服務】->【%@】->【使用應用期間】或者【始終】開啟定位服務的訪問權限";
"网络请求失败" = "網路請求失敗";
"登录已过期或失效，请重新登录！" = "登錄已過期或失效，請重新登錄！";
"手机未开启蓝牙，请开启蓝牙重试！" = "手機未開啟藍牙，請開啟藍牙重試！";
"连接成功" = "連接成功";
"断开连接" = "斷開連接";
"方案正在进行中，是否确定退出？" = "方案正在進行中，是否確定退出？";
"已达极限值60W" = "已達極限值60W";
"下额线" = "下額線";
"法令纹" = "法令紋";
"苹果肌" = "蘋果肌";
"眼部" = "眼部";
"额头" = "額頭";
"下额线\n 5mins" = "下額線\n 5分鐘";
"法令纹\n5mins" = "法令紋\n5分鐘";
"苹果肌\n5mins" = "蘋果肌\n5分鐘";
"眼部\n5mins" = "眼部\n5分鐘";
"额头\n5mins" = "額頭\n5分鐘";
"手机未开启蓝牙，请开启蓝牙重试！" = "手機未開啟藍牙，請開啟藍牙重試！";
"连接成功" = "連接成功";
"断开连接" = "斷開連接";
"温度过高" = "溫度過高";
"最佳温度" = "最佳溫度";
"建议本次操作结束后进行设备保养，如因长期未保养导致管道堵塞，造成售后维修属于人为损坏，需自行承担费用" = "建議本次操作結束後進行設備保養，如因長期未保養導致管道堵塞，造成售後維修屬於人為損壞，需自行承擔費用";
"我知道了" = "我知道了";
"正在升级固件" = "正在升級固件";
"已完成" = "已完成";
"请勿断开蓝牙" = "請勿斷開藍牙";
"结束" = "結束";
"请确认精华液已用完" = "請確認精華液已用完";
"护理未开始" = "護理未開始";
"手机未开启蓝牙，请开启蓝牙重试！" = "手機未開啟藍牙，請開啟藍牙重試！";
"请扫描耗材二维码" = "請掃描耗材二維碼";
"更新完成" = "更新完成";
"清洁中..." = "清潔中...";
"请验证耗材有效性" = "請驗證耗材有效性";
"设备清洁已完成，请开始护理洁面" = "設備清潔已完成，請開始護理潔面";
"当前护理已完成，是否继续操作？" = "當前護理已完成，是否繼續操作？";
"护理已完成..." = "護理已完成...";
"有新版本升级" = "有新版本升級";
"正在准备升级..." = "正在準備升級...";
"操作指引" = "操作指引";
"取空瓶灌装 30℃左右的温水，安装在精华液瓶的位置，并安装好废水瓶" = "取空瓶灌裝 30℃左右的溫水，安裝在精華液瓶的位置，並安裝好廢水瓶";
"在手柄上把流量调节到最大，点击“▶”进行保养" = "在手柄上把流量調節到最大，點擊“▶”進行保養";
"清洁件用透明盖子或手指堵住探头，间隔一段时间松开" = "清潔件用透明蓋子或手指堵住探頭，間隔一段時間鬆開";
"50秒后结束保养，请卸下瓶子" = "50秒後結束保養，請卸下瓶子";
"最后，请记得清洗废水瓶" = "最後，請記得清洗廢水瓶";
"45秒后结束保养，请卸下瓶子" = "45秒後結束保養，請卸下瓶子";
"保养已完成，点击确定按钮退出" = "保養已完成，點擊確定按鈕退出";
"建议本次使用结束后进行设备保养" = "建議本次使用結束後進行設備保養";
"① 清洁设备" = "① 清潔設備";
"② 面部护理" = "② 面部護理";
"UV灯" = "UV燈";
"全脸清洁" = "全臉清潔";
"清洁设备不可调节负压、流速" = "清潔設備不可調節負壓、流速";
"负压调节" = "負壓調節";
"精华液流速" = "精華液流速";
"流速以拔起探头不会滴水为佳" = "流速以拔起探頭不會滴水為佳";
"清洁设备不可调节负压、流速" = "清潔設備不可調節負壓、流速";
"自定义模式" = "自訂模式";
"智能模式" = "智能模式";
"当前模式正在进行中，请结束后再切换模式!" = "當前模式正在進行中，請結束後再切換模式！";
"请操作左脸" = "請操作左臉";
"请连接上设备后重试" = "請連接上設備後重試";
"请结束当前方案后再切换" = "請結束當前方案後再切換";
"请暂停后再开始消毒" = "請暫停後再開始消毒";
"即将结束本次服务，结束后可重新选择护理方案" = "即將結束本次服務，結束後可重新選擇護理方案";
"断开连接" = "斷開連接";
"手柄未连接" = "手柄未連接";
"方案正在进行中，是否确定退出？" = "方案正在進行中，是否確定退出？";
"有新版本升级" = "有新版本升級";
"正在准备升级..." = "正在準備升級...";
"调节变频时间 | 5ms" = "調節變頻時間 | 5毫秒";
"调节变频时间 | 7ms" = "調節變頻時間 | 7毫秒";
"调节变频时间" = "調節變頻時間";
"3M 档位" = "3M 檔位";
"3M 强度(W/cm²)" = "3M 強度(W/cm²)";
"10M 档位" = "10M 檔位";
"10M 强度(W/cm²)" = "10M 強度(W/cm²)";
"设备离线" = "設備離線";
"选择护理方案" = "選擇護理方案";
"眼纹" = "眼紋";
"深纹" = "深紋";
"提升" = "提升";
"面部紧致" = "面部緊緻";
"皮肤焕新" = "皮膚焕新";
"敏感性皮肤焕新" = "敏感性皮膚焕新";
"抗衰" = "抗衰";
"辅助面部吸收" = "輔助面部吸收";
"粉刺痤疮" = "粉刺痤疮";
"丘疹脓疱性痤疮" = "丘疹脓疱性痤疮";
"明眸淡纹" = "明眸淡紋";
"抚平舒纹" = "撫平舒紋";
"童颜提拉" = "童顏提拉";
"轮廓紧致" = "輪廓緊緻";
"美肌焕新" = "美肌焕新";
"舒敏焕新" = "舒敏焕新";
"嫩颜促吸" = "嫩顏促吸";
"平痘护肤" = "平痘護膚";
"平痘抑菌" = "平痘抑菌";
"个人中心" = "個人中心";
"设备设置" = "設備設置";
"使用时长：00:14:00" = "使用時長：00:14:00";
"LDM(家居版)" = "LDM(家居版)";
"Dr强效向控旋磁仪" = "Dr強效向控旋磁儀";
"高光水滴仪" = "高光水滴儀";
"添加设备" = "添加設備";
"Dr.水滴高光仪" = "Dr.水滴高光儀";
"Dr.Hi飞秀" = "Dr.Hi飛秀";
"D3果冻仪器" = "D3果凍儀器";
"去连接" = "去連接";
"水滴高光仪" = "水滴高光儀";
"帮助与反馈" = "幫助與反饋";
"关于" = "關於";
"退出登录" = "退出登錄";
"暂未开放此功能，敬请期待!" = "暫未開放此功能，敬請期待！";
"是否确定退出登录？" = "是否確定退出登錄？";
"个人资料" = "個人資料";
"昵称" = "暱稱";
"年龄" = "年齡";
"性别" = "性別";
"男" = "男";
"女" = "女";
"注销账户并清除用户数据" = "注銷賬戶並清除用戶數據";
"是否确定注销账户并清除用户数据？" = "是否確定注銷賬戶並清除用戶數據？";
"修改密码" = "修改密碼";
"修改年龄" = "修改年齡";
"选择性别" = "選擇性別";
"男生" = "男生";
"女生" = "女生";
"修改昵称" = "修改暱稱";
"请输入昵称" = "請輸入暱稱";
"网络请求失败" = "網絡請求失敗";
"发送验证码" = "發送驗證碼";
"登录成功！" = "登錄成功！";
"完善资料" = "完善資料";
"出生日期" = "出生日期";
"请输入邮箱号码" = "請輸入郵箱號碼";
"已阅读并同意" = "已閱讀並同意";
"《用户使用协议》" = "《用戶使用協議》";
"请输入手机号码" = "請輸入手機號碼";
"验证码" = "驗證碼";
"获取验证码" = "獲取驗證碼";
"请阅读并同意用户使用协议" = "請閱讀並同意用戶使用協議";
"请输入正确格式的手机号码" = "請輸入正確格式的手機號碼";
"请设置昵称" = "請設置暱稱";
"下一步" = "下一步";
"图片中未识别到二维码" = "圖片中未識別到二維碼";
"返回" = "返回";
"重试" = "重試";
"正在验证，请稍后…" = "正在驗證，請稍後…";
"验证成功！" = "驗證成功！";
"请到手机系统的\n【设置】->【隐私】->【照片】->【%@】开启照片的访问权限" = "請到手機系統的\n【設置】->【隱私】->【照片】->【%@】開啟照片的訪問權限";
"照片读取权限未开启" = "照片讀取權限未開啟";
"请到手机系统的\n【设置】->【隐私】->【相机】->【%@】开启相机的访问权限" = "請到手機系統的\n【設置】->【隱私】->【相機】->【%@】開啟相機的訪問權限";
"相机权限未开启" = "相機權限未開啟";
"只支持iOS8.0以上系统！" = "只支持iOS8.0以上系統！";
"选择设备型号" = "選擇設備型號";
"查看排行" = "查看排行";
"设置" = "設置";
"设备类型" = "設備類型";
"设置手柄频率" = "設置手柄頻率";
"设备消毒程序" = "設備消毒程序";
"应用程序版本" = "應用程序版本";
"固件版本" = "固件版本";
"自动播放视频" = "自動播放視頻";
"设备id" = "設備id";
"输入密码" = "輸入密碼";
"修改" = "修改";
"密码错误" = "密碼錯誤";
"请完善手柄频率设置" = "請完善手柄頻率設置";
"请输入手柄标签上的初始频率" = "請輸入手柄標簽上的初始頻率";
"暂不设置" = "暫不設置";
"请输入手柄频率" = "請輸入手柄頻率";
"请输入3M手柄上的频率" = "請輸入3M手柄上的頻率";
"请输入10M手柄上的频率" = "請輸入10M手柄上的頻率";
"修改设备名称" = "修改設備名稱";
"选择操作模式" = "選擇操作模式";
DJMHomeTY/Global/Text/zh-Hant.lproj/Localizable.strings
"版本更新" = "版本更新";
"检测到新版本(%@)，请及时更新" = "檢測到新版本(%@)，請及時更新";
"更新" = "更新";
"取消" = "取消";
"仪器未连接" = "儀器未連接";
"请扫描[精华液瓶]二维码" = "請掃描[精華液瓶]二維碼";
"请扫描[耗材]二维码" = "請掃描[耗材]二維碼";
"查询管控状态失败。" = "查詢管控狀態失敗。";
"正在验证，请稍后…" = "正在驗證，請稍後…";
"验证成功！" = "驗證成功！";
"本次理疗未结束，是否退出？" = "本次理療未結束，是否退出？";
"确定" = "確定";
"知道了" = "知道了";
"提示" = "提示";
"验证" = "驗證";
"工号不能为空!" = "工號不能為空!";
"订单号不能为空!" = "訂單號不能為空!";
"产品号不能为空!" = "產品號不能為空!";
"完成" = "完成";
"请到手机系统的\n【设置】->【隐私】->【定位服务】->【%@】->【使用应用期间】或者【始终】开启定位服务的访问权限" = "請到手機系統的\n【設置】->【隱私】->【定位服務】->【%@】->【使用應用期間】或者【始終】開啟定位服務的訪問權限";
"网络请求失败" = "網路請求失敗";
"登录已过期或失效，请重新登录！" = "登錄已過期或失效，請重新登錄！";
"手机未开启蓝牙，请开启蓝牙重试！" = "手機未開啟藍牙，請開啟藍牙重試！";
"连接成功" = "連接成功";
"断开连接" = "斷開連接";
"方案正在进行中，是否确定退出？" = "方案正在進行中，是否確定退出？";
"已达极限值60W" = "已達極限值60W";
"下额线" = "下額線";
"法令纹" = "法令紋";
"苹果肌" = "蘋果肌";
"眼部" = "眼部";
"额头" = "額頭";
"下额线\n 5mins" = "下額線\n 5分鐘";
"法令纹\n5mins" = "法令紋\n5分鐘";
"苹果肌\n5mins" = "蘋果肌\n5分鐘";
"眼部\n5mins" = "眼部\n5分鐘";
"额头\n5mins" = "額頭\n5分鐘";
"手机未开启蓝牙，请开启蓝牙重试！" = "手機未開啟藍牙，請開啟藍牙重試！";
"连接成功" = "連接成功";
"断开连接" = "斷開連接";
"温度过高" = "溫度過高";
"最佳温度" = "最佳溫度";
"建议本次操作结束后进行设备保养，如因长期未保养导致管道堵塞，造成售后维修属于人为损坏，需自行承担费用" = "建議本次操作結束後進行設備保養，如因長期未保養導致管道堵塞，造成售後維修屬於人為損壞，需自行承擔費用";
"我知道了" = "我知道了";
"正在升级固件" = "正在升級固件";
"已完成" = "已完成";
"请勿断开蓝牙" = "請勿斷開藍牙";
"结束" = "結束";
"请确认精华液已用完" = "請確認精華液已用完";
"护理未开始" = "護理未開始";
"手机未开启蓝牙，请开启蓝牙重试！" = "手機未開啟藍牙，請開啟藍牙重試！";
"请扫描耗材二维码" = "請掃描耗材二維碼";
"更新完成" = "更新完成";
"清洁中..." = "清潔中...";
"请验证耗材有效性" = "請驗證耗材有效性";
"设备清洁已完成，请开始护理洁面" = "設備清潔已完成，請開始護理潔面";
"当前护理已完成，是否继续操作？" = "當前護理已完成，是否繼續操作？";
"护理已完成..." = "護理已完成...";
"有新版本升级" = "有新版本升級";
"正在准备升级..." = "正在準備升級...";
"操作指引" = "操作指引";
"取空瓶灌装 30℃左右的温水，安装在精华液瓶的位置，并安装好废水瓶" = "取空瓶灌裝 30℃左右的溫水，安裝在精華液瓶的位置，並安裝好廢水瓶";
"在手柄上把流量调节到最大，点击“▶”进行保养" = "在手柄上把流量調節到最大，點擊“▶”進行保養";
"清洁件用透明盖子或手指堵住探头，间隔一段时间松开" = "清潔件用透明蓋子或手指堵住探頭，間隔一段時間鬆開";
"50秒后结束保养，请卸下瓶子" = "50秒後結束保養，請卸下瓶子";
"最后，请记得清洗废水瓶" = "最後，請記得清洗廢水瓶";
"45秒后结束保养，请卸下瓶子" = "45秒後結束保養，請卸下瓶子";
"保养已完成，点击确定按钮退出" = "保養已完成，點擊確定按鈕退出";
"建议本次使用结束后进行设备保养" = "建議本次使用結束後進行設備保養";
"① 清洁设备" = "① 清潔設備";
"② 面部护理" = "② 面部護理";
"UV灯" = "UV燈";
"全脸清洁" = "全臉清潔";
"清洁设备不可调节负压、流速" = "清潔設備不可調節負壓、流速";
"负压调节" = "負壓調節";
"精华液流速" = "精華液流速";
"流速以拔起探头不会滴水为佳" = "流速以拔起探頭不會滴水為佳";
"清洁设备不可调节负压、流速" = "清潔設備不可調節負壓、流速";
"自定义模式" = "自訂模式";
"智能模式" = "智能模式";
"当前模式正在进行中，请结束后再切换模式!" = "當前模式正在進行中，請結束後再切換模式！";
"请操作左脸" = "請操作左臉";
"请连接上设备后重试" = "請連接上設備後重試";
"请结束当前方案后再切换" = "請結束當前方案後再切換";
"请暂停后再开始消毒" = "請暫停後再開始消毒";
"即将结束本次服务，结束后可重新选择护理方案" = "即將結束本次服務，結束後可重新選擇護理方案";
"断开连接" = "斷開連接";
"手柄未连接" = "手柄未連接";
"方案正在进行中，是否确定退出？" = "方案正在進行中，是否確定退出？";
"有新版本升级" = "有新版本升級";
"正在准备升级..." = "正在準備升級...";
"调节变频时间 | 5ms" = "調節變頻時間 | 5毫秒";
"调节变频时间 | 7ms" = "調節變頻時間 | 7毫秒";
"调节变频时间" = "調節變頻時間";
"3M 档位" = "3M 檔位";
"3M 强度(W/cm²)" = "3M 強度(W/cm²)";
"10M 档位" = "10M 檔位";
"10M 强度(W/cm²)" = "10M 強度(W/cm²)";
"设备离线" = "設備離線";
"选择护理方案" = "選擇護理方案";
"眼纹" = "眼紋";
"深纹" = "深紋";
"提升" = "提升";
"面部紧致" = "面部緊緻";
"皮肤焕新" = "皮膚焕新";
"敏感性皮肤焕新" = "敏感性皮膚焕新";
"抗衰" = "抗衰";
"辅助面部吸收" = "輔助面部吸收";
"粉刺痤疮" = "粉刺痤疮";
"丘疹脓疱性痤疮" = "丘疹脓疱性痤疮";
"明眸淡纹" = "明眸淡紋";
"抚平舒纹" = "撫平舒紋";
"童颜提拉" = "童顏提拉";
"轮廓紧致" = "輪廓緊緻";
"美肌焕新" = "美肌焕新";
"舒敏焕新" = "舒敏焕新";
"嫩颜促吸" = "嫩顏促吸";
"平痘护肤" = "平痘護膚";
"平痘抑菌" = "平痘抑菌";
"个人中心" = "個人中心";
"设备设置" = "設備設置";
"使用时长：00:14:00" = "使用時長：00:14:00";
"LDM(家居版)" = "LDM(家居版)";
"Dr强效向控旋磁仪" = "Dr強效向控旋磁儀";
"高光水滴仪" = "高光水滴儀";
"添加设备" = "添加設備";
"Dr.水滴高光仪" = "Dr.水滴高光儀";
"Dr.Hi飞秀" = "Dr.Hi飛秀";
"D3果冻仪器" = "D3果凍儀器";
"去连接" = "去連接";
"水滴高光仪" = "水滴高光儀";
"帮助与反馈" = "幫助與反饋";
"关于" = "關於";
"退出登录" = "退出登錄";
"暂未开放此功能，敬请期待!" = "暫未開放此功能，敬請期待！";
"是否确定退出登录？" = "是否確定退出登錄？";
"个人资料" = "個人資料";
"昵称" = "暱稱";
"年龄" = "年齡";
"性别" = "性別";
"男" = "男";
"女" = "女";
"注销账户并清除用户数据" = "注銷賬戶並清除用戶數據";
"是否确定注销账户并清除用户数据？" = "是否確定注銷賬戶並清除用戶數據？";
"修改密码" = "修改密碼";
"修改年龄" = "修改年齡";
"选择性别" = "選擇性別";
"男生" = "男生";
"女生" = "女生";
"修改昵称" = "修改暱稱";
"请输入昵称" = "請輸入暱稱";
"网络请求失败" = "網絡請求失敗";
"发送验证码" = "發送驗證碼";
"登录成功！" = "登錄成功！";
"完善资料" = "完善資料";
"出生日期" = "出生日期";
"请输入邮箱号码" = "請輸入郵箱號碼";
"已阅读并同意" = "已閱讀並同意";
"《用户使用协议》" = "《用戶使用協議》";
"请输入手机号码" = "請輸入手機號碼";
"验证码" = "驗證碼";
"获取验证码" = "獲取驗證碼";
"请阅读并同意用户使用协议" = "請閱讀並同意用戶使用協議";
"请输入正确格式的手机号码" = "請輸入正確格式的手機號碼";
"请设置昵称" = "請設置暱稱";
"下一步" = "下一步";
"图片中未识别到二维码" = "圖片中未識別到二維碼";
"返回" = "返回";
"重试" = "重試";
"正在验证，请稍后…" = "正在驗證，請稍後…";
"验证成功！" = "驗證成功！";
"请到手机系统的\n【设置】->【隐私】->【照片】->【%@】开启照片的访问权限" = "請到手機系統的\n【設置】->【隱私】->【照片】->【%@】開啟照片的訪問權限";
"照片读取权限未开启" = "照片讀取權限未開啟";
"请到手机系统的\n【设置】->【隐私】->【相机】->【%@】开启相机的访问权限" = "請到手機系統的\n【設置】->【隱私】->【相機】->【%@】開啟相機的訪問權限";
"相机权限未开启" = "相機權限未開啟";
"只支持iOS8.0以上系统！" = "只支持iOS8.0以上系統！";
"选择设备型号" = "選擇設備型號";
"查看排行" = "查看排行";
"设置" = "設置";
"设备类型" = "設備類型";
"设置手柄频率" = "設置手柄頻率";
"设备消毒程序" = "設備消毒程序";
"应用程序版本" = "應用程序版本";
"固件版本" = "固件版本";
"自动播放视频" = "自動播放視頻";
"设备id" = "設備id";
"输入密码" = "輸入密碼";
"修改" = "修改";
"密码错误" = "密碼錯誤";
"请完善手柄频率设置" = "請完善手柄頻率設置";
"请输入手柄标签上的初始频率" = "請輸入手柄標簽上的初始頻率";
"暂不设置" = "暫不設置";
"请输入手柄频率" = "請輸入手柄頻率";
"请输入3M手柄上的频率" = "請輸入3M手柄上的頻率";
"请输入10M手柄上的频率" = "請輸入10M手柄上的頻率";
"修改设备名称" = "修改設備名稱";
"选择操作模式" = "選擇操作模式";
"手机蓝牙未开启" = "手機藍牙未開啟";
"请前往设置开启手机蓝牙" = "請前往設置開啟手機藍牙";
"设置" = "設置";
"APP蓝牙未授权" = "APP藍牙未授權";
"请前往设置授权APP蓝牙权限" = "請前往設置授權APP藍牙權限";
DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m
...@@ -324,6 +324,7 @@ ...@@ -324,6 +324,7 @@
[weakSelf.myView controlWithItem:weakSelf.myView.hlBtn]; [weakSelf.myView controlWithItem:weakSelf.myView.hlBtn];
} }
} fail:^(id failMessage) { } fail:^(id failMessage) {
......
DJMHomeTY/Page/DeviceListPage/Controller/DXDeviceListVC.m
...@@ -64,7 +64,12 @@ static NSString *dxmachineCell = @"DXDeviceListCell"; ...@@ -64,7 +64,12 @@ static NSString *dxmachineCell = @"DXDeviceListCell";
self.navigationController.navigationBar.shadowImage=[UIImage new]; self.navigationController.navigationBar.shadowImage=[UIImage new];
UIImageView *img = [UIImageView myUIImageViewSuperView:self.navigationController.navigationBar withImageName:(TargetType==4?@"DR_DeviceListTopImage":@"Main_Logo")]; UIImageView *img = [UIImageView myUIImageViewSuperView:self.navigationController.navigationBar withImageName:(TargetType==4?@"DR_DeviceListTopImage":@"Main_Logo")];
if(TargetType == 5){ if(TargetType == 5){
img.image = [UIImage imageNamed:@"drmianling_Logo"]; if ([XHDataManager sharedManager].simparlanguage == 0) {
img.image = [UIImage imageNamed:@"drmianling_Logo"];
}else{
img.image = [UIImage imageNamed:@"drmianling_Logo1"];
}
} }
[img mas_makeConstraints:^(MASConstraintMaker *make) { [img mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.centerY.mas_equalTo(self.navigationController.navigationBar); make.centerX.centerY.mas_equalTo(self.navigationController.navigationBar);
...@@ -80,7 +85,10 @@ static NSString *dxmachineCell = @"DXDeviceListCell"; ...@@ -80,7 +85,10 @@ static NSString *dxmachineCell = @"DXDeviceListCell";
break; break;
case 5: case 5:
[self initDataDr02]; [self initDataDr02];
[self requestBannerList]; if ([XHDataManager sharedManager].simparlanguage == 0) {
[self requestBannerList];
}
[self updateApp]; [self updateApp];
break; break;
default: default:
......
DJMHomeTY/Page/LoginPage/Controller/XHMSCodeLoginVC.m
...@@ -100,13 +100,28 @@ ...@@ -100,13 +100,28 @@
} }
#pragma mark - 使用协议 #pragma mark - 使用协议
-(void)agreementBtnAction{ -(void)agreementBtnAction{
NSArray *htmlArr = @[@"https://djm.imoreme.com/static/html/djm_tyldm_agreement_magnifier.html",
@"https://djm.imoreme.com/static/html/djm_djmps2_agreement_magnifier.html", NSArray *htmlArr;
@"https://djm.imoreme.com/static/html/djm_djmhome_agreement_magnifier.html",
@"https://djm.imoreme.com/static/html/djm_drfacialage_agreement_magnifier.html", if (XHGetDataManager.simparlanguage == 0) {
@"https://djm.imoreme.com/static/html/djm_drwater_agreement_magnifier.html", htmlArr = @[@"https://djm.imoreme.com/static/html/djm_tyldm_agreement_magnifier.html",
@"https://djm.imoreme.com/static/html/djm_seyoap_agreement_magnifier.html", @"https://djm.imoreme.com/static/html/djm_djmps2_agreement_magnifier.html",
@"https://djm.imoreme.com/static/html/djm_djmbangyan_agreement_magnifier.html"]; @"https://djm.imoreme.com/static/html/djm_djmhome_agreement_magnifier.html",
@"https://djm.imoreme.com/static/html/djm_drfacialage_agreement_magnifier.html",
@"https://djm.imoreme.com/static/html/djm_drwater_agreement_magnifier.html",
@"https://djm.imoreme.com/static/html/djm_seyoap_agreement_magnifier.html",
@"https://djm.imoreme.com/static/html/djm_djmbangyan_agreement_magnifier.html"];
}else{
htmlArr = @[@"https://djm.imoreme.com/static/html/djm_tyldm_agreement_magnifier.html",
@"https://djm.imoreme.com/static/html/djm_djmps2_agreement_magnifier.html",
@"https://djm.imoreme.com/static/html/djm_djmhome_agreement_magnifier.html",
@"https://djm.imoreme.com/static/html/djm_drfacialage_agreement_magnifier.html",
@"https://djm.imoreme.com/static/html/djm_drwater_agreement_magnifier_002.html",
@"https://djm.imoreme.com/static/html/djm_seyoap_agreement_magnifier.html",
@"https://djm.imoreme.com/static/html/djm_djmbangyan_agreement_magnifier.html"];
}
XHAgreementVC *vc = [[XHAgreementVC alloc]init]; XHAgreementVC *vc = [[XHAgreementVC alloc]init];
vc.modalPresentationStyle = UIModalPresentationOverFullScreen; vc.modalPresentationStyle = UIModalPresentationOverFullScreen;
vc.htmlStr = htmlArr[TargetType-1]; vc.htmlStr = htmlArr[TargetType-1];
......
DJMHomeTY/Page/LoginPage/Controller/XHRegistFirstVC.m
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
[self.view endEditing:true]; [self.view endEditing:true];
NSDictionary *dic; NSDictionary *dic;
NSLog(@"XHGetDataManager.languageName1:%d",XHGetDataManager.simparlanguage);//中文 NSLog(@"XHGetDataManager.languageName1:%d",XHGetDataManager.simparlanguage);//中文
if((XHGetDataManager.simparlanguage==1)&&(TargetType==6)){ if((XHGetDataManager.simparlanguage==1 ||XHGetDataManager.simparlanguage==2 )&&(TargetType==5)){
dic = @{@"email":self.dic[@"email"],@"nickName":str}; dic = @{@"email":self.dic[@"email"],@"nickName":str};
}else{//简体中文 c }else{//简体中文 c
dic = @{@"phone":self.dic[@"phone"],@"code":self.dic[@"code"],@"nickName":str}; dic = @{@"phone":self.dic[@"phone"],@"code":self.dic[@"code"],@"nickName":str};
......
DJMHomeTY/Page/LoginPage/Controller/XHRegistSecondVC.m
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
- (void)SureBtnAction:(NSString *)str{ - (void)SureBtnAction:(NSString *)str{
NSDictionary *dic; NSDictionary *dic;
NSLog(@"XHGetDataManager.languageName2:%d",XHGetDataManager.simparlanguage);//中文 NSLog(@"XHGetDataManager.languageName2:%d",XHGetDataManager.simparlanguage);//中文
if((XHGetDataManager.simparlanguage==1)&&(TargetType==6)){ if((XHGetDataManager.simparlanguage==1 ||XHGetDataManager.simparlanguage==2 )&&(TargetType==5)){
dic = @{@"email":self.myDic[@"email"],@"nickName":self.myDic[@"nickName"],@"sex":str}; dic = @{@"email":self.myDic[@"email"],@"nickName":self.myDic[@"nickName"],@"sex":str};
}else{//简体中文 }else{//简体中文
dic = @{@"phone":self.myDic[@"phone"],@"code":self.myDic[@"code"],@"nickName":self.myDic[@"nickName"],@"sex":str}; dic = @{@"phone":self.myDic[@"phone"],@"code":self.myDic[@"code"],@"nickName":self.myDic[@"nickName"],@"sex":str};
......
DJMHomeTY/Page/LoginPage/Controller/XHRegistThirdVC.m
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
NSDictionary *dic; NSDictionary *dic;
[SVProgressHUD show]; [SVProgressHUD show];
NSLog(@"XHGetDataManager.languageName3:%d",XHGetDataManager.simparlanguage);//中文 NSLog(@"XHGetDataManager.languageName3:%d",XHGetDataManager.simparlanguage);//中文
if((XHGetDataManager.simparlanguage==1)&&(TargetType==6)){ if((XHGetDataManager.simparlanguage==1 ||XHGetDataManager.simparlanguage==2 )&&(TargetType==5)){
dic = @{@"email":self.myThirdDic[@"email"], dic = @{@"email":self.myThirdDic[@"email"],
@"nickName":self.myThirdDic[@"nickName"], @"nickName":self.myThirdDic[@"nickName"],
@"sex":@([self.myThirdDic[@"sex"] integerValue]), @"sex":@([self.myThirdDic[@"sex"] integerValue]),
......
DJMHomeTY/Page/LoginPage/View/XHMSCodeLoginView.m
...@@ -40,11 +40,27 @@ ...@@ -40,11 +40,27 @@
make.top.mas_equalTo(self).offset(55.5*IPhone6ScaleHeight); make.top.mas_equalTo(self).offset(55.5*IPhone6ScaleHeight);
}]; }];
NSArray *appLanguages = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"]; NSArray *appLanguages = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"];
NSString *languageName = [appLanguages objectAtIndex:0]; // NSString *languageName = [appLanguages objectAtIndex:0];
XHGetDataManager.simparlanguage = ([languageName rangeOfString:@"zh-Hans"].location ==NSNotFound); // NSArray *languageArry = [NSLocale preferredLanguages];
// NSString *languageName = languageArry.firstObject;
NSString *languageName = [[[NSBundle mainBundle] preferredLocalizations] firstObject];
// XHGetDataManager.simparlanguage = ([languageName rangeOfString:@"zh-Hans"].location ==NSNotFound);
XHGetDataManager.languageName = languageName; XHGetDataManager.languageName = languageName;
if ([XHGetDataManager.languageName hasPrefix:@"zh"]) {
if ([XHGetDataManager.languageName rangeOfString:@"Hans"].location != NSNotFound) {
[XHDataManager sharedManager].simparlanguage = 0; // 简体中文
} else { // zh-Hant\zh-HK\zh-TW
[XHDataManager sharedManager].simparlanguage = 2; // 繁体
}
}else{
[XHDataManager sharedManager].simparlanguage = 2; // 英文
}
NSLog(@"XHGetDataManager.languageName:%d:%d:%@",XHGetDataManager.simparlanguage,([languageName rangeOfString:@"zh-Hans"].location ==NSNotFound),languageName);//中文 NSLog(@"XHGetDataManager.languageName:%d:%d:%@",XHGetDataManager.simparlanguage,([languageName rangeOfString:@"zh-Hans"].location ==NSNotFound),languageName);//中文
if((TargetType == 6)&&([languageName rangeOfString:@"zh-Hans"].location ==NSNotFound)){//非简体中文// /Hans-CN if((TargetType == 5)&&([languageName rangeOfString:@"zh-Hans"].location ==NSNotFound)){//非简体中文// /Hans-CN
UIImageView *emailImg = [UIImageView myUIImageViewSuperView:self withImageName:@"邮件_mail (1)"]; UIImageView *emailImg = [UIImageView myUIImageViewSuperView:self withImageName:@"邮件_mail (1)"];
[emailImg mas_makeConstraints:^(MASConstraintMaker *make) { [emailImg mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(HJPX(82)); make.left.mas_equalTo(HJPX(82));
...@@ -403,7 +419,7 @@ ...@@ -403,7 +419,7 @@
} }
#pragma mark - 登录 #pragma mark - 登录
-(void)loginBtnTouchUpInside{ -(void)loginBtnTouchUpInside{
if((TargetType == 6)&&([XHGetDataManager.languageName rangeOfString:@"Hans-CN"].location ==NSNotFound)){//非简体中文 if((TargetType == 5)&&([XHGetDataManager.languageName rangeOfString:@"zh-Hans"].location ==NSNotFound)){//非简体中文
if (![NSString isNull:self.emailTF.text] && self.agreeBtn.selected == YES ) { if (![NSString isNull:self.emailTF.text] && self.agreeBtn.selected == YES ) {
NSDictionary *dic=@{@"email":self.emailTF.text, NSDictionary *dic=@{@"email":self.emailTF.text,
@"appType":@(TargetType) @"appType":@(TargetType)
......
DJMHomeTY/Page/Scan/Controller/HJScanVC.m
...@@ -353,18 +353,18 @@ ...@@ -353,18 +353,18 @@
} }
-(void)verify{ -(void)verify{
if (![NSString isNull:XHGetDataManager.deviceID]) { if (![NSString isNull:XHGetDataManager.deviceID]) {
NSString *language; // NSString *language;
if ( [XHGetDataManager.languageName rangeOfString:@"zh-H"].location !=NSNotFound) { // if ( [XHGetDataManager.languageName rangeOfString:@"zh-H"].location !=NSNotFound) {
language = @"0"; // language = @"0";
}else{ // }else{
language = @"1"; // language = @"1";
} // }
NSDictionary *updateDic = @{@"employeeNumber":XHGetDataManager.employeeNum, NSDictionary *updateDic = @{@"employeeNumber":XHGetDataManager.employeeNum,
@"verification":self.order, @"verification":self.order,
@"consumableNumber":self.product, @"consumableNumber":self.product,
@"deviceid":XHGetDataManager.deviceID, @"deviceid":XHGetDataManager.deviceID,
@"language":language @"language":[NSString stringWithFormat:@"%d",XHGetDataManager.simparlanguage]
}; };
NSLog(@"%@",updateDic); NSLog(@"%@",updateDic);
HJSelfWeak; HJSelfWeak;
......
DJMHomeTY/Page/SetPage/View/XHResetDeviceNameView.m
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
withDelegate:self withDelegate:self
withFont:XHFontSize(15) withFont:XHFontSize(15)
withTextFieldColor:XHTextFieldTextColor withNSTextAlignment:NSTextAlignmentLeft withTextFieldColor:XHTextFieldTextColor withNSTextAlignment:NSTextAlignmentLeft
withPlaceholder:HJLocalizedString(@"请输入手设备名称") withPlaceholder:HJLocalizedString(@"请输入设备名称")
withPlaceholderColor:XHTextFieldTextPlaceholderColor withVerticalAlignment:UIControlContentVerticalAlignmentCenter]; withPlaceholderColor:XHTextFieldTextPlaceholderColor withVerticalAlignment:UIControlContentVerticalAlignmentCenter];
self.tf_Name.clearButtonMode = UITextFieldViewModeWhileEditing; self.tf_Name.clearButtonMode = UITextFieldViewModeWhileEditing;
// self.tf_Name.keyboardType = UIKeyboardTypeNumberPad; // self.tf_Name.keyboardType = UIKeyboardTypeNumberPad;
......
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