diff --git a/QXLive.xcodeproj/project.pbxproj b/QXLive.xcodeproj/project.pbxproj index 709c9ad..d0fe334 100644 --- a/QXLive.xcodeproj/project.pbxproj +++ b/QXLive.xcodeproj/project.pbxproj @@ -1197,7 +1197,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.1; + MARKETING_VERSION = 1.0.2; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1257,7 +1257,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.1; + MARKETING_VERSION = 1.0.2; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; diff --git a/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/UserInterfaceState.xcuserstate b/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/UserInterfaceState.xcuserstate index 49ddddd..d491139 100644 Binary files a/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/UserInterfaceState.xcuserstate and b/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/QXLive/Dynamic(语圈)/Controller/QXReportViewController.m b/QXLive/Dynamic(语圈)/Controller/QXReportViewController.m index 3f64f5b..34f36e7 100644 --- a/QXLive/Dynamic(语圈)/Controller/QXReportViewController.m +++ b/QXLive/Dynamic(语圈)/Controller/QXReportViewController.m @@ -42,7 +42,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext; - (void)loadData { // 1-用户,2房间,3动态&fromId=对应id NSInteger safeTop = kSafeAreaTop; - NSURL* url= [NSURL URLWithString:[NSString stringWithFormat:@"https://vespa.qxmier.com/web/index.html#/pages/feedback/report?id=%@&fromType=%@&fromId=%@&h=%ld",[QXGlobal shareGlobal].loginModel.token ,self.reportType,self.fromId,safeTop]]; + NSURL* url= [NSURL URLWithString:[NSString stringWithFormat:@"%@web/index.html#/pages/feedback/report?id=%@&fromType=%@&fromId=%@&h=%ld",H5ServerUrl,[QXGlobal shareGlobal].loginModel.token ,self.reportType,self.fromId,safeTop]]; NSURLRequest *request =[NSURLRequest requestWithURL:url]; [self.contentWebView loadRequest:request]; } diff --git a/QXLive/Message(音信)/Controller/群聊/QXGuildGroupSettingVC.m b/QXLive/Message(音信)/Controller/群聊/QXGuildGroupSettingVC.m index c1db10b..d0be2ba 100644 --- a/QXLive/Message(音信)/Controller/群聊/QXGuildGroupSettingVC.m +++ b/QXLive/Message(音信)/Controller/群聊/QXGuildGroupSettingVC.m @@ -41,7 +41,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext; , 2)]; } - (void)loadData { - NSURL* url=[NSURL URLWithString:[NSString stringWithFormat:@"https://vespa.qxmier.com/web/index.html#/pages/union/setGroup?id=%@&guildId=%@",QXGlobal.shareGlobal.loginModel.token,self.groupId]]; + NSURL* url=[NSURL URLWithString:[NSString stringWithFormat:@"%@web/index.html#/pages/union/setGroup?id=%@&guildId=%@",H5ServerUrl,QXGlobal.shareGlobal.loginModel.token,self.groupId]]; NSURLRequest *request =[NSURLRequest requestWithURL:url]; [self.contentWebView loadRequest:request]; } diff --git a/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m b/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m index d09f11e..2cf3cf8 100644 --- a/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m +++ b/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m @@ -43,7 +43,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext; } - (void)loadData { NSInteger safeTop = kSafeAreaTop; - NSURL* url=[NSURL URLWithString:[NSString stringWithFormat:@"https://vespa.qxmier.com/web/index.html#/pages/union/index?id=%@&h=%ld",[QXGlobal shareGlobal].loginModel.token,safeTop]]; + NSURL* url=[NSURL URLWithString:[NSString stringWithFormat:@"%@web/index.html#/pages/union/index?id=%@&h=%ld",H5ServerUrl,[QXGlobal shareGlobal].loginModel.token,safeTop]]; NSURLRequest *request =[NSURLRequest requestWithURL:url]; [self.contentWebView loadRequest:request]; } diff --git a/QXLive/Mine(音域)/Controller/帮助反馈/QXHelpViewController.m b/QXLive/Mine(音域)/Controller/帮助反馈/QXHelpViewController.m index e64d1d2..6b349d9 100644 --- a/QXLive/Mine(音域)/Controller/帮助反馈/QXHelpViewController.m +++ b/QXLive/Mine(音域)/Controller/帮助反馈/QXHelpViewController.m @@ -61,7 +61,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext; } - (void)loadData { NSInteger safeTop = kSafeAreaTop; - NSURL* url=[NSURL URLWithString:[NSString stringWithFormat:@"https://vespa.qxmier.com/web/index.html#/pages/feedback/help?id=%@&h=%ld",[QXGlobal shareGlobal].loginModel.token,safeTop]]; + NSURL* url=[NSURL URLWithString:[NSString stringWithFormat:@"%@web/index.html#/pages/feedback/help?id=%@&h=%ld",H5ServerUrl,[QXGlobal shareGlobal].loginModel.token,safeTop]]; NSURLRequest *request =[NSURLRequest requestWithURL:url]; [self.contentWebView loadRequest:request]; } diff --git a/QXLive/Mine(音域)/Controller/段位/QXLevelViewController.m b/QXLive/Mine(音域)/Controller/段位/QXLevelViewController.m index 1980b00..e08f333 100644 --- a/QXLive/Mine(音域)/Controller/段位/QXLevelViewController.m +++ b/QXLive/Mine(音域)/Controller/段位/QXLevelViewController.m @@ -41,7 +41,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext; } - (void)loadData { NSInteger safeTop = kSafeAreaTop; - NSURL* url=[NSURL URLWithString:[NSString stringWithFormat:@"https://vespa.qxmier.com/web/index.html#/pages/other/grade?id=%@&type=%d&h=%ld",[QXGlobal shareGlobal].loginModel.token,0,safeTop]]; + NSURL* url=[NSURL URLWithString:[NSString stringWithFormat:@"%@web/index.html#/pages/other/grade?id=%@&type=%d&h=%ld",H5ServerUrl,[QXGlobal shareGlobal].loginModel.token,0,safeTop]]; NSURLRequest *request =[NSURLRequest requestWithURL:url]; [self.contentWebView loadRequest:request]; } diff --git a/QXLive/Mine(音域)/Controller/设置/QXAboutViewController.m b/QXLive/Mine(音域)/Controller/设置/QXAboutViewController.m index b38234b..b65c1de 100644 --- a/QXLive/Mine(音域)/Controller/设置/QXAboutViewController.m +++ b/QXLive/Mine(音域)/Controller/设置/QXAboutViewController.m @@ -40,7 +40,9 @@ static void *WKWebBrowserContext = &WKWebBrowserContext; , 2)]; } - (void)loadData { - NSURL* url=[NSURL URLWithString:@"https://vespa.qxmier.com/web/index.html#/pages/other/aboutUs"]; +// H5ServerUrl + NSString *urlStr = [NSString stringWithFormat:@"%@web/index.html#/pages/other/aboutUs",H5ServerUrl]; + NSURL* url=[NSURL URLWithString:urlStr]; NSURLRequest *request =[NSURLRequest requestWithURL:url]; [self.contentWebView loadRequest:request]; } diff --git a/QXLive/Mine(音域)/Controller/道具商城/QXPropShopViewController.m b/QXLive/Mine(音域)/Controller/道具商城/QXPropShopViewController.m index fb97c49..7ba89ac 100644 --- a/QXLive/Mine(音域)/Controller/道具商城/QXPropShopViewController.m +++ b/QXLive/Mine(音域)/Controller/道具商城/QXPropShopViewController.m @@ -60,7 +60,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext; , 2)]; } - (void)loadData { - NSURL* url=[NSURL URLWithString:[NSString stringWithFormat:@"https://vespa.qxmier.com/web/index.html#/pages/prop/propMall?id=%@",[QXGlobal shareGlobal].loginModel.token]]; + NSURL* url=[NSURL URLWithString:[NSString stringWithFormat:@"%@web/index.html#/pages/prop/propMall?id=%@",H5ServerUrl,[QXGlobal shareGlobal].loginModel.token]]; NSURLRequest *request =[NSURLRequest requestWithURL:url]; [self.contentWebView loadRequest:request]; } diff --git a/QXLive/Mine(音域)/Controller/邀请/QXInviteViewController.m b/QXLive/Mine(音域)/Controller/邀请/QXInviteViewController.m index 1e26937..593f238 100644 --- a/QXLive/Mine(音域)/Controller/邀请/QXInviteViewController.m +++ b/QXLive/Mine(音域)/Controller/邀请/QXInviteViewController.m @@ -63,7 +63,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext; } - (void)loadData { NSInteger safeTop = kSafeAreaTop; - NSURL* url=[NSURL URLWithString:[NSString stringWithFormat:@"https://vespa.qxmier.com/web/index.html#/pages/other/income??id=%@&h=%ld",[QXGlobal shareGlobal].loginModel.token,safeTop]]; + NSURL* url=[NSURL URLWithString:[NSString stringWithFormat:@"%@web/index.html#/pages/other/income??id=%@&h=%ld",H5ServerUrl,[QXGlobal shareGlobal].loginModel.token,safeTop]]; NSURLRequest *request =[NSURLRequest requestWithURL:url]; [self.contentWebView loadRequest:request]; } diff --git a/QXLive/Mine(音域)/View/个人主页/QXDayTaskRuleView.m b/QXLive/Mine(音域)/View/个人主页/QXDayTaskRuleView.m index c04fe02..14bafd2 100644 --- a/QXLive/Mine(音域)/View/个人主页/QXDayTaskRuleView.m +++ b/QXLive/Mine(音域)/View/个人主页/QXDayTaskRuleView.m @@ -40,7 +40,8 @@ static void *WKWebBrowserContext = &WKWebBrowserContext; [self removeFromSuperview]; } - (void)loadData { - NSURL* url=[NSURL URLWithString:[NSString stringWithFormat:@"https://vespa.qxmier.com/web/index.html#/pages/other/taskDesc"]]; + NSString *urlStr = [NSString stringWithFormat:@"%@web/index.html#/pages/other/taskDesc",H5ServerUrl]; + NSURL* url=[NSURL URLWithString:urlStr]; NSURLRequest *request =[NSURLRequest requestWithURL:url]; [self.contentWebView loadRequest:request]; } diff --git a/QXLive/Other/QXApi.h b/QXLive/Other/QXApi.h index 5fd49ca..92c2517 100644 --- a/QXLive/Other/QXApi.h +++ b/QXLive/Other/QXApi.h @@ -8,9 +8,11 @@ #ifndef Api_h #define Api_h #if DEVELOPENT == 1 -static NSString* ServerUrl = @"https://chat.qxmier.com/"; +static NSString* ServerUrl = @"https://vschat.qxmier.com/"; +static NSString* H5ServerUrl = @"https://chatvespa.qxmier.com/"; #else static NSString* ServerUrl = @"https://chat.qxmier.com/"; +static NSString* H5ServerUrl = @"https://vespa.qxmier.com/"; #endif #pragma mark - 引导页 /// 引导页 diff --git a/QXLive/chirld(青少年)/QXChirldViewController.m b/QXLive/chirld(青少年)/QXChirldViewController.m index c76d6aa..b280d99 100644 --- a/QXLive/chirld(青少年)/QXChirldViewController.m +++ b/QXLive/chirld(青少年)/QXChirldViewController.m @@ -41,7 +41,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext; } - (void)loadData { NSInteger safeTop = kSafeAreaTop; - NSURL* url= [NSURL URLWithString:[NSString stringWithFormat:@"https://vespa.qxmier.com/web/index.html#/pages/feedback/teenage?id=%@&h=%ld",[QXGlobal shareGlobal].loginModel.token,safeTop]]; + NSURL* url= [NSURL URLWithString:[NSString stringWithFormat:@"%@web/index.html#/pages/feedback/teenage?id=%@&h=%ld",H5ServerUrl,[QXGlobal shareGlobal].loginModel.token,safeTop]]; NSURLRequest *request =[NSURLRequest requestWithURL:url]; [self.contentWebView loadRequest:request]; }