- UI调整

- 接口联调

QuickLocation.xcodeproj/project.pbxproj

@@ -332,6 +332,9 @@
 		55B218A13024A00100784708 /* CancelAccountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B218A13024A00100784707 /* CancelAccountView.swift */; };
 		55B218A13024A0010078470A /* MemberInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B218A13024A00100784709 /* MemberInfoVC.swift */; };
 		55B218A13024A0010078470C /* MemberInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B218A13024A0010078470B /* MemberInfoView.swift */; };
+		55B233013035000100785041 /* GenderSelectPopVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B233003035000100785040 /* GenderSelectPopVC.swift */; };
+		55B234013036000100785051 /* RelationSelectPopVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B234003036000100785050 /* RelationSelectPopVC.swift */; };
+		55B234033036000100785053 /* RelationStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B234023036000100785052 /* RelationStore.swift */; };
 		55B218B13024B00100784722 /* FeatureIntroVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B218B13024B00100784721 /* FeatureIntroVC.swift */; };
 		55B218B13024B00100784724 /* FeatureIntroView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B218B13024B00100784723 /* FeatureIntroView.swift */; };
 		55B219A2302A000100784751 /* UnlockRequestPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B219A1302A000100784750 /* UnlockRequestPopView.swift */; };
@@ -770,6 +773,9 @@
 		55B218A13024A00100784707 /* CancelAccountView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CancelAccountView.swift; sourceTree = "<group>"; };
 		55B218A13024A00100784709 /* MemberInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemberInfoVC.swift; sourceTree = "<group>"; };
 		55B218A13024A0010078470B /* MemberInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemberInfoView.swift; sourceTree = "<group>"; };
+		55B233003035000100785040 /* GenderSelectPopVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenderSelectPopVC.swift; sourceTree = "<group>"; };
+		55B234003036000100785050 /* RelationSelectPopVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelationSelectPopVC.swift; sourceTree = "<group>"; };
+		55B234023036000100785052 /* RelationStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelationStore.swift; sourceTree = "<group>"; };
 		55B218B13024B00100784721 /* FeatureIntroVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureIntroVC.swift; sourceTree = "<group>"; };
 		55B218B13024B00100784723 /* FeatureIntroView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureIntroView.swift; sourceTree = "<group>"; };
 		55B219A1302A000100784750 /* UnlockRequestPopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnlockRequestPopView.swift; sourceTree = "<group>"; };
@@ -1140,6 +1146,7 @@
 			children = (
 				305A75172FCA8C7000227D26 /* Account.swift */,
 				305A75182FCA8C7000227D26 /* AppContextManager.swift */,
+				55B234023036000100785052 /* RelationStore.swift */,
 				305A75192FCA8C7000227D26 /* UserConfigModel.swift */,
 				305A751A2FCA8C7000227D26 /* UserConfigResponse.swift */,
 			);
@@ -2058,6 +2065,8 @@
 			children = (
 				55B218A13024A00100784709 /* MemberInfoVC.swift */,
 				55B218A13024A0010078470B /* MemberInfoView.swift */,
+				55B233003035000100785040 /* GenderSelectPopVC.swift */,
+				55B234003036000100785050 /* RelationSelectPopVC.swift */,
 			);
 			path = MemberInfo;
 			sourceTree = "<group>";
@@ -2516,6 +2525,9 @@
 				55B218A13024A00100784708 /* CancelAccountView.swift in Sources */,
 				55B218A13024A0010078470A /* MemberInfoVC.swift in Sources */,
 				55B218A13024A0010078470C /* MemberInfoView.swift in Sources */,
+				55B233013035000100785041 /* GenderSelectPopVC.swift in Sources */,
+				55B234013036000100785051 /* RelationSelectPopVC.swift in Sources */,
+				55B234033036000100785053 /* RelationStore.swift in Sources */,
 				55B220013031000100784801 /* FeedbackVC.swift in Sources */,
 				55B220033031000100784803 /* FeedbackView.swift in Sources */,
 				55B220053031000100784805 /* FeedbackSuccessView.swift in Sources */,

QuickLocation/API/PigeonAPI.swift

