- mqtt 签到

- SOS UI
- 发送 快捷消息、表情
This commit is contained in:
linshujie 2026-06-18 18:24:58 +08:00
parent 6f21e9a9e9
commit 5fc06a11c2
172 changed files with 1273 additions and 162 deletions

View File

@ -18,7 +18,7 @@ target 'QuickLocation' do
pod 'RxDataSources'
pod 'RxSwiftExt'
pod 'SwiftDate'
#pod 'RxGesture'
pod 'RxGesture'
pod 'CocoaLumberjack/Swift'
pod 'KingfisherWebP'
pod 'Masonry'

View File

@ -132,6 +132,9 @@ PODS:
- Differentiator (~> 5.0)
- RxCocoa (~> 6.0)
- RxSwift (~> 6.0)
- RxGesture (4.0.4):
- RxCocoa (~> 6.0)
- RxSwift (~> 6.0)
- RxRelay (6.8.0):
- RxSwift (= 6.8.0)
- RxSwift (6.8.0)
@ -192,6 +195,7 @@ DEPENDENCIES:
- Popover
- RxCocoa
- RxDataSources
- RxGesture
- RxSwift
- RxSwiftExt
- SDCycleScrollView
@ -246,6 +250,7 @@ SPEC REPOS:
- Popover
- RxCocoa
- RxDataSources
- RxGesture
- RxRelay
- RxSwift
- RxSwiftExt
@ -310,6 +315,7 @@ SPEC CHECKSUMS:
Popover: 10e1d9528f81d9504df984b7b3f491292bc1822d
RxCocoa: 2d33c1e1e5d66492052ad46b11024ae287572880
RxDataSources: aa47cc1ed6c500fa0dfecac5c979b723542d79cf
RxGesture: f3efb47ed2d26a8082f7b660d4a59970e275a7f8
RxRelay: 335c78b926a2aea8d863a6d25f1ed3b5ad8e8705
RxSwift: 4e28be97cbcfeee614af26d83415febbf2bf6f45
RxSwiftExt: 43aaacb6a4d3c69c55e9d1cf4f79920043d13583
@ -328,6 +334,6 @@ SPEC CHECKSUMS:
YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
ZXSDK: 786338c0a18e98e03eda00699c3bfd2700b97117
PODFILE CHECKSUM: 0b13abaab81fbf89876a935ff6457fbe0baf31d2
PODFILE CHECKSUM: 4d254b7f0c48f2a2100703f9ac600d5d826b586a
COCOAPODS: 1.16.2

View File

