Merge pull request #6 from panicstyle/3.6

3.6
panicstyle · Mar 8, 2017 · af9fec6 · af9fec6
2 parents e4bce8d + 132436a
commit af9fec6
Show file tree

Hide file tree

Showing 27 changed files with 730 additions and 828 deletions.
diff --git a/iGongdong.xcodeproj/project.pbxproj b/iGongdong.xcodeproj/project.pbxproj
@@ -17,8 +17,6 @@
 		EC717E9D1C87C68800C1888B /* BoardView.m in Sources */ = {isa = PBXBuildFile; fileRef = EC717E9C1C87C68800C1888B /* BoardView.m */; };
 		EC717EA21C87C68800C1888B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EC717EA11C87C68800C1888B /* Assets.xcassets */; };
 		EC717EA51C87C68800C1888B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EC717EA31C87C68800C1888B /* LaunchScreen.storyboard */; };
-		EC717EB01C87C68800C1888B /* iGongdongTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EC717EAF1C87C68800C1888B /* iGongdongTests.m */; };
-		EC717EBB1C87C68800C1888B /* iGongdongUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = EC717EBA1C87C68800C1888B /* iGongdongUITests.m */; };
 		EC717F111C8811C500C1888B /* MainView.m in Sources */ = {isa = PBXBuildFile; fileRef = EC717F101C8811C500C1888B /* MainView.m */; };
 		EC717F2B1C882F3E00C1888B /* LoginToService.m in Sources */ = {isa = PBXBuildFile; fileRef = EC717F221C882F3E00C1888B /* LoginToService.m */; };
 		EC717F2C1C882F3E00C1888B /* SetInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = EC717F241C882F3E00C1888B /* SetInfo.m */; };
@@ -76,11 +74,7 @@
 		EC717EA41C87C68800C1888B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		EC717EA61C87C68800C1888B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		EC717EAB1C87C68800C1888B /* iGongdongTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iGongdongTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		EC717EAF1C87C68800C1888B /* iGongdongTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = iGongdongTests.m; sourceTree = "<group>"; };
-		EC717EB11C87C68800C1888B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		EC717EB61C87C68800C1888B /* iGongdongUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iGongdongUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		EC717EBA1C87C68800C1888B /* iGongdongUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = iGongdongUITests.m; sourceTree = "<group>"; };
-		EC717EBC1C87C68800C1888B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		EC717F0E1C8811C500C1888B /* env.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = env.h; sourceTree = "<group>"; };
 		EC717F0F1C8811C500C1888B /* MainView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainView.h; sourceTree = "<group>"; };
 		EC717F101C8811C500C1888B /* MainView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainView.m; sourceTree = "<group>"; };
@@ -148,8 +142,6 @@
 			children = (
 				EC81F6FE1C884CED0012D779 /* GoogleMobileAds.framework */,
 				EC717E941C87C68800C1888B /* iGongdong */,
-				EC717EAE1C87C68800C1888B /* iGongdongTests */,
-				EC717EB91C87C68800C1888B /* iGongdongUITests */,
 				EC717E931C87C68800C1888B /* Products */,
 			);
 			sourceTree = "<group>";
