Skip to content

Z
zhongChaoMerchant_iOS
Commit 905d8be8 by ChenCD
Options

修改，等级D，关于我们

parent f9f1a5a9
Showing with 188 additions and 79 deletions
ZhongChaoApp/.DS_Store
No preview for this file type
ZhongChaoApp/Pods/Pods.xcodeproj/xcuserdata/dongchen.xcuserdatad/xcschemes/xcschememanagement.plist 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>AFNetworking.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>HappyDNS.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>5</integer>
</dict>
<key>IQKeyboardManager.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>6</integer>
</dict>
<key>LBXScan.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>7</integer>
</dict>
<key>MBProgressHUD.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>9</integer>
</dict>
<key>MJRefresh.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>10</integer>
</dict>
<key>Masonry.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>8</integer>
</dict>
<key>PNChart.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>11</integer>
</dict>
<key>Pods-UniversalApp.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>12</integer>
</dict>
<key>Qiniu.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>13</integer>
</dict>
<key>SDWebImage.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>14</integer>
</dict>
<key>UICountingLabel.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>15</integer>
</dict>
<key>YTKNetwork.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>16</integer>
</dict>
<key>YYKit.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>17</integer>
</dict>
</dict>
</dict>
</plist>
ZhongChaoApp/UniversalApp.xcodeproj/project.pbxproj
...@@ -3019,7 +3019,7 @@ ...@@ -3019,7 +3019,7 @@
); );
GCC_PREFIX_HEADER = "$(SRCROOT)/UniversalApp/Supporting Flies/PrefixHeader.pch"; GCC_PREFIX_HEADER = "$(SRCROOT)/UniversalApp/Supporting Flies/PrefixHeader.pch";
INFOPLIST_FILE = "UniversalApp/Supporting Flies/Info.plist"; INFOPLIST_FILE = "UniversalApp/Supporting Flies/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.4; IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
...@@ -3095,7 +3095,7 @@ ...@@ -3095,7 +3095,7 @@
); );
GCC_PREFIX_HEADER = "$(SRCROOT)/UniversalApp/Supporting Flies/PrefixHeader.pch"; GCC_PREFIX_HEADER = "$(SRCROOT)/UniversalApp/Supporting Flies/PrefixHeader.pch";
INFOPLIST_FILE = "UniversalApp/Supporting Flies/Info.plist"; INFOPLIST_FILE = "UniversalApp/Supporting Flies/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.4; IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
......
ZhongChaoApp/UniversalApp.xcodeproj/xcshareddata/xcschemes/UniversalApp.xcscheme
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</AdditionalOptions> </AdditionalOptions>
</TestAction> </TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Debug" buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0" launchStyle = "0"
......
ZhongChaoApp/UniversalApp.xcodeproj/xcuserdata/dongchen.xcuserdatad/xcschemes/xcschememanagement.plist 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>PushService.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>UniversalApp.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
</dict>
</dict>
</dict>
</plist>
ZhongChaoApp/UniversalApp/Modules/Login/Controller/Login[登录页]/ZCLoginViewController.m
// //
...@@ -54,9 +54,11 @@ ...@@ -54,9 +54,11 @@
// _userNameTextField.text = @"13076148199"; // _userNameTextField.text = @"13076148199";
// _passwordTextField.text = @"123456789"; // _passwordTextField.text = @"123456789";
// //
_userNameTextField.text = @"13711114545"; // _userNameTextField.text = @"13711114545";
_passwordTextField.text = @"111111"; // _passwordTextField.text = @"111111";
// _userNameTextField.text = @"13700007777";
// _passwordTextField.text = @"111111";
_userName = _userNameTextField.text; _userName = _userNameTextField.text;
_password = _passwordTextField.text; _password = _passwordTextField.text;
} }
......
ZhongChaoApp/UniversalApp/Modules/Mine/Controller/Problem[常见问题]/ZCProblemDetailViewController.m
// //
...@@ -8,36 +8,62 @@ ...@@ -8,36 +8,62 @@
#import "ZCProblemDetailViewController.h" #import "ZCProblemDetailViewController.h"
#import <WebKit/WebKit.h>
@interface ZCProblemDetailViewController ()<WKUIDelegate,WKNavigationDelegate>
@property (nonatomic, strong) WKWebView *webView;
@end
@implementation ZCProblemDetailViewController @implementation ZCProblemDetailViewController
-(void)viewDidLoad{ -(void)viewDidLoad{
[super viewDidLoad]; [super viewDidLoad];
[self addNavigationItemWithImageNames:@[@"navBackNor"] isLeft:YES target:self action:@selector(backBtnClicked) tags:nil]; [self addNavigationItemWithImageNames:@[@"navBackNor"] isLeft:YES target:self action:@selector(backBtnClicked) tags:nil];
} NSLog(@"======----%@",self.htmlStr);
-(void)setHtmlStr:(NSString *)htmlStr{
UIScrollView *scrollView = [[UIScrollView alloc] initWithFrame:self.view.bounds]; NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);";
YYLabel *textLbl = [[YYLabel alloc] initWithFrame:CGRectMake(15, 15, self.view.width-30,0)]; WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:jScript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES];
textLbl.numberOfLines = 0; WKUserContentController *wkUController = [[WKUserContentController alloc] init];
textLbl.textVerticalAlignment = YYTextVerticalAlignmentTop; [wkUController addUserScript:wkUScript];
NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new]; WKWebViewConfiguration *wkWebConfig = [[WKWebViewConfiguration alloc] init];
paragraphStyle.lineSpacing = 6; wkWebConfig.userContentController = wkUController;
paragraphStyle.lineBreakMode = NSLineBreakByCharWrapping;
NSDictionary *dict = @{NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType};
NSAttributedString *attributedString = [[NSAttributedString alloc] initWithData:[htmlStr dataUsingEncoding:NSUnicodeStringEncoding] options:dict documentAttributes:nil error:nil];
self.webView = [[WKWebView alloc] initWithFrame:self.view.bounds configuration:wkWebConfig];;
CGFloat height = [htmlStr countHeightWithWidth:KScreenWidth-30 font:kFont(18) lineSpace:0]; self.webView.navigationDelegate=self;
textLbl.height = height; self.webView.UIDelegate = self;
if (height > self.view.height - 30) { [self.view addSubview:self.webView];
scrollView.contentSize = CGSizeMake(0, height);
}
[textLbl setAttributedText:attributedString];
[self.view addSubview:scrollView]; [self.webView loadHTMLString:self.htmlStr baseURL:nil];
[scrollView addSubview:textLbl]; }
- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation{
[self.webView evaluateJavaScript:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '300%'" completionHandler:nil];
} }
//-(void)setHtmlStr:(NSString *)htmlStr{
//
// UIScrollView *scrollView = [[UIScrollView alloc] initWithFrame:self.view.bounds];
// YYLabel *textLbl = [[YYLabel alloc] initWithFrame:CGRectMake(15, 15, self.view.width-30,0)];
// textLbl.numberOfLines = 0;
// textLbl.textVerticalAlignment = YYTextVerticalAlignmentTop;
// NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
// paragraphStyle.lineSpacing = 6;
// paragraphStyle.lineBreakMode = NSLineBreakByCharWrapping;
// NSDictionary *dict = @{NSDocumentTypeDocumentAttribute:NSHTMLTextDocumentType};
// NSAttributedString *attributedString = [[NSAttributedString alloc] initWithData:[htmlStr dataUsingEncoding:NSUnicodeStringEncoding] options:dict documentAttributes:nil error:nil];
//
//
// CGFloat height = [htmlStr countHeightWithWidth:KScreenWidth-30 font:kFont(18) lineSpace:0];
// textLbl.height = height;
// if (height > self.view.height - 30) {
// scrollView.contentSize = CGSizeMake(0, height);
// }
//
// [textLbl setAttributedText:attributedString];
// [self.view addSubview:scrollView];
// [scrollView addSubview:textLbl];
//}
@end @end
ZhongChaoApp/UniversalApp/Modules/Mine/View/Mine[个人中心视图]/ZCMineHeadView.m
// //
...@@ -36,6 +36,9 @@ ...@@ -36,6 +36,9 @@
case 3: case 3:
levelStr = @"c"; levelStr = @"c";
break; break;
case 4:
levelStr = @"d";
break;
} }
_levelIcon.image = [UIImage imageNamed:levelStr]; _levelIcon.image = [UIImage imageNamed:levelStr];
} }
......
ZhongChaoApp/UniversalApp/Supporting Flies/Assets.xcassets/AppIcon.appiconset/Contents.json
...@@ -49,53 +49,9 @@ ...@@ -49,53 +49,9 @@
"scale" : "3x" "scale" : "3x"
}, },
{ {
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024", "size" : "1024x1024",
"idiom" : "ios-marketing",
"filename" : "1024x1024.png",
"scale" : "1x" "scale" : "1x"
} }
], ],
......
ZhongChaoApp/UniversalApp/Supporting Flies/Assets.xcassets/个人中心/d.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "d@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "d@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
ZhongChaoApp/UniversalApp/Supporting Flies/Info.plist
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.0</string> <string>1.1</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
<array> <array>
<dict> <dict>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1</string> <string>1.1</string>
<key>LSApplicationQueriesSchemes</key> <key>LSApplicationQueriesSchemes</key>
<array> <array>
<string>wechat</string> <string>wechat</string>
...@@ -92,6 +92,8 @@ ...@@ -92,6 +92,8 @@
<string>众巢商家版需要您的授权才能访问通讯录信息</string> <string>众巢商家版需要您的授权才能访问通讯录信息</string>
<key>NSLocationUsageDescription</key> <key>NSLocationUsageDescription</key>
<string>众巢商家版需要您的授权才能获取定位信息</string> <string>众巢商家版需要您的授权才能获取定位信息</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>众巢商家版需要您的授权才能在使用期间获取定位信息</string>
<key>NSMicrophoneUsageDescription</key> <key>NSMicrophoneUsageDescription</key>
<string>众巢商家版需要您的授权才能访问麦克风</string> <string>众巢商家版需要您的授权才能访问麦克风</string>
<key>NSPhotoLibraryAddUsageDescription</key> <key>NSPhotoLibraryAddUsageDescription</key>
...@@ -114,8 +116,6 @@ ...@@ -114,8 +116,6 @@
<string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string> <string>UIInterfaceOrientationLandscapeRight</string>
</array> </array>
<key>NSLocationWhenInUseUsageDescription</key>
<string>众巢商家版需要您的授权才能在使用期间获取定位信息</string>
<key>UISupportedInterfaceOrientations~ipad</key> <key>UISupportedInterfaceOrientations~ipad</key>
<array> <array>
<string>UIInterfaceOrientationPortrait</string> <string>UIInterfaceOrientationPortrait</string>
......
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