v1.3.1

Temperature.xcodeproj/project.pbxproj

@@ -1831,11 +1831,9 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Temperature/Temperature.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 20230907;
-				DEVELOPMENT_TEAM = "";
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = FBAS2Y3Z2S;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 20230910;
+				DEVELOPMENT_TEAM = FBAS2Y3Z2S;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Temperature/Tools/Location/BaiduMapSDK",
@@ -1860,11 +1858,10 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.YXLJ.fiveContant;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = fiveContant;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -1881,11 +1878,9 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Temperature/Temperature.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 20230907;
-				DEVELOPMENT_TEAM = "";
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = FBAS2Y3Z2S;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 20230910;
+				DEVELOPMENT_TEAM = FBAS2Y3Z2S;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Temperature/Tools/Location/BaiduMapSDK",
@@ -1910,11 +1905,10 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.YXLJ.fiveContant;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = fiveContant;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;

Temperature/AppConfig/RDSConfig.h

@@ -9,9 +9,9 @@
 #ifndef RDSConfig_h
 #define RDSConfig_h
 
-#define kUserAgreement @"https://app.yongxulvjian.com/ServiceAgreement"
+#define kUserAgreement @"https://app.yongxulvjian.com/#/ServiceAgreement"
 
-#define kPrivacyPolicy @"https://app.yongxulvjian.com/PrivacyPolicy"
+#define kPrivacyPolicy @"https://app.yongxulvjian.com/#/PrivacyPolicy"
 
 #define kHelpList @"https://app.yongxulvjian.com/HelpList"
 

Temperature/ControlModule/Home/Controller/RDSAirControlVC.m

@@ -185,25 +185,26 @@
 
 
 - (IBAction)didTapIcon:(id)sender {
-    [self openPageWithType:@"temp"];
+    [self openPageWithType:@"temp" title:@"温度"];
 }
 
 - (IBAction)didTapHumidity:(id)sender {
-    [self openPageWithType:@"humidity"];
+    [self openPageWithType:@"humidity" title:@"湿度"];
 }
 
 - (IBAction)didTapPm25:(id)sender {
-    [self openPageWithType:@"pm25"];
+    [self openPageWithType:@"pm25" title:@"PM 2.5"];
 }
 
 - (IBAction)didTapCo2:(id)sender {
-    [self openPageWithType:@"co2"];
+    [self openPageWithType:@"co2" title:@"二氧化碳"];
 }
 
-- (void)openPageWithType:(NSString *)type {
+- (void)openPageWithType:(NSString *)type title:(NSString *)title {
     NSString *urlStr = [NSString stringWithFormat:@"%@/#/DataChart/%@/%@", kBaseUrlHeadImg, self.roomModel.record_id, type];
     RDSUserProtocolViewController *vc = [[RDSUserProtocolViewController alloc] init];
     vc.url = urlStr;
+    vc.vcTitle = title;
     [self pushViewController:vc animated:YES];
 }
 
@@ -228,6 +229,7 @@
     }
     RDSUserProtocolViewController *vc = [[RDSUserProtocolViewController alloc] init];
     vc.url = [NSString stringWithFormat:@"%@/#/DeviceInfo/%@", kBaseUrlHeadImg, self.roomModel.record_id];
+    vc.vcTitle = @"设备信息";
     [self pushViewController:vc animated:YES];
 }
 

Temperature/ControlModule/Home/Controller/RDSSubControlVC.m

@@ -116,17 +116,18 @@
 }
 
 - (IBAction)didTapTemperature:(id)sender {
-    [self openPageWithType:@"temp"];
+    [self openPageWithType:@"temp" title:@"温度"];
 }
 
 - (IBAction)didTapHumidity:(id)sender {
-    [self openPageWithType:@"humidity"];
+    [self openPageWithType:@"humidity" title:@"湿度"];
 }
 
