diff --git a/XinjiangProject/XinjiangProject.xcodeproj/project.pbxproj b/XinjiangProject/XinjiangProject.xcodeproj/project.pbxproj index 197292b..fefde55 100644 --- a/XinjiangProject/XinjiangProject.xcodeproj/project.pbxproj +++ b/XinjiangProject/XinjiangProject.xcodeproj/project.pbxproj @@ -375,7 +375,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = A7CC5LW224; ENABLE_USER_SCRIPT_SANDBOXING = NO; GCC_PREFIX_HEADER = "$(SRCROOT)/XinjiangProject/Supporting Files/PrefixHeader.pch"; @@ -419,7 +419,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = A7CC5LW224; ENABLE_USER_SCRIPT_SANDBOXING = NO; GCC_PREFIX_HEADER = "$(SRCROOT)/XinjiangProject/Supporting Files/PrefixHeader.pch"; diff --git a/XinjiangProject/XinjiangProject/Define/StatusMacros.h b/XinjiangProject/XinjiangProject/Define/StatusMacros.h index 970a967..4dd7447 100755 --- a/XinjiangProject/XinjiangProject/Define/StatusMacros.h +++ b/XinjiangProject/XinjiangProject/Define/StatusMacros.h @@ -89,9 +89,9 @@ //#define SCHEME @"https" // -#define Http @"http://192.168.1.23"// +//#define Http @"http://192.168.1.23"//昊 -//#define Http @"https://api.xjygjk.com"// +#define Http @"https://api.xjygjk.com"// #define H5DevHost @"api.xjygjk.com"// #define IntervenH5 @"https://console.xjygjk.com" #define BASEURL @"https://yyjk.cqygjk.com" //北边接口前缀 diff --git a/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate.m b/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate.m index f63fc1d..0aeb297 100644 --- a/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate.m +++ b/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate.m @@ -41,7 +41,7 @@ #if DEBUG #else - [CheckProjectTool testAll]; +// [CheckProjectTool testAll]; #endif diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableViewCell.m index 769e817..8012b35 100644 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableViewCell.m @@ -104,14 +104,15 @@ [backView addSubview:thresholdBtn]; } - (void)popStringPick { - - self.popBlock(self.listModel); + if (self.popBlock) { + self.popBlock(self.listModel.wdType); + } } - - (void)historyList { - - self.historyBlock(self.listModel.wdType); + if (self.historyBlock) { + self.historyBlock(self.listModel.wdType); + } }