Skip to content

D
DrWater
Commit 465a7167 by 李威
Options

保养bug

parent 427bc54f
Showing with 21 additions and 29 deletions
DJMHomeTY.xcodeproj/project.pbxproj
...@@ -721,12 +721,8 @@ ...@@ -721,12 +721,8 @@
880A7BEA29B093BB00B5F4C4 /* XHSelectCommandModelView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XHSelectCommandModelView.m; sourceTree = "<group>"; }; 880A7BEA29B093BB00B5F4C4 /* XHSelectCommandModelView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XHSelectCommandModelView.m; sourceTree = "<group>"; };
880BFDA729A85D4B00B59CFA /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; }; 880BFDA729A85D4B00B59CFA /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
880BFDA929A85D4B00B59CFA /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; }; 880BFDA929A85D4B00B59CFA /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
880BFDAA29A85D4B00B59CFA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
880BFDAB29A85D4B00B59CFA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
880BFDAC29A85D4B00B59CFA /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = "<group>"; }; 880BFDAC29A85D4B00B59CFA /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = "<group>"; };
880BFDAD29A85D4B00B59CFA /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 880BFDAD29A85D4B00B59CFA /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/InfoPlist.strings; sourceTree = "<group>"; };
880BFDAE29A85D4B00B59CFA /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = "<group>"; };
880BFDAF29A85D4B00B59CFA /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
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>"; }; 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>"; }; 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>"; }; 881F90382A496D65000B86F6 /* XHBGRunManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHBGRunManager.h; sourceTree = "<group>"; };
...@@ -3051,9 +3047,7 @@ ...@@ -3051,9 +3047,7 @@
isa = PBXVariantGroup; isa = PBXVariantGroup;
children = ( children = (
880BFDA729A85D4B00B59CFA /* zh-Hans */, 880BFDA729A85D4B00B59CFA /* zh-Hans */,
880BFDAA29A85D4B00B59CFA /* en */,
880BFDAC29A85D4B00B59CFA /* Base */, 880BFDAC29A85D4B00B59CFA /* Base */,
880BFDAE29A85D4B00B59CFA /* zh-Hant */,
); );
name = Localizable.strings; name = Localizable.strings;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -3062,9 +3056,7 @@ ...@@ -3062,9 +3056,7 @@
isa = PBXVariantGroup; isa = PBXVariantGroup;
children = ( children = (
880BFDA929A85D4B00B59CFA /* zh-Hans */, 880BFDA929A85D4B00B59CFA /* zh-Hans */,
880BFDAB29A85D4B00B59CFA /* en */,
880BFDAD29A85D4B00B59CFA /* Base */, 880BFDAD29A85D4B00B59CFA /* Base */,
880BFDAF29A85D4B00B59CFA /* zh-Hant */,
); );
name = InfoPlist.strings; name = InfoPlist.strings;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -3179,7 +3171,7 @@ ...@@ -3179,7 +3171,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 = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 8Z4G7AGK6D; DEVELOPMENT_TEAM = 8Z4G7AGK6D;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch"; GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch";
...@@ -3205,7 +3197,7 @@ ...@@ -3205,7 +3197,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.2.3; MARKETING_VERSION = 1.2.4;
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";
...@@ -3225,7 +3217,7 @@ ...@@ -3225,7 +3217,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 = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 8Z4G7AGK6D; DEVELOPMENT_TEAM = 8Z4G7AGK6D;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch"; GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch";
...@@ -3251,7 +3243,7 @@ ...@@ -3251,7 +3243,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.2.3; MARKETING_VERSION = 1.2.4;
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/Global/Define/XHURL.h
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#ifndef XHURL_h #ifndef XHURL_h
#define XHURL_h #define XHURL_h
//#define DRURL @"https://testdjm.imoreme.com"//测试 #define DRURL @"https://testdjm.imoreme.com"//测试
#define DRURL @"https://djm.imoreme.com"//正式 //#define DRURL @"https://djm.imoreme.com"//正式
//#define URL @"http://192.168.1.168:8080"//luocong //#define URL @"http://192.168.1.168:8080"//luocong
//#define URL @"http://192.168.1.66:9012"//luocong //#define URL @"http://192.168.1.66:9012"//luocong
......
DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m
...@@ -173,21 +173,21 @@ ...@@ -173,21 +173,21 @@
self.myView.playerView.currentPlayerManager.muted = YES; self.myView.playerView.currentPlayerManager.muted = YES;
} }
if(![HJUserDefaults isEqual:[NSNull null]] && !(HJUserDefaults == nil)){ // if(![HJUserDefaults isEqual:[NSNull null]] && !(HJUserDefaults == nil)){
if([HJUserDefaults objectForKey:@"updateDictyDr04"]){ // if([HJUserDefaults objectForKey:@"updateDictyDr04"]){
NSMutableDictionary *dic = [NSMutableDictionary dictionary]; // NSMutableDictionary *dic = [NSMutableDictionary dictionary];
[dic addEntriesFromDictionary:[HJUserDefaults objectForKey:@"updateDictyDr04"]]; // [dic addEntriesFromDictionary:[HJUserDefaults objectForKey:@"updateDictyDr04"]];
self.localIsupkeep = [dic objectForKey:@"isUpkeep"]; // self.localIsupkeep = [dic objectForKey:@"isUpkeep"];
if ([self.localIsupkeep isEqualToString:@"0"]) { // if ([self.localIsupkeep isEqualToString:@"0"]) {
self.myView.byBtn.hidden = NO; //// self.myView.byBtn.hidden = NO;
self.myView.startUpkeepBtn.hidden = NO; //// self.myView.startUpkeepBtn.hidden = NO;
//
}else{ // }else{
self.myView.byBtn.hidden = YES; // self.myView.byBtn.hidden = YES;
self.myView.startUpkeepBtn.hidden = YES; // self.myView.startUpkeepBtn.hidden = YES;
} // }
} // }
} // }
......
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