Skip to content
This repository was archived by the owner on Jul 16, 2024. It is now read-only.

Commit 13749cb

Browse files
sunnyyoungsunnyyoung
committed
😎Meizi 2.0 Released!!!
1 parent 443d2a7 commit 13749cb

File tree

23 files changed

+210
-80
lines changed

23 files changed

+210
-80
lines changed

‎Meizi.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
7D7510B01B5672DE003CAF34 /* TopicRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D7510AF1B5672DE003CAF34 /* TopicRequest.m */; };
2727
7D7510B31B5673B0003CAF34 /* Topic.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D7510B21B5673B0003CAF34 /* Topic.m */; };
2828
7D7510B61B56767C003CAF34 /* TopicTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D7510B51B56767C003CAF34 /* TopicTableViewCell.m */; };
29-
7D8A0AA41B58AA83001EDD42 /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D8A0AA31B58AA83001EDD42 /* WebViewController.m */; };
3029
7D8A0AA81B58B482001EDD42 /* SettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D8A0AA71B58B482001EDD42 /* SettingViewController.m */; };
3130
7D93B84F1ACFD7CF00453452 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D93B84E1ACFD7CF00453452 /* main.m */; };
3231
7D93B8521ACFD7CF00453452 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D93B8511ACFD7CF00453452 /* AppDelegate.m */; };
3332
7D93B8581ACFD7CF00453452 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7D93B8561ACFD7CF00453452 /* Main.storyboard */; };
3433
7D93B85A1ACFD7CF00453452 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7D93B8591ACFD7CF00453452 /* Images.xcassets */; };
3534
7D93B87C1ACFDD2900453452 /* Meizi.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D93B87B1ACFDD2900453452 /* Meizi.m */; };
35+
7DFF243D1B5B95800069BB4D /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DFF243C1B5B95800069BB4D /* WebViewController.m */; };
3636
E07A9DDEC7193BA0132EB02F /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 77EACF44A594DBA190E5C5FF /* libPods.a */; };
3737
/* End PBXBuildFile section */
3838

@@ -79,8 +79,6 @@
7979
7D7510B21B5673B0003CAF34 /* Topic.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Topic.m; sourceTree = "<group>"; };
8080
7D7510B41B56767C003CAF34 /* TopicTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopicTableViewCell.h; sourceTree = "<group>"; };
8181
7D7510B51B56767C003CAF34 /* TopicTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopicTableViewCell.m; sourceTree = "<group>"; };
82-
7D8A0AA21B58AA83001EDD42 /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewController.h; sourceTree = "<group>"; };
83-
7D8A0AA31B58AA83001EDD42 /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewController.m; sourceTree = "<group>"; };
8482
7D8A0AA61B58B482001EDD42 /* SettingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingViewController.h; sourceTree = "<group>"; };
8583
7D8A0AA71B58B482001EDD42 /* SettingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingViewController.m; sourceTree = "<group>"; };
8684
7D93B8491ACFD7CF00453452 /* Meizi.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Meizi.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -93,6 +91,8 @@
9391
7D93B8761ACFDA1F00453452 /* Constant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Constant.h; sourceTree = "<group>"; };
9492
7D93B87A1ACFDD2900453452 /* Meizi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Meizi.h; sourceTree = "<group>"; };
9593
7D93B87B1ACFDD2900453452 /* Meizi.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Meizi.m; sourceTree = "<group>"; };
94+
7DFF243B1B5B95800069BB4D /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewController.h; sourceTree = "<group>"; };
95+
7DFF243C1B5B95800069BB4D /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewController.m; sourceTree = "<group>"; };
9696
/* End PBXFileReference section */
9797

9898
/* Begin PBXFrameworksBuildPhase section */
@@ -312,8 +312,8 @@
312312
7D8A0AAD1B58B783001EDD42 /* WebView */ = {
313313
isa = PBXGroup;
314314
children = (
315-
7D8A0AA21B58AA83001EDD42 /* WebViewController.h */,
316-
7D8A0AA31B58AA83001EDD42 /* WebViewController.m */,
315+
7DFF243B1B5B95800069BB4D /* WebViewController.h */,
316+
7DFF243C1B5B95800069BB4D /* WebViewController.m */,
317317
);
318318
name = WebView;
319319
sourceTree = "<group>";
@@ -500,7 +500,7 @@
500500
7D7510971B5652DA003CAF34 /* Groups.m in Sources */,
501501
7D7510B01B5672DE003CAF34 /* TopicRequest.m in Sources */,
502502
7D4375F31B5520AF001CEBC9 /* RankRequest.m in Sources */,
503-
7D8A0AA41B58AA83001EDD42 /* WebViewController.m in Sources */,
503+
7DFF243D1B5B95800069BB4D /* WebViewController.m in Sources */,
504504
7D4375E81B550BC6001CEBC9 /* MeiziCell.m in Sources */,
505505
7D4375FD1B552695001CEBC9 /* GroupsViewController.m in Sources */,
506506
7D4375E51B5508D3001CEBC9 /* MeiziRequest.m in Sources */,

‎Meizi/AppDelegate.m‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,22 @@
1111
@implementation AppDelegate
1212

1313
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
14+
15+
//Set Background Color
1416
self.window.backgroundColor = [UIColor whiteColor];
17+
18+
//Set Network
1519
[AFNetworkActivityIndicatorManager sharedManager].enabled = YES;
1620
[YTKNetworkConfig sharedInstance].baseUrl = BaseURL;
21+
22+
//Set UserAgent
23+
NSDictionary *userAgent = @{@"UserAgent": @"Mozilla/5.0 (iPhone; CPU iPhone OS 8_4 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12H143 Safari/600.1.4"};
24+
[[NSUserDefaults standardUserDefaults] registerDefaults:userAgent];
25+
26+
//Set SVProgressHUD
27+
[SVProgressHUD setBackgroundColor:[UIColor colorWithWhite:0.0 alpha:0.9]];
28+
[SVProgressHUD setForegroundColor:[UIColor whiteColor]];
29+
1730
return YES;
1831
}
1932

