1

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -162,6 +162,7 @@
 		A74322A422B8E7F60017C367 /* MyFollowAndFanHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74322A322B8E7F60017C367 /* MyFollowAndFanHeaderView.swift */; };
 		A74322A922B900180017C367 /* CommunityFindFriendsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74322A822B900180017C367 /* CommunityFindFriendsViewController.swift */; };
 		A74322AB22B900F00017C367 /* CommunityFindFriendsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74322AA22B900F00017C367 /* CommunityFindFriendsView.swift */; };
+		A7464B6C23386521003CE3A0 /* PushConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7464B6B23386521003CE3A0 /* PushConfigModel.swift */; };
 		A74D9D572327B54100F05C14 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74D9D562327B54100F05C14 /* NotificationService.swift */; };
 		A74D9D5B2327B54100F05C14 /* NotificationService.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = A74D9D542327B54100F05C14 /* NotificationService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		A74DF74922EAAF17007FB505 /* MJDIYFullScreenHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74DF74822EAAF17007FB505 /* MJDIYFullScreenHeader.swift */; };
@@ -813,6 +814,7 @@
 		A74322A322B8E7F60017C367 /* MyFollowAndFanHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyFollowAndFanHeaderView.swift; sourceTree = "<group>"; };
 		A74322A822B900180017C367 /* CommunityFindFriendsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityFindFriendsViewController.swift; sourceTree = "<group>"; };
 		A74322AA22B900F00017C367 /* CommunityFindFriendsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityFindFriendsView.swift; sourceTree = "<group>"; };
+		A7464B6B23386521003CE3A0 /* PushConfigModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PushConfigModel.swift; sourceTree = "<group>"; };
 		A74D9D542327B54100F05C14 /* NotificationService.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = NotificationService.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		A74D9D562327B54100F05C14 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
 		A74D9D582327B54100F05C14 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -1808,6 +1810,7 @@
 		A7284402224DBE3500F82F30 /* UserModel */ = {
 			isa = PBXGroup;
 			children = (
+				A7464B6B23386521003CE3A0 /* PushConfigModel.swift */,
 				A78A5F7722FAC7F000DD1764 /* SetGenderModel.swift */,
 				A71CAB3622C9A40A00D908A8 /* TotalBeanModel.swift */,
 				A72623D622C26A2A00AEF875 /* MessageListModel.swift */,
@@ -5679,6 +5682,7 @@
 				A77BB4652329EF5A00DCAE32 /* NXLPermissionCamera.swift in Sources */,
 				BD108C9422A60C2100837DAB /* HGImageCollectionViewController.swift in Sources */,
 				A72A72AA22321DE000B21995 /* Log.swift in Sources */,
+				A7464B6C23386521003CE3A0 /* PushConfigModel.swift in Sources */,
 				BD61226A22C3595B00D3F513 /* AlivcEditUIConfig.m in Sources */,
 				A7D77DF122DDE6600048D5F6 /* UserMemberTotalBeanViewModel.swift in Sources */,
 				A7AA9F6522C63DCD0086498B /* CommunityFollowFeedModel.swift in Sources */,

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -23,7 +23,7 @@ extension AppDelegate {
         // 设置Tabbar
         kAppDelegate.setTabbarController()
         //  引导页
-//        kAppDelegate.setGuidePageView()
+        kAppDelegate.setGuidePageView()
         // 授权处理
         setPermission()
         // 初始化百度地图
@@ -67,11 +67,6 @@ extension AppDelegate {
     
     /// 设置登录时用的数据
     func setData() {
-//        // 判断初始化页面
-//        if UserModel.shared().getModel()?.token != nil { //是否已经登录
-//            // 刷新token
-//            SwiftMoyaNetWorkServiceUser.shared().userRefreshApi { _ in}
-//        }
         //U米
         UserMemberTotalBeanViewModel.shared.userMemberGetTotalBeanApiInterval()
         //获取消息的小红点

RainbowPlanet/RainbowPlanet/Model/UserModel/PushConfigModel.swift

@@ -0,0 +1,41 @@
+//
+//	PushConfigModel.swift
+//	Model file generated using JSONExport: https://github.com/Ahmed-Ali/JSONExport
+
+import Foundation 
+import ObjectMapper
+
+
+class PushConfigModel : NSObject, Mappable{
+
+	var commentStatus : Int?
+	var followStatus : Int?
+	var likeStatus : Int?
+	var systemStatus : Int?
+	var totalStatus : Int?
+
+
+	class func newInstance(map: Map) -> Mappable?{
+		return PushConfigModel()
+	}
+	required init?(map: Map){}
+	private override init(){}
+    
+    static enum pushConfigType : String {
+        case commentStatus = "comment_status"
+        case followStatus = "follow_status"
+        case likeStatus = "like_status"
+        case systemStatus = "system_status"
+        case totalStatus = "total_status"
+    }
+
+	func mapping(map: Map)
+	{
+		commentStatus <- map["comment_status"]
+		followStatus <- map["follow_status"]
+		likeStatus <- map["like_status"]
+		systemStatus <- map["system_status"]
+		totalStatus <- map["total_status"]
+	}
+
+}

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaNetWorkServiceUser.swift

@@ -896,5 +896,28 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             (loadingStatus) in
         }
     }
+    
+    // MARK: - push配置信息
+    /// push配置信息
+    ///
+    /// - Parameter completion: 回调
+    func userPushConfigApi(completion: @escaping successCallBack) {
+        let parameters = Dictionary<String,Any>()
+        SwiftMoyaNetWorkManager.shared.requestObject(PushConfigModel.self, target:  MultiTarget(SwiftMoyaServiceUserApi.userPushConfig(parameters: parameters)), completion: { (pushConfigModel) in
+             completion(pushConfigModel)
+        }) { (loadingStatus) in}
+    }
+    
+    // MARK: - 修改push配置
+    /// 修改push配置
+    ///
+    /// - Parameter completion: 回调
+    func userChangePushConfigApi(type:PushConfigModel.pushConfigType,completion: @escaping successCallBack) {
+        var parameters = Dictionary<String,Any>()
+        parameters.updateValue(type.rawValue, forKey: "type")
+        SwiftMoyaNetWorkManager.shared.requestAny(target:  MultiTarget(SwiftMoyaServiceUserApi.userChangePushConfig(parameters: parameters)), completion: { _ in
+            completion("")
+        }) { (loadingStatus) in}
+    }
 
 }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaServiceUserApi.swift

@@ -392,7 +392,12 @@ extension SwiftMoyaServiceUserApi: TargetType {
             return kUserMemberReportApi
         case .userMemberBlackList:
             return kUserMemberBlackListApi
+        case .userPushConfig:
+            return kUserPushConfigApi
+        case .userChangePushConfig:
+            return kUserChangePushConfigApi
         }
+        
     }
 
     public var method: Moya.Method {
@@ -423,7 +428,8 @@ extension SwiftMoyaServiceUserApi: TargetType {
              .userMemberUpdateGender,
              .userMemberDetailUpDate,
              .userCancelFollow,
-             .userMemberReadMessage
+             .userMemberReadMessage,
+             .userChangePushConfig
             :
             return .put
         case .userSelfAddressList,
@@ -437,7 +443,8 @@ extension SwiftMoyaServiceUserApi: TargetType {
              .userMemberMessageIndex,
              .userMemberMessageList,
              .userMemberSearchMember,
-             .userMemberGetTotalBean
+             .userMemberGetTotalBean,
+             .userPushConfig
             :
             return .get
         case .userAddressDelete,
@@ -490,7 +497,9 @@ extension SwiftMoyaServiceUserApi: TargetType {
              .userMemberSearchMember(var parameters),
              .userMemberGetTotalBean(var parameters),
              .userMemberReport(var parameters),
-             .userMemberBlackList(var parameters)
+             .userMemberBlackList(var parameters),
+             .userPushConfig(var parameters),
+             .userChangePushConfig(var parameters)
             :
             let sign = SwiftSign.shared().sign(signType:.AccessToken, parameters: parameters)
             parameters.updateValue(sign, forKey: "sign")
@@ -550,7 +559,9 @@ extension SwiftMoyaServiceUserApi: TargetType {
              .userMemberSearchMember,
              .userMemberGetTotalBean,
              .userMemberReport,
-             .userMemberBlackList
+             .userMemberBlackList,
+             .userPushConfig,
+             .userChangePushConfig
             :
             return (headerParameters(headerType: .tokenHeader) as! [String : String])
         case .userLogout,