@@ -11,11 +11,19 @@ enum PigeonAPI {
     /// - Parameters:
     ///     - groupKey: 圈子 key
     ///     - toUsers: 收件人加密 id
-    ///     - msgType: 1 图片  2 语音
+    ///     - msgType: 2 语音  3 文案
-    ///     - msg: 上传返回的 file id
+    ///     - msg: 文案留言，或语音 file id
-    ///     - textMsg: 留言文本
+    ///     - bgImg: 自定义背景图 file id；图片模版不传
     ///     - expireTime: 过期秒数，0 表示服务端默认 7 天
-    case send(groupKey: String, toUsers: [String], msgType: Int, msg: String, textMsg: String, expireTime: Int)
+    case send(
+        groupKey: String,
+        toUsers: [String],
+        msgType: Int,
+        msg: String,
+        bgImg: String,
+        expireTime: Int,
+        extra: [String: Any]?
+    )
     /// 已发送的传书记录
     case sent(groupKey: String)
     /// 收件箱
@@ -49,14 +57,17 @@ extension PigeonAPI: MultiTargetProtocol {
 
     var task: Moya.Task {
         switch self {
-        case let .send(groupKey, toUsers, msgType, msg, textMsg, expireTime):
+        case let .send(groupKey, toUsers, msgType, msg, bgImg, expireTime, extra):
             var params = Parameters()
             params["group_key"] = groupKey
             params["to_user"] = toUsers
             params["msg_type"] = msgType
             params["msg"] = msg
-            params["text_msg"] = textMsg
+            params["bg_img"] = bgImg.isEmpty ? 0 : bgImg
             params["expire_time"] = expireTime
+            if let extra {
+                params["extra"] = extra
+            }
             return .requestParameters(parameters: params, encoding: JSONEncoding())
         case let .sent(groupKey):
             var params = Parameters()

QuickLocation/API/UserAPI.swift

@@ -83,6 +83,9 @@ enum UserAPI {
     
     /// 紧急人邮箱
     case setEmail(email: String)
+
+    /// 关系列表
+    case relations
 }
 
 extension UserAPI: MultiTargetProtocol {
@@ -125,12 +128,14 @@ extension UserAPI: MultiTargetProtocol {
             return "mapi/bubble/operate"
         case .setEmail:
             return "mapi/user/signin/setemail"
+        case .relations:
+            return "mapi/user/relations"
         }
     }
     
     var method: Moya.Method {
         switch self {
-        case .userInfo, .userStatus, .signInInfo, .notice, .followList:
+        case .userInfo, .userStatus, .signInInfo, .notice, .followList, .relations:
             return .get
         case .changePhone, .setGender:
             return .put
@@ -229,6 +234,9 @@ extension UserAPI: MultiTargetProtocol {
             var params = Parameters()
             params["email"] = email
             return .requestParameters(parameters: params, encoding: JSONEncoding())
+
+        case .relations:
+            return .requestPlain
         }
     }
 }

QuickLocation/Assets.xcassets/Home/report_bolt.imageset/Contents.json

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

QuickLocation/Assets.xcassets/Home/report_phone.imageset/Contents.json

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

QuickLocation/Assets.xcassets/Home/report_screen.imageset/Contents.json

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

QuickLocation/Assets.xcassets/Home/report_usage.imageset/Contents.json

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

QuickLocation/Assets.xcassets/MemberInfo/Contents.json

@@ -0,0 +1,4 @@
+{
+  "info" : { "author" : "xcode", "version" : 1 },
+  "properties" : { "provides-namespace" : true }
+}

QuickLocation/Assets.xcassets/MemberInfo/close_circle.imageset/Contents.json

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

QuickLocation/Assets.xcassets/MemberInfo/gender_female_off.imageset/Contents.json

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

QuickLocation/Assets.xcassets/MemberInfo/gender_female_on.imageset/Contents.json

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

QuickLocation/Assets.xcassets/MemberInfo/gender_male_off.imageset/Contents.json

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

QuickLocation/Assets.xcassets/MemberInfo/gender_male_on.imageset/Contents.json

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

QuickLocation/Assets.xcassets/MemberInfo/gender_secret_off.imageset/Contents.json

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

QuickLocation/Assets.xcassets/MemberInfo/gender_secret_on.imageset/Contents.json

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

QuickLocation/Assets.xcassets/Mine/circle_days_pair.imageset/Contents.json

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

QuickLocation/Assets.xcassets/Mine/name_heart.imageset/Contents.json

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

QuickLocation/Assets.xcassets/Mine/quick_account.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/copy.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/mic_tab.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/record_btn.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/template_apology.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/template_apology_cover.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/template_arriving_soon.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/template_arriving_soon_cover.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/template_buy_for_me.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/template_buy_for_me_cover.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/template_come_play.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/template_come_play_cover.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/template_dislike_you.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/template_dislike_you_cover.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/template_miss_you.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/template_miss_you_cover.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/template_proud.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/template_proud_cover.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/template_who_upset_me.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/template_who_upset_me_cover.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/voice_chip_mic.imageset/Contents.json

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

QuickLocation/Assets.xcassets/PigeonMessage/voice_chip_play.imageset/Contents.json

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

QuickLocation/Assets.xcassets/SearchLocation/search_mascot.imageset/Contents.json

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