😒Meizi 2.1 Released!!!

sunnyyoung · Feb 20, 2016 · a10ab24 · a10ab24
1 parent e8d8501
commit a10ab24
Show file tree

Hide file tree

Showing 50 changed files with 267 additions and 2,023 deletions.
diff --git a/Meizi.xcodeproj/project.pbxproj b/Meizi.xcodeproj/project.pbxproj
diff --git a/Meizi/AppDelegate.h b/Meizi/AppDelegate.h
@@ -8,6 +8,7 @@
 
 #import <UIKit/UIKit.h>
 #import <YTKNetwork/YTKNetworkConfig.h>
+#import <YTKNetwork/YTKNetworkAgent.h>
 #import <AFNetworking/AFNetworkActivityIndicatorManager.h>
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate>

diff --git a/Meizi/AppDelegate.m b/Meizi/AppDelegate.m
@@ -12,16 +12,10 @@ @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
 
-    //Set Background Color
-    self.window.backgroundColor = [UIColor whiteColor];
-
     //Set Network
     [AFNetworkActivityIndicatorManager sharedManager].enabled = YES;
     [YTKNetworkConfig sharedInstance].baseUrl = BaseURL;
-
-    //Set UserAgent
-    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"};
-    [[NSUserDefaults standardUserDefaults] registerDefaults:userAgent];
+    [[YTKNetworkAgent sharedInstance] setValue:[NSSet setWithObjects:@"application/json", @"text/plain", @"text/javascript", @"text/json", @"text/html", @"text/css", nil] forKeyPath :@"_manager.responseSerializer.acceptableContentTypes"];
 
     //Set SVProgressHUD
     [SVProgressHUD setBackgroundColor:[UIColor colorWithWhite:0.0 alpha:0.9]];

diff --git a/Meizi/Base.lproj/Main.storyboard b/Meizi/Base.lproj/Main.storyboard
diff --git a/Meizi/Constant.h b/Meizi/Constant.h
@@ -9,10 +9,10 @@
 #ifndef Meizi_Constant_h
 #define Meizi_Constant_h
 
-#define SCREEN_WIDTH    CGRectGetWidth([UIApplication sharedApplication].keyWindow.bounds)
-#define SCREEN_HEIGHT    CGRectGetHeight([UIApplication sharedApplication].keyWindow.bounds)
+#define kScreenWidth    CGRectGetWidth([UIApplication   sharedApplication].keyWindow.bounds)
+#define kScreenHeight    CGRectGetHeight([UIApplication sharedApplication].keyWindow.bounds)
 
-static NSString * const BaseURL         = @"http://api.xiaojianjian.net";
+static NSString * const BaseURL         = @"http://www.dbmeinv.com";
 
 static NSString * const Meizi_All       = @"0";
 static NSString * const Meizi_DaXiong   = @"2";
@@ -22,10 +22,6 @@ static NSString * const Meizi_MeiTui    = @"3";
 static NSString * const Meizi_QingXin   = @"4";
 static NSString * const Meizi_ZaHui     = @"5";
 
-static NSString * const DoubanGroupURL  = @"http://www.douban.com/group/";
-static NSString * const DoubanTopicURL  = @"http://www.douban.com/group/topic/";
-static NSString * const DoubanPeopleURL = @"http://www.douban.com/group/people/";
-
 #endif
 
 

diff --git a/Meizi/Groups.h b/Meizi/Groups.h
diff --git a/Meizi/Groups.m b/Meizi/Groups.m
diff --git a/Meizi/GroupsRequest.h b/Meizi/GroupsRequest.h
diff --git a/Meizi/GroupsRequest.m b/Meizi/GroupsRequest.m
diff --git a/Meizi/GroupsTableViewCell.h b/Meizi/GroupsTableViewCell.h
diff --git a/Meizi/GroupsTableViewCell.m b/Meizi/GroupsTableViewCell.m
diff --git a/Meizi/GroupsViewController.h b/Meizi/GroupsViewController.h
diff --git a/Meizi/GroupsViewController.m b/Meizi/GroupsViewController.m
diff --git a/Meizi/Images.xcassets/AppIcon.appiconset/Contents.json b/Meizi/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -35,6 +35,41 @@
       "idiom" : "iphone",
       "filename" : "Meizi_60pt_@3x.png",
       "scale" : "3x"
+    },
+    {
+      "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"
     }
   ],
   "info" : {

diff --git a/Meizi/Info.plist b/Meizi/Info.plist
@@ -9,21 +9,26 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.sunnyyoung.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
+	<string>2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -33,6 +38,9 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 </dict>
 </plist>
diff --git a/Meizi/Meizi.h b/Meizi/Meizi.h
@@ -10,10 +10,7 @@
 
 @interface Meizi : NSObject
 
-@property (nonatomic, copy) NSString *topic_id;
-@property (nonatomic, copy) NSString *topic_title;
-@property (nonatomic, copy) NSString *douban_group_id;
-@property (nonatomic, copy) NSString *douban_topic_id;
-@property (nonatomic, copy) NSString *img_url;
+@property (nonatomic, copy) NSString *title;
+@property (nonatomic, copy) NSString *src;
 
 @end