提交
This commit is contained in:
@@ -1197,7 +1197,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0.1;
|
MARKETING_VERSION = 1.0.2;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive;
|
PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||||
@@ -1257,7 +1257,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0.1;
|
MARKETING_VERSION = 1.0.2;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive;
|
PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||||
|
|||||||
Binary file not shown.
@@ -42,7 +42,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
|
|||||||
- (void)loadData {
|
- (void)loadData {
|
||||||
// 1-用户,2房间,3动态&fromId=对应id
|
// 1-用户,2房间,3动态&fromId=对应id
|
||||||
NSInteger safeTop = kSafeAreaTop;
|
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];
|
NSURLRequest *request =[NSURLRequest requestWithURL:url];
|
||||||
[self.contentWebView loadRequest:request];
|
[self.contentWebView loadRequest:request];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
|
|||||||
, 2)];
|
, 2)];
|
||||||
}
|
}
|
||||||
- (void)loadData {
|
- (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];
|
NSURLRequest *request =[NSURLRequest requestWithURL:url];
|
||||||
[self.contentWebView loadRequest:request];
|
[self.contentWebView loadRequest:request];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
|
|||||||
}
|
}
|
||||||
- (void)loadData {
|
- (void)loadData {
|
||||||
NSInteger safeTop = kSafeAreaTop;
|
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];
|
NSURLRequest *request =[NSURLRequest requestWithURL:url];
|
||||||
[self.contentWebView loadRequest:request];
|
[self.contentWebView loadRequest:request];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
|
|||||||
}
|
}
|
||||||
- (void)loadData {
|
- (void)loadData {
|
||||||
NSInteger safeTop = kSafeAreaTop;
|
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];
|
NSURLRequest *request =[NSURLRequest requestWithURL:url];
|
||||||
[self.contentWebView loadRequest:request];
|
[self.contentWebView loadRequest:request];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
|
|||||||
}
|
}
|
||||||
- (void)loadData {
|
- (void)loadData {
|
||||||
NSInteger safeTop = kSafeAreaTop;
|
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];
|
NSURLRequest *request =[NSURLRequest requestWithURL:url];
|
||||||
[self.contentWebView loadRequest:request];
|
[self.contentWebView loadRequest:request];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,9 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
|
|||||||
, 2)];
|
, 2)];
|
||||||
}
|
}
|
||||||
- (void)loadData {
|
- (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];
|
NSURLRequest *request =[NSURLRequest requestWithURL:url];
|
||||||
[self.contentWebView loadRequest:request];
|
[self.contentWebView loadRequest:request];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
|
|||||||
, 2)];
|
, 2)];
|
||||||
}
|
}
|
||||||
- (void)loadData {
|
- (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];
|
NSURLRequest *request =[NSURLRequest requestWithURL:url];
|
||||||
[self.contentWebView loadRequest:request];
|
[self.contentWebView loadRequest:request];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
|
|||||||
}
|
}
|
||||||
- (void)loadData {
|
- (void)loadData {
|
||||||
NSInteger safeTop = kSafeAreaTop;
|
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];
|
NSURLRequest *request =[NSURLRequest requestWithURL:url];
|
||||||
[self.contentWebView loadRequest:request];
|
[self.contentWebView loadRequest:request];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,8 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
|
|||||||
[self removeFromSuperview];
|
[self removeFromSuperview];
|
||||||
}
|
}
|
||||||
- (void)loadData {
|
- (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];
|
NSURLRequest *request =[NSURLRequest requestWithURL:url];
|
||||||
[self.contentWebView loadRequest:request];
|
[self.contentWebView loadRequest:request];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,9 +8,11 @@
|
|||||||
#ifndef Api_h
|
#ifndef Api_h
|
||||||
#define Api_h
|
#define Api_h
|
||||||
#if DEVELOPENT == 1
|
#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
|
#else
|
||||||
static NSString* ServerUrl = @"https://chat.qxmier.com/";
|
static NSString* ServerUrl = @"https://chat.qxmier.com/";
|
||||||
|
static NSString* H5ServerUrl = @"https://vespa.qxmier.com/";
|
||||||
#endif
|
#endif
|
||||||
#pragma mark - 引导页
|
#pragma mark - 引导页
|
||||||
/// 引导页
|
/// 引导页
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
|
|||||||
}
|
}
|
||||||
- (void)loadData {
|
- (void)loadData {
|
||||||
NSInteger safeTop = kSafeAreaTop;
|
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];
|
NSURLRequest *request =[NSURLRequest requestWithURL:url];
|
||||||
[self.contentWebView loadRequest:request];
|
[self.contentWebView loadRequest:request];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user