-- (void)openPageWithType:(NSString *)type {
+- (void)openPageWithType:(NSString *)type title:(NSString *)title {
     NSString *urlStr = [NSString stringWithFormat:@"%@/#/DataChart/%@/%@", kBaseUrlHeadImg, self.roomModel.record_id, type];
     RDSUserProtocolViewController *vc = [[RDSUserProtocolViewController alloc] init];
     vc.url = urlStr;
+    vc.vcTitle = title;
     [self pushViewController:vc animated:YES];
 }
 

Temperature/Main/LoginRegister/RDSLoginPwdCodeVC.m

@@ -182,6 +182,7 @@
 - (IBAction)p_onUserAgreementClick:(id)sender {
     RDSUserProtocolViewController *userProtocolVC = [[RDSUserProtocolViewController alloc] init];
     userProtocolVC.url = kUserAgreement;
+    userProtocolVC.vcTitle = @"用户协议";
     [self pushViewController:userProtocolVC animated:YES];
 }
 
@@ -189,6 +190,7 @@
 - (IBAction)p_onPrivacyPolicyClick:(id)sender {
     RDSUserProtocolViewController *userProtocolVC = [[RDSUserProtocolViewController alloc] init];
     userProtocolVC.url = kPrivacyPolicy;
+    userProtocolVC.vcTitle = @"隐私政策";
     [self pushViewController:userProtocolVC animated:YES];
 }
 

Temperature/Main/LoginRegister/RDSLoginVerifyCodeVC.m

@@ -197,6 +197,7 @@
     
     RDSUserProtocolViewController *userProtocolVC = [[RDSUserProtocolViewController alloc] init];
     userProtocolVC.url = kUserAgreement;
+    userProtocolVC.vcTitle = @"用户协议";
     [self pushViewController:userProtocolVC animated:YES];
 }
 
@@ -205,6 +206,7 @@
     
     RDSUserProtocolViewController *userProtocolVC = [[RDSUserProtocolViewController alloc] init];
     userProtocolVC.url = kPrivacyPolicy;
+    userProtocolVC.vcTitle = @"隐私政策";
     [self pushViewController:userProtocolVC animated:YES];
 }
 

Temperature/Main/LoginRegister/RDSUserProtocolViewController.m

@@ -9,7 +9,7 @@
 #import "RDSUserProtocolViewController.h"
 #import <WebKit/WebKit.h>
 
-@interface RDSUserProtocolViewController () <WKUIDelegate, WKNavigationDelegate, WKScriptMessageHandler>
+@interface RDSUserProtocolViewController () <WKUIDelegate, WKNavigationDelegate>
 @property (nonatomic, strong) WKWebView *webView;
 
 @end
@@ -17,8 +17,8 @@
 @implementation RDSUserProtocolViewController
 
 - (void)dealloc {
-    WKUserContentController *controller = self.webView.configuration.userContentController;
-    [controller removeScriptMessageHandlerForName:@"closePage"];
+//    WKUserContentController *controller = self.webView.configuration.userContentController;
+//    [controller removeScriptMessageHandlerForName:@"closePage"];
 }
 
 - (void)viewDidLoad {
@@ -32,24 +32,25 @@
 
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
-    [self.navigationController setNavigationBarHidden:YES];
+//    [self.navigationController setNavigationBarHidden:YES];
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
-    [self.navigationController setNavigationBarHidden:NO];
+//    [self.navigationController setNavigationBarHidden:NO];
 }
 
 - (void)p_loadData {
     /* 加载服务器url的方法*/
     NSString *url = self.url;
     NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:url]];
+    [RDSHudShower showWithStatus:nil];
     [_webView loadRequest:request];
 }
 
 - (void)p_setupUI {
     WKWebViewConfiguration *configuration = [[WKWebViewConfiguration alloc] init];
-    [configuration.userContentController addScriptMessageHandler:self name:@"closePage"];
+//    [configuration.userContentController addScriptMessageHandler:self name:@"closePage"];
     
     self.webView = [[WKWebView alloc] initWithFrame:CGRectZero configuration:configuration];
 
@@ -76,10 +77,18 @@
     _webView.allowsBackForwardNavigationGestures = YES;
 }
 
-- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message {
-    if ([message.name isEqualToString:@"closePage"]) {
-        [self.navigationController popViewControllerAnimated:YES];
-    }
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation {
+    [RDSHudShower dismissHUD];
 }
 
+- (void)webView:(WKWebView *)webView didFailNavigation:(WKNavigation *)navigation withError:(NSError *)error {
+    [RDSHudShower dismissHUD];
+}
+
+//- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message {
+//    if ([message.name isEqualToString:@"closePage"]) {
+//        [self.navigationController popViewControllerAnimated:YES];
+//    }
+//}
+
 @end