@@ -230,24 +222,6 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		EC717EAE1C87C68800C1888B /* iGongdongTests */ = {
-			isa = PBXGroup;
-			children = (
-				EC717EAF1C87C68800C1888B /* iGongdongTests.m */,
-				EC717EB11C87C68800C1888B /* Info.plist */,
-			);
-			path = iGongdongTests;
-			sourceTree = "<group>";
-		};
-		EC717EB91C87C68800C1888B /* iGongdongUITests */ = {
-			isa = PBXGroup;
-			children = (
-				EC717EBA1C87C68800C1888B /* iGongdongUITests.m */,
-				EC717EBC1C87C68800C1888B /* Info.plist */,
-			);
-			path = iGongdongUITests;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -310,7 +284,7 @@
 		EC717E8A1C87C68800C1888B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = dykim;
 				TargetAttributes = {
 					EC717E911C87C68800C1888B = {
@@ -414,15 +388,13 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EC717EB01C87C68800C1888B /* iGongdongTests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		EC717EB21C87C68800C1888B /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EC717EBB1C87C68800C1888B /* iGongdongUITests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -474,8 +446,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
@@ -560,8 +534,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -605,8 +581,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";

diff --git a/iGongdong/AboutView.m b/iGongdong/AboutView.m
@@ -26,7 +26,7 @@ - (void)viewDidLoad
 //    NSString *version = [infoDict objectForKey:@"CFBundleShortVersionString"];
     NSString *version = [infoDict objectForKey:@"CFBundleShortVersionString"];
 
-	msgAbout = [NSString stringWithFormat:@"공동육아 / 아이폰\n버전 : %@\n문의메일 : panicstyle@gmail.com\n홈페이지 : http://www.panicstyle.net/?page_id=7",  version];
+	msgAbout = [NSString stringWithFormat:@"공동육아앱 for iOS\n버전 : %@\n개발자 : 호랑이(과천맨발어린이집 졸업조합원)\n문의메일 : panicstyle@gmail.com\n홈페이지 : http://www.panicstyle.net/?page_id=7\n소스 : https://github.com/panicstyle/iGongdong\n\n광고수익은 공동육아 저소득기금으로 사용됩니다.",  version];
     textView.text = msgAbout;
 }
 

diff --git a/iGongdong/AppDelegate.m b/iGongdong/AppDelegate.m
@@ -33,9 +33,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 	BOOL pushEnable = NO;
 	if ([[UIApplication sharedApplication] respondsToSelector:@selector(isRegisteredForRemoteNotifications)]) {
 		pushEnable = [[UIApplication sharedApplication] isRegisteredForRemoteNotifications];
-	} else {
-		UIRemoteNotificationType types = [[UIApplication sharedApplication] enabledRemoteNotificationTypes];
-		pushEnable = types & UIRemoteNotificationTypeAlert;
 	}
 
 	// 푸시 아이디를 달라고 폰에다가 요청하는 함수
@@ -45,11 +42,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 		// iOS 8 Notifications
 		[application registerUserNotificationSettings:[UIUserNotificationSettings settingsForTypes:(UIUserNotificationTypeSound | UIUserNotificationTypeAlert | UIUserNotificationTypeBadge) categories:nil]];
 		[application registerForRemoteNotifications];
-	} else {
-		NSLog(@"down ios8");
-		// iOS < 8 Notifications
-		[application registerForRemoteNotificationTypes:
-		 (UIRemoteNotificationTypeBadge | UIRemoteNotificationTypeAlert | UIRemoteNotificationTypeSound)];
 	}
 
 	// 앱이 완전히 종료된 상태에서 푸쉬 알림을 받으면 해당 푸쉬 알림 메시지가 launchOptions 에 포함되어서 실행된다.

diff --git a/iGongdong/ArticleView.m b/iGongdong/ArticleView.m
@@ -513,8 +513,6 @@ - (void)didFetchItems:(NSNumber *)result
 
 		NSLog(@"htmlString = [%@]", m_strContent);
 
-		CGFloat width = m_contentCell.frame.size.width;
-
 		m_webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, 0, m_contentCell.frame.size.width, m_contentCell.frame.size.height)];
 		m_webView.delegate = self;
 		m_webView.scrollView.scrollEnabled = YES;

diff --git a/iGongdong/ArticleWriteView.h b/iGongdong/ArticleWriteView.h
@@ -9,8 +9,15 @@
 #import <UIKit/UIKit.h>
 #import "env.h"
 
-@interface ArticleWriteView : UIViewController <UITableViewDelegate, UITableViewDataSource>
-@property (nonatomic, weak) IBOutlet UITableView *tbView;
+@interface ArticleWriteView : UIViewController <UINavigationControllerDelegate, UIImagePickerControllerDelegate>
+@property (nonatomic, weak) IBOutlet UITextField *viewTitle;
+@property (nonatomic, weak) IBOutlet UITextView *viewContent;
+@property (nonatomic, weak) IBOutlet UIImageView *viewImage0;
+@property (nonatomic, weak) IBOutlet UIImageView *viewImage1;
+@property (nonatomic, weak) IBOutlet UIImageView *viewImage2;
+@property (nonatomic, weak) IBOutlet UIImageView *viewImage3;
+@property (nonatomic, weak) IBOutlet UIImageView *viewImage4;
+
 @property (nonatomic, strong) NSNumber *m_nModify;
 @property (nonatomic, strong) NSNumber *m_nMode;
 @property (nonatomic, strong) NSString *m_strCommId;