‎Meizi/Base.lproj/Main.storyboard‎

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,16 +382,67 @@
382382
<!--Web View Controller-->
383383
<scene sceneID="nxM-t7-6Li">
384384
<objects>
385-
<viewController id="X1o-kV-HSe" customClass="WebViewController" sceneMemberID="viewController">
385+
<viewController hidesBottomBarWhenPushed="YES" id="X1o-kV-HSe" customClass="WebViewController" sceneMemberID="viewController">
386386
<layoutGuides>
387387
<viewControllerLayoutGuide type="top" id="xxs-v7-IwX"/>
388388
<viewControllerLayoutGuide type="bottom" id="6CN-0K-ULD"/>
389389
</layoutGuides>
390390
<view key="view" contentMode="scaleToFill" id="qxu-b2-gvi">
391391
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
392392
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
393+
<subviews>
394+
<webView opaque="NO" contentMode="scaleToFill" scalesPageToFit="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5IX-e3-kPG">
395+
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
396+
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
397+
<connections>
398+
<outlet property="delegate" destination="X1o-kV-HSe" id="dm9-eU-qxh"/>
399+
</connections>
400+
</webView>
401+
<toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mlg-11-Wgb">
402+
<rect key="frame" x="0.0" y="556" width="600" height="44"/>
403+
<items>
404+
<barButtonItem enabled="NO" image="GoBack" id="osX-p4-DBh">
405+
<connections>
406+
<action selector="goBack" destination="5IX-e3-kPG" id="mDO-Gh-Ll2"/>
407+
</connections>
408+
</barButtonItem>
409+
<barButtonItem style="plain" systemItem="flexibleSpace" id="dy5-x9-PEG"/>
410+
<barButtonItem enabled="NO" image="GoForward" id="P0g-61-UOs">
411+
<connections>
412+
<action selector="goForward" destination="5IX-e3-kPG" id="13w-Iq-hNW"/>
413+
</connections>
414+
</barButtonItem>
415+
<barButtonItem style="plain" systemItem="flexibleSpace" id="cB1-KK-eaz"/>
416+
<barButtonItem systemItem="stop" id="2KB-Am-nP2">
417+
<connections>
418+
<action selector="stopLoading" destination="5IX-e3-kPG" id="8r2-WK-qSU"/>
419+
</connections>
420+
</barButtonItem>
421+
<barButtonItem style="plain" systemItem="flexibleSpace" id="Xoe-f3-Klc"/>
422+
<barButtonItem systemItem="refresh" id="O2m-gj-YI4">
423+
<connections>
424+
<action selector="reload" destination="5IX-e3-kPG" id="q0Q-1j-cRc"/>
425+
</connections>
426+
</barButtonItem>
427+
</items>
428+
</toolbar>
429+
</subviews>
393430
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
431+
<constraints>
432+
<constraint firstItem="5IX-e3-kPG" firstAttribute="leading" secondItem="qxu-b2-gvi" secondAttribute="leading" id="QkJ-nZ-qfc"/>
433+
<constraint firstItem="5IX-e3-kPG" firstAttribute="top" secondItem="qxu-b2-gvi" secondAttribute="top" id="Wes-it-BdO"/>
434+
<constraint firstAttribute="bottom" secondItem="Mlg-11-Wgb" secondAttribute="bottom" id="Wme-W8-5X2"/>
435+
<constraint firstAttribute="bottom" secondItem="5IX-e3-kPG" secondAttribute="bottom" id="eXA-kU-ecT"/>
436+
<constraint firstAttribute="trailing" secondItem="Mlg-11-Wgb" secondAttribute="trailing" id="f9g-Kh-zw5"/>
437+
<constraint firstItem="Mlg-11-Wgb" firstAttribute="leading" secondItem="qxu-b2-gvi" secondAttribute="leading" id="gai-EV-0DH"/>
438+
<constraint firstAttribute="trailing" secondItem="5IX-e3-kPG" secondAttribute="trailing" id="zmg-ed-0ad"/>
439+
</constraints>
394440
</view>
441+
<connections>
442+
<outlet property="goBackButton" destination="osX-p4-DBh" id="fuC-Fs-DAa"/>
443+
<outlet property="goForwardButton" destination="P0g-61-UOs" id="F6m-f3-lqH"/>
444+
<outlet property="webView" destination="5IX-e3-kPG" id="znM-b2-mbN"/>
445+
</connections>
395446
</viewController>
396447
<placeholder placeholderIdentifier="IBFirstResponder" id="oug-Vw-3Xv" userLabel="First Responder" sceneMemberID="firstResponder"/>
397448
</objects>
@@ -643,14 +694,16 @@
643694
</scenes>
644695
<resources>
645696
<image name="Avatar" width="25" height="25"/>
697+
<image name="GoBack" width="22" height="22"/>
698+
<image name="GoForward" width="22" height="22"/>
646699
<image name="Group" width="25" height="25"/>
647700
<image name="Home" width="25" height="25"/>
648701
<image name="Rank" width="25" height="25"/>
649702
<image name="Search" width="25" height="25"/>
650703
<image name="Setting" width="25" height="24"/>
651704
</resources>
652705
<inferredMetricsTieBreakers>
653-
<segue reference="M7Z-g2-il8"/>
706+
<segue reference="zdF-wh-WCW"/>
654707
</inferredMetricsTieBreakers>
655708
<color key="tintColor" red="0.1450980392" green="0.67843137249999996" blue="0.90588235289999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
656709
</document>

