Merge pull request #179 from TeamBeMe/feature/#178

Feature/#178

BeMe/BeMe.xcodeproj/project.pbxproj

@@ -1934,7 +1934,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0612;
+				MARKETING_VERSION = 1.0712;
 				PRODUCT_BUNDLE_IDENTIFIER = com.teamBeMe.BeMe1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -1957,7 +1957,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0612;
+				MARKETING_VERSION = 1.0712;
 				PRODUCT_BUNDLE_IDENTIFIER = com.teamBeMe.BeMe1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

BeMe/BeMe/APIService/APIConstants.swift

@@ -31,9 +31,9 @@ struct APIConstants{
 
     static let explorationCategoryURL = baseURL + "/exploration/category"
     static let explorationDiffThoughtURL = baseURL + "/exploration/another"
-    static let explorationDiffArticleURL = baseURL + "/exploration"
+    static let explorationDiffArticleURL = baseURL + "/exploration/all"
     static let explorationAnswerScapURL = baseURL + "/exploration/"
-    static let explorationDetailAnswerURL = baseURL + "/exploration/"
+    static let explorationDetailAnswerURL = baseURL + "/exploration/all"
     static let answerDetailURL = baseURL + "/answers/detail"
     static let answerCommentURL = baseURL + "/answers/comments"
     static let alarmURL = baseURL + "/users/activities"

BeMe/BeMe/APIService/Explore/ExploreAnswerService.swift

@@ -22,12 +22,12 @@ struct ExploreAnswerService {
          params = [
             "page": "\(page)",
             "category": "\(c)",
-            "sorting": "\(sorting)"
+//            "sorting": "\(sorting)"
          ]
       } else {
          params = [
             "page": "\(page)",
-            "sorting": "\(sorting)"
+//            "sorting": "\(sorting)"
          ]
       }
       let url = APIConstants.explorationDiffArticleURL
@@ -52,7 +52,8 @@ struct ExploreAnswerService {
    private func judge(by statusCode: Int, _ data: Data) -> NetworkResult<Any> {
       let decoder = JSONDecoder()
       guard let decodedData = try? decoder.decode(GenericResponse<ExploreAnswerData>.self, from : data) else { return .pathErr }
-
+      print("우욱")
+      print(decodedData)
       switch statusCode {
       case 200..<300: return .success(decodedData)
       case 400..<500: return .pathErr

BeMe/BeMe/APIService/Explore/ExploreDetailAnswerService.swift

@@ -20,7 +20,7 @@ struct ExploreDetailAnswerService {
 
         let params: Parameters = [
             "page": page,
-            "sorting": sorting
+//            "sorting": sorting
         ]
 
         let dataRequest = AF.request(url, method: .get, parameters: params ,headers: header)

BeMe/BeMe/Assets.xcassets/btnAlram.imageset/Contents.json

@@ -1,19 +1,19 @@
 {
   "images" : [
     {
-      "scale" : "1x",
       "idiom" : "universal",
-      "filename" : "btnAlram.png"
+      "filename" : "btnAlram.png",
+      "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "[email protected]",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "[email protected]",
       "scale" : "3x",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "filename" : "[email protected]"
     }
   ],
   "info" : {

BeMe/BeMe/Assets.xcassets/btnExploreSelected.imageset/Contents.json

@@ -1,8 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "btnExploreSelected.png",
       "idiom" : "universal",
+      "filename" : "btnExploreSelected.png",
       "scale" : "1x"
     },
     {
@@ -11,9 +11,9 @@
       "scale" : "2x"
     },
     {
-      "filename" : "[email protected]",
+      "scale" : "3x",
       "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "[email protected]"
     }
   ],
   "info" : {

BeMe/BeMe/Assets.xcassets/btnExploreUnselected.imageset/Contents.json

@@ -1,19 +1,19 @@
 {
   "images" : [
     {
-      "scale" : "1x",
       "idiom" : "universal",
-      "filename" : "btnExploreUnselected.png"
+      "filename" : "btnExploreUnselected.png",
+      "scale" : "1x"
     },
     {
       "filename" : "[email protected]",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "[email protected]",
-      "scale" : "3x"
+      "scale" : "3x",
+      "idiom" : "universal"
     }
   ],
   "info" : {

BeMe/BeMe/Assets.xcassets/btnFollowingSelected.imageset/Contents.json

@@ -1,13 +1,13 @@
 {
   "images" : [
     {
-      "filename" : "btnFollowingSelected.png",
       "scale" : "1x",
+      "filename" : "btnFollowingSelected.png",
       "idiom" : "universal"
     },
     {
-      "scale" : "2x",
       "idiom" : "universal",
+      "scale" : "2x",
       "filename" : "[email protected]"
     },
     {

BeMe/BeMe/Assets.xcassets/btnFollowingUnselected.imageset/Contents.json

@@ -2,18 +2,18 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "btnFollowingUnselected.png"
+      "filename" : "btnFollowingUnselected.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
       "filename" : "[email protected]",
       "scale" : "2x"
     },
     {
-      "scale" : "3x",
+      "filename" : "[email protected]",
       "idiom" : "universal",
-      "filename" : "[email protected]"
+      "scale" : "3x"
     }
   ],
   "info" : {

BeMe/BeMe/Assets.xcassets/btnHomeSelected.imageset/Contents.json

@@ -1,19 +1,19 @@
 {
   "images" : [
     {
-      "filename" : "btnHomeSelected.png",
+      "scale" : "1x",
       "idiom" : "universal",
-      "scale" : "1x"
+      "filename" : "btnHomeSelected.png"
     },
     {
+      "scale" : "2x",
       "idiom" : "universal",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "filename" : "[email protected]"
     },
     {
+      "scale" : "3x",
       "idiom" : "universal",
-      "filename" : "[email protected]",
-      "scale" : "3x"
+      "filename" : "[email protected]"
     }
   ],
   "info" : {

BeMe/BeMe/Assets.xcassets/btnHomeUnselected.imageset/Contents.json

@@ -1,14 +1,14 @@
 {
   "images" : [
     {
+      "scale" : "1x",
       "idiom" : "universal",
-      "filename" : "btnHomeUnselected.png",
-      "scale" : "1x"
+      "filename" : "btnHomeUnselected.png"
     },
     {
-      "scale" : "2x",
       "idiom" : "universal",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",

BeMe/BeMe/Assets.xcassets/btnIdsearch.imageset/Contents.json

@@ -1,19 +1,19 @@
 {
   "images" : [
     {
-      "filename" : "btnIdsearch.png",
+      "scale" : "1x",
       "idiom" : "universal",
-      "scale" : "1x"
+      "filename" : "btnIdsearch.png"
     },
     {
-      "idiom" : "universal",
       "filename" : "[email protected]",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "scale" : "3x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "idiom" : "universal"
     }
   ],
   "info" : {

BeMe/BeMe/Assets.xcassets/btnMypageSelected.imageset/Contents.json

@@ -1,19 +1,19 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "btnMypageSelected.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "idiom" : "universal"
     },
     {
-      "filename" : "[email protected]",
       "idiom" : "universal",
-      "scale" : "2x"
+      "scale" : "2x",
+      "filename" : "[email protected]"
     },
     {
-      "scale" : "3x",
       "idiom" : "universal",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "3x"
     }
   ],
   "info" : {

BeMe/BeMe/Assets.xcassets/btnMypageUnselected.imageset/Contents.json

@@ -1,9 +1,9 @@
 {
   "images" : [
     {
+      "idiom" : "universal",
       "scale" : "1x",
-      "filename" : "btnMypageUnselected.png",
-      "idiom" : "universal"
+      "filename" : "btnMypageUnselected.png"
     },
     {
       "filename" : "[email protected]",
@@ -12,8 +12,8 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "[email protected]",
-      "scale" : "3x"
+      "scale" : "3x",
+      "filename" : "[email protected]"
     }
   ],
   "info" : {

BeMe/BeMe/Assets.xcassets/icondesign43.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "scale" : "1x",
+      "idiom" : "universal",
+      "filename" : "icondesign43.png"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "scale" : "3x",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BeMe/BeMe/Explore/Cells/DiffArticleTVC.swift

@@ -35,7 +35,7 @@ class DiffArticleTVC: UITableViewCell {
 
     override func awakeFromNib() {
         super.awakeFromNib()
-        setLabel()
+//        setLabel()
         setCategoryCollectionView()
     }