@ -192,6 +192,9 @@
30CCDE512FE2785D00F5214A /* SignInVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30CCDE502FE2785D00F5214A /* SignInVC.swift */; };
30CCDE532FE2786600F5214A /* SignInView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30CCDE522FE2786600F5214A /* SignInView.swift */; };
30CCDE552FE2903100F5214A /* SignInModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30CCDE542FE2903100F5214A /* SignInModel.swift */; };
30CCDE582FE39F8C00F5214A /* SOSView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30CCDE572FE39F8C00F5214A /* SOSView.swift */; };
30CCDE5A2FE39F9D00F5214A /* SOSViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30CCDE592FE39F9D00F5214A /* SOSViewController.swift */; };
30CCDE5C2FE3A1A800F5214A /* SOSPracticeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30CCDE5B2FE3A1A800F5214A /* SOSPracticeView.swift */; };
30D87CDB2FDFA9EE00E958FD /* MQTTService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30D87CDA2FDFA9EE00E958FD /* MQTTService.swift */; };
30D87CDD2FDFF07500E958FD /* InteractionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30D87CDC2FDFF07500E958FD /* InteractionView.swift */; };
30D87CDF2FDFF1A100E958FD /* QuickMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30D87CDE2FDFF1A100E958FD /* QuickMessageView.swift */; };
@ -435,6 +438,9 @@
30CCDE502FE2785D00F5214A /* SignInVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInVC.swift; sourceTree = "<group>"; };
30CCDE522FE2786600F5214A /* SignInView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInView.swift; sourceTree = "<group>"; };
30CCDE542FE2903100F5214A /* SignInModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInModel.swift; sourceTree = "<group>"; };
30CCDE572FE39F8C00F5214A /* SOSView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SOSView.swift; sourceTree = "<group>"; };
30CCDE592FE39F9D00F5214A /* SOSViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SOSViewController.swift; sourceTree = "<group>"; };
30CCDE5B2FE3A1A800F5214A /* SOSPracticeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SOSPracticeView.swift; sourceTree = "<group>"; };
30D87CDA2FDFA9EE00E958FD /* MQTTService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MQTTService.swift; sourceTree = "<group>"; };
30D87CDC2FDFF07500E958FD /* InteractionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InteractionView.swift; sourceTree = "<group>"; };
30D87CDE2FDFF1A100E958FD /* QuickMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickMessageView.swift; sourceTree = "<group>"; };
@ -489,7 +495,17 @@
/* End PBXFileReference section */
/* Begin PBXFileSystemSynchronizedRootGroup section */
3070777D2FD2A214004C37CC /* lotties */ = {
30CCDF8E2FE3E63B00F5214A /* sound */ = {
isa = PBXFileSystemSynchronizedRootGroup;
path = sound;
sourceTree = "<group>";
};
30CCDF902FE3E63B00F5214A /* video */ = {
isa = PBXFileSystemSynchronizedRootGroup;
path = video;
sourceTree = "<group>";
};
30CCE01E2FE3E64700F5214A /* lotties */ = {
isa = PBXFileSystemSynchronizedRootGroup;
path = lotties;
sourceTree = "<group>";
@ -812,7 +828,6 @@
305A75392FCA8C7000227D26 /* Font */ = {
isa = PBXGroup;
children = (
3070777D2FD2A214004C37CC /* lotties */,
305A75342FCA8C7000227D26 /* D-DIN-PRO-500-Medium.otf */,
305A75352FCA8C7000227D26 /* douyu.otf */,
305A75362FCA8C7000227D26 /* pmzd.ttf */,
@ -825,6 +840,9 @@
305A76192FCA8C7000227D26 /* Resource */ = {
isa = PBXGroup;
children = (
30CCE01E2FE3E64700F5214A /* lotties */,
30CCDF8E2FE3E63B00F5214A /* sound */,
30CCDF902FE3E63B00F5214A /* video */,
305A75392FCA8C7000227D26 /* Font */,
);
path = Resource;
@ -876,6 +894,7 @@
30D87CDE2FDFF1A100E958FD /* QuickMessageView.swift */,
30D87CDC2FDFF07500E958FD /* InteractionView.swift */,
30CCDE4F2FE2782700F5214A /* SignIn */,
30CCDE562FE39F6B00F5214A /* SOS */,
);
path = Home;
sourceTree = "<group>";
@ -1212,6 +1231,16 @@
path = SignIn;
sourceTree = "<group>";
};
30CCDE562FE39F6B00F5214A /* SOS */ = {
isa = PBXGroup;
children = (
30CCDE592FE39F9D00F5214A /* SOSViewController.swift */,
30CCDE572FE39F8C00F5214A /* SOSView.swift */,
30CCDE5B2FE3A1A800F5214A /* SOSPracticeView.swift */,
);
path = SOS;
sourceTree = "<group>";
};
30D87CD52FDF9F1900E958FD /* MQTT */ = {
isa = PBXGroup;
children = (
@ -1375,7 +1404,9 @@
dependencies = (
);
fileSystemSynchronizedGroups = (
3070777D2FD2A214004C37CC /* lotties */,
30CCDF8E2FE3E63B00F5214A /* sound */,
30CCDF902FE3E63B00F5214A /* video */,
30CCE01E2FE3E64700F5214A /* lotties */,
30D87CEF2FDFF52100E958FD /* TTGTagCollectionView */,
);
name = QuickLocation;
@ -1576,6 +1607,7 @@
305A76B32FCA8C7000227D26 /* UILabel+Extension.swift in Sources */,
305A76B42FCA8C7000227D26 /* UINavigationController+FDFullscreenPopGesture.m in Sources */,
305A76B52FCA8C7000227D26 /* UITableView+Extension.swift in Sources */,
30CCDE582FE39F8C00F5214A /* SOSView.swift in Sources */,
30EFF3E02FDA9CE300EB35D4 /* EmergencyContactModel.swift in Sources */,
305A76B62FCA8C7000227D26 /* UITextField+Extensions.swift in Sources */,
30EFF3A82FD7C6A400EB35D4 /* GroupSettingViewModel.swift in Sources */,
@ -1643,6 +1675,7 @@
30EFF3B52FD8F1D000EB35D4 /* ReviewMemberListVC.swift in Sources */,
30BAB84D2FCD2FDE00C33B5C /* InviteJoinView.swift in Sources */,
30EFF3CF2FDA669800EB35D4 /* MyProfileVC.swift in Sources */,
30CCDE5C2FE3A1A800F5214A /* SOSPracticeView.swift in Sources */,
30EFF3E52FDAA93400EB35D4 /* PrivacyPolicyVC.swift in Sources */,
305A76E22FCA8C7000227D26 /* GroupViewModel.swift in Sources */,
30CCDE4E2FE26CEA00F5214A /* PayResultPopVC.swift in Sources */,
@ -1663,6 +1696,7 @@
30EFF2992FD65FB000EB35D4 /* VoicePlayerManager.swift in Sources */,
305A76EA2FCA8C7000227D26 /* OneTapLoginView.swift in Sources */,
305A76EB2FCA8C7000227D26 /* CircleMember.swift in Sources */,
30CCDE5A2FE39F9D00F5214A /* SOSViewController.swift in Sources */,
305A76EC2FCA8C7000227D26 /* MemberAnnotation.swift in Sources */,
305A76ED2FCA8C7000227D26 /* MemberAnnotationView.swift in Sources */,
30BAB8532FCD337C00C33B5C /* GroupService.swift in Sources */,

View File

@ -53,6 +53,13 @@ enum UserAPI {
/// 退出登录
case logout
/// 发送快捷消息、表情
/// - Parameters:
/// - target_uid: 对方的user_id
/// - group_key:频道的key
/// - emote_idx:表情符号的下标
case sendEmote(emoteIdx: Int, groupKey: String, targetUid: String)
}
extension UserAPI: MultiTargetProtocol {
@ -81,6 +88,8 @@ extension UserAPI: MultiTargetProtocol {
return "mapi/user/account"
case .logout:
return "api/user/logout"
case .sendEmote:
return "mapi/user/sendemote"
}
}
@ -151,6 +160,13 @@ extension UserAPI: MultiTargetProtocol {
case .logout:
return .requestParameters(parameters: Parameters(), encoding: JSONEncoding())
case let .sendEmote(emoteIdx, groupKey, targetUid):
var params = Parameters()
params["emote_idx"] = emoteIdx
params["group_key"] = groupKey
params["target_uid"] = targetUid
return .requestParameters(parameters: params, encoding: JSONEncoding())
}
}
}

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 172 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 311 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 131 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 238 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 149 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 279 KiB

View File

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

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 105 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

@ -12,6 +12,7 @@ import ObjectMapper
extension DefaultsKeys {
var userConfig: DefaultsKey<Data?> { .init("UserConfig") }
var loginToken: DefaultsKey<String?> { .init("LoginToken") }
var sosIsPracticeList: DefaultsKey<[String]> { .init("sosIsPractice", defaultValue: []) }
var searchHistory: DefaultsKey<[String: [String]]?> { .init("searchHistory") }
var locationHistory: DefaultsKey<[String: [[String: Any]]]?> { .init("locationHistory") }
var searchShopHistory: DefaultsKey<[String]> { .init("searchShopHistory", defaultValue: []) }

View File

@ -62,6 +62,10 @@ class AppContextManager: NSObject {
var vip: Int {
account?.vip ?? 1
}
/// 状态:0、无状态 1、SOS 2、气泡等
var status: Int {
account?.status ?? 0
}
@discardableResult
public func saveAccount(_ account: UserConfigModel) -> Bool {

View File

@ -33,7 +33,10 @@ struct UserConfigModel: Mappable {
var vip_name: String = ""
/// 会员过期时间
var vip_expire_time: String = ""
/// 状态:0、无状态 1、SOS 2、气泡等
var status: Int = 0
/// 心情:0、无状态 1、开心 2、愤怒
var mood: Int = 0
/// Config
var config: SystemConfigModel?
@ -54,6 +57,8 @@ struct UserConfigModel: Mappable {
vip <- map["vip"]
vip_name <- map["vip_name"]
vip_expire_time <- map["vip_expire_time"]
status <- map["status"]
mood <- map["mood"]
}
}

View File

@ -21,7 +21,7 @@ enum MqttType: String, Codable {
case leave = "leave" // 离开群
case dismiss = "dismiss" // 解散群
case kick = "kick" // 踢人
case signIn = "signin" // 签到
case signIn = "signIn" // 签到
case sos = "sos" // 求助
case needTrack = "needtrack" // 追踪上报
case emote = "emote" // 接收表情
@ -65,6 +65,7 @@ struct MqttIncomingData: Decodable {
let battery: String?
let index: Int?
let group_key: String?
let user_id: String?
}
// MARK: - MQTTService

View File

@ -1 +0,0 @@
{"v":"5.12.1","fr":25,"ip":0,"op":110,"w":375,"h":375,"nm":"合成 1","ddd":0,"assets":[{"id":"image_0","w":480,"h":480,"u":"images/","p":"dialog_buy_vip3_img_0.png","e":0},{"id":"image_1","w":192,"h":160,"u":"images/","p":"dialog_buy_vip3_img_1.png","e":0}],"layers":[{"ddd":0,"ind":1,"ty":2,"nm":"image 112.png","cl":"png","refId":"image_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[306,117.5,0],"to":[0,0,0],"ti":[117,4,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":18.462,"s":[226,248,0],"to":[-117,-4,0],"ti":[-39.5,36,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":36.923,"s":[125,136,0],"to":[6.063,-5.526,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":55.385,"s":[232.5,144,0],"to":[0,0,0],"ti":[140.5,-22,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":73.846,"s":[167.5,284,0],"to":[-140.5,22,0],"ti":[-39.436,13.632,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":92.308,"s":[73.5,227,0],"to":[40.5,-14,0],"ti":[-22,-19,0]},{"t":110.76953125,"s":[212.5,285.5,0]}],"ix":2,"l":2},"a":{"a":0,"k":[243.995,243.45,0],"ix":1,"l":2},"s":{"a":0,"k":[11.792,11.792,100],"ix":6,"l":2}},"ao":1,"ip":0,"op":126,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":2,"nm":"图层 30 1.png","cl":"png","refId":"image_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[195,210.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":18.445,"s":[195,181.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":22,"s":[195,197.089,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":36.892,"s":[195,210.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":55.337,"s":[195,181.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":73.783,"s":[195,210.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":92.229,"s":[195,181.5,0],"to":[0,0,0],"ti":[0,0,0]},{"t":110.673828125,"s":[195,210.5,0]}],"ix":2,"l":2},"a":{"a":0,"k":[96,80,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":126,"st":0,"bm":0}],"markers":[],"props":{}}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +0,0 @@
{"v":"5.12.1","fr":25,"ip":0,"op":37,"w":375,"h":200,"nm":"合成 1","ddd":0,"assets":[{"id":"image_0","w":69,"h":65,"u":"images/","p":"register_tip1_img_0.png","e":0}],"layers":[{"ddd":0,"ind":1,"ty":2,"nm":"飞机/注册正式账号_1.psd","cl":"psd","refId":"image_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":-15,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.565,"y":0.565},"o":{"x":0.167,"y":0.167},"t":0,"s":[429.5,149,0],"to":[0,0,0],"ti":[88.067,15.427,0]},{"i":{"x":0.681,"y":0.681},"o":{"x":0.328,"y":0.328},"t":12.771,"s":[270.7,73.817,0],"to":[-85.438,-5.2,0],"ti":[41.982,-11.584,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.432,"y":0.432},"t":25.537,"s":[94.263,80.701,0],"to":[-64.13,16.953,0],"ti":[-18.078,5.815,0]},{"t":37.048828125,"s":[-54,127.5,0]}],"ix":2,"l":2},"a":{"a":0,"k":[34.5,32.5,0],"ix":1,"l":2},"s":{"a":0,"k":[100,-100,100],"ix":6,"l":2}},"ao":1,"ip":0,"op":37,"st":-232,"bm":0}],"markers":[],"props":{}}

View File

@ -1 +0,0 @@
{"v":"5.12.1","fr":25,"ip":0,"op":38,"w":375,"h":200,"nm":"合成 1","ddd":0,"assets":[{"id":"image_0","w":69,"h":65,"u":"images/","p":"register_tip1_img_0.png","e":0}],"layers":[{"ddd":0,"ind":1,"ty":2,"nm":"飞机/注册正式账号_1.psd","cl":"psd","refId":"image_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":-15,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.562,"y":0.562},"o":{"x":0.167,"y":0.167},"t":0,"s":[-44.5,30,0],"to":[0,0,0],"ti":[-76.433,-21.573,0]},{"i":{"x":0.658,"y":0.658},"o":{"x":0.315,"y":0.315},"t":10.014,"s":[71.45,105.317,0],"to":[32.062,9.05,0],"ti":[-46.518,-1.084,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.415,"y":0.415},"t":18.995,"s":[195.513,124.951,0],"to":[102.87,2.453,0],"ti":[-18.078,5.815,0]},{"t":37.048828125,"s":[448,112.5,0]}],"ix":2,"l":2},"a":{"a":0,"k":[34.5,32.5,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":1,"ip":0,"op":38,"st":-232,"bm":0}],"markers":[],"props":{}}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 94 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 134 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 123 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 184 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

Some files were not shown because too many files have changed in this diff Show More