‎Meizi/Constant.h‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
#define SCREEN_WIDTH CGRectGetWidth([UIApplication sharedApplication].keyWindow.bounds)
1313
#define SCREEN_HEIGHT CGRectGetHeight([UIApplication sharedApplication].keyWindow.bounds)
1414

15-
static NSString * const BaseURL = @"http://api.xiaojianjian.net";
15+
static NSString * const BaseURL = @"http://api.xiaojianjian.net";
1616

17-
static NSString * const Meizi_All = @"0";
18-
static NSString * const Meizi_DaXiong = @"2";
19-
static NSString * const Meizi_QiaoTun = @"6";
20-
static NSString * const Meizi_HeiSi = @"7";
21-
static NSString * const Meizi_MeiTui = @"3";
22-
static NSString * const Meizi_QingXin = @"4";
23-
static NSString * const Meizi_ZaHui = @"5";
17+
static NSString * const Meizi_All = @"0";
18+
static NSString * const Meizi_DaXiong = @"2";
19+
static NSString * const Meizi_QiaoTun = @"6";
20+
static NSString * const Meizi_HeiSi = @"7";
21+
static NSString * const Meizi_MeiTui = @"3";
22+
static NSString * const Meizi_QingXin = @"4";
23+
static NSString * const Meizi_ZaHui = @"5";
2424

25-
static NSString * const DoubanGroupURL= @"http://www.douban.com/group/";
26-
static NSString * const DoubanTopicURL= @"http://www.douban.com/group/topic/";
27-
static NSString * const DBMeiNvTopicURL = @"http://www.dbmeinv.com/dbgroup/app/topic_detail.htm?id=";
25+
static NSString * const DoubanGroupURL = @"http://www.douban.com/group/";
26+
static NSString * const DoubanTopicURL = @"http://www.douban.com/group/topic/";
27+
static NSString * const DoubanPeopleURL = @"http://www.douban.com/group/people/";
2828

2929
#endif
3030

@@ -43,4 +43,5 @@ static NSString * const DBMeiNvTopicURL = @"http://www.dbmeinv.com/dbgroup/app/t
4343
//
4444
//- 精选: queryType = rank & pageIndex = 1
4545
//- 小组: m = groups
46-
//- 搜妹: m = topic_users & key = 关键词 & pageIndex = 1
46+
//- 搜妹: m = topic_users & key = 关键词 & pageIndex = 1
47+
//static NSString * const DBMeinvTopicURL = @"http://www.dbmeinv.com/dbgroup/app/topic_detail.htm?id=";

‎Meizi/Images.xcassets/Cancel.imageset/Cancel.pdf‎

4.02 KB
Binary file not shown.

‎Meizi/Images.xcassets/Cancel.imageset/Contents.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "Cancel.pdf"
6+
}
7+
],
8+
"info" : {
9+
"version" : 1,
10+
"author" : "xcode"
11+
}
12+
}

‎Meizi/Images.xcassets/GoBack.imageset/Contents.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "GoBack.pdf"
6+
}
7+
],
8+
"info" : {
9+
"version" : 1,
10+
"author" : "xcode"
11+
}
12+
}

‎Meizi/Images.xcassets/GoBack.imageset/GoBack.pdf‎

4.52 KB
Binary file not shown.

‎Meizi/Images.xcassets/GoForward.imageset/Contents.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "GoForward.pdf"
6+
}
7+
],
8+
"info" : {
9+
"version" : 1,
10+
"author" : "xcode"
11+
}
12+
}

‎Meizi/Images.xcassets/GoForward.imageset/GoForward.pdf‎

4.49 KB
Binary file not shown.

0 commit comments

Comments
 (0)