Liu Song’s Projects


~/Projects/mqtt-ios

git clone https://code.lsong.org/mqtt-ios

Commit

Commit
20a08dca5c30e38fcb8a0415ec6085056ce5e417
Author
Philipp Arndt <[email protected]>
Date
2022-01-02 14:58:51 +0100 +0100
Diffstat
 src/MQTTAnalyzer.xcodeproj/project.pbxproj | 26 
 src/MQTTAnalyzer/mqtt/cocoamqtt/CocoaMQTTClient.swift | 2 
 src/MQTTAnalyzer/views/host/form/EditHostFormView.swift | 10 
 src/MQTTAnalyzer/views/host/form/auth/certificates/ImportCertificatePicker.swift | 3 
 src/Podfile | 9 
 src/Podfile.lock | 1 

clean-up


diff --git a/src/MQTTAnalyzer/mqtt/cocoamqtt/CocoaMQTTClient.swift b/src/MQTTAnalyzer/mqtt/cocoamqtt/CocoaMQTTClient.swift
index 1aadc3b23872efdfbd5eb1b6914593b78d2ba8af..c53336ddf9529342d192af547a3d0aee78bc6818 100644
--- a/src/MQTTAnalyzer/mqtt/cocoamqtt/CocoaMQTTClient.swift
+++ b/src/MQTTAnalyzer/mqtt/cocoamqtt/CocoaMQTTClient.swift
@@ -92,7 +92,7 @@ 		mqtt.delegate = self.delgate
 		mqtt.didReceiveMessage = self.didReceiveMessage
 		mqtt.didDisconnect = self.didDisconnect
 		mqtt.didConnectAck = self.didConnect
-		mqtt.didChangeState = { mqtt, state in
+		mqtt.didChangeState = { _, state in
 			print(state)
 		}
 		




diff --git a/src/MQTTAnalyzer/views/host/form/EditHostFormView.swift b/src/MQTTAnalyzer/views/host/form/EditHostFormView.swift
index 14787b07a14b22e914edcd3854fdf1846e27e273..a0601c5c52a92fb9692978504a1c183d26262419 100644
--- a/src/MQTTAnalyzer/views/host/form/EditHostFormView.swift
+++ b/src/MQTTAnalyzer/views/host/form/EditHostFormView.swift
@@ -52,13 +52,3 @@ 			}
 		}
 	}
 }
-
-#if DEBUG
-//struct NewHostFormView_Previews : PreviewProvider {
-//	static var previews: some View {
-//		NavigationView {
-//			NewHostFormView(host: Host())
-//		}
-//	}
-//}
-#endif




diff --git a/src/MQTTAnalyzer/views/host/form/auth/certificates/ImportCertificatePicker.swift b/src/MQTTAnalyzer/views/host/form/auth/certificates/ImportCertificatePicker.swift
index 87b89cc9b1d37537f989c0c55e4b55e1763cd7f8..c9f2c45038c3ed0b6f177bcc656f1709d33dbd6f 100644
--- a/src/MQTTAnalyzer/views/host/form/auth/certificates/ImportCertificatePicker.swift
+++ b/src/MQTTAnalyzer/views/host/form/auth/certificates/ImportCertificatePicker.swift
@@ -8,6 +8,7 @@ //
 
 import SwiftUI
 import CoreServices
+import UniformTypeIdentifiers
 
 struct ImportCertificatePickerView: View {
 	var refreshHandler: CertificateFilesRefresh
@@ -23,7 +24,7 @@ 		}
 		.sheet(isPresented: self.$shows) {
 			DocumentPickerView(refresh: self.refreshHandler,
 //  ImportCertificatePicker.swift
-//  ImportCertificatePicker.swift
+import CoreServices
 		}
 	}
 	




diff --git a/src/MQTTAnalyzer.xcodeproj/project.pbxproj b/src/MQTTAnalyzer.xcodeproj/project.pbxproj
index 57bc964c1fa01be5668fda1516ed432daf8649a7..dff489af5d5b584ee1fd1e4436e629280fdd6129 100644
--- a/src/MQTTAnalyzer.xcodeproj/project.pbxproj
+++ b/src/MQTTAnalyzer.xcodeproj/project.pbxproj
@@ -24,6 +24,9 @@ 		223AF5D52477D5F5009810E6 /* FileItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 223AF5D42477D5F5009810E6 /* FileItemView.swift */; };
 		223AF5D72477D60A009810E6 /* PKCS12HelpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 223AF5D62477D60A009810E6 /* PKCS12HelpView.swift */; };
 		223AF5D92477D620009810E6 /* NoFilesHelpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 223AF5D82477D620009810E6 /* NoFilesHelpView.swift */; };
 		223AF5DB2477D64B009810E6 /* CertificateFileModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 223AF5DA2477D64B009810E6 /* CertificateFileModel.swift */; };
+		223E975E2677AF2F00EB34DC /* ResumeConnectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 223E975D2677AF2F00EB34DC /* ResumeConnectionView.swift */; };
+		223E97602677B25500EB34DC /* TopicLimitReachedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 223E975F2677B25500EB34DC /* TopicLimitReachedView.swift */; };
+		223E9762267DE9E500EB34DC /* MessageLimitReachedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 223E9761267DE9E500EB34DC /* MessageLimitReachedView.swift */; };
 		223EF0062387084D002ADF3E /* HostSetting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 223EF0052387084D002ADF3E /* HostSetting.swift */; };
 		223EF00823870AA5002ADF3E /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 223EF00723870AA5002ADF3E /* CloudKit.framework */; };
 		2253F8D622C8C007007E35A2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2253F8D522C8C007007E35A2 /* AppDelegate.swift */; };
@@ -163,6 +166,9 @@ 		223AF5D42477D5F5009810E6 /* FileItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileItemView.swift; sourceTree = ""; };
 		223AF5D62477D60A009810E6 /* PKCS12HelpView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PKCS12HelpView.swift; sourceTree = "<group>"; };
 		223AF5D82477D620009810E6 /* NoFilesHelpView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoFilesHelpView.swift; sourceTree = "<group>"; };
 		223AF5DA2477D64B009810E6 /* CertificateFileModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CertificateFileModel.swift; sourceTree = "<group>"; };
+		223E975D2677AF2F00EB34DC /* ResumeConnectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResumeConnectionView.swift; sourceTree = "<group>"; };
+		223E975F2677B25500EB34DC /* TopicLimitReachedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopicLimitReachedView.swift; sourceTree = "<group>"; };
+		223E9761267DE9E500EB34DC /* MessageLimitReachedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageLimitReachedView.swift; sourceTree = "<group>"; };
 		223EF0032382F99A002ADF3E /* MQTTAnalyzer.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MQTTAnalyzer.entitlements; sourceTree = "<group>"; };
 		223EF0052387084D002ADF3E /* HostSetting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = HostSetting.swift; path = MQTTAnalyzer/model/HostSetting.swift; sourceTree = SOURCE_ROOT; };
 		223EF00723870AA5002ADF3E /* CloudKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudKit.framework; path = System/Library/Frameworks/CloudKit.framework; sourceTree = SDKROOT; };
@@ -353,6 +359,16 @@ 			);
 			path = icloud;
 			sourceTree = "<group>";
 		};
+		223E975B2677AF1600EB34DC /* connection */ = {
+			isa = PBXGroup;
+			children = (
+				223E975F2677B25500EB34DC /* TopicLimitReachedView.swift */,
+				223E9761267DE9E500EB34DC /* MessageLimitReachedView.swift */,
+				223E975D2677AF2F00EB34DC /* ResumeConnectionView.swift */,
+			);
+			path = connection;
+			sourceTree = "<group>";
+		};
 		223EF0042387082E002ADF3E /* persistence */ = {
 			isa = PBXGroup;
 			children = (
@@ -547,6 +563,7 @@ 		};
 		2281048E2381769700112F24 /* topic */ = {
 			isa = PBXGroup;
 			children = (
+				223E975B2677AF1600EB34DC /* connection */,
 				2253F8DC22C8C007007E35A2 /* TopicsView.swift */,
 				228104922381773100112F24 /* TopicCellView.swift */,
 				228104902381770000112F24 /* ReconnectView.swift */,
@@ -945,6 +962,7 @@ 				228104982381796B00112F24 /* HostCellView.swift in Sources */,
 				229FCAEF247D6E2700490628 /* ImportCertificatePicker.swift in Sources */,
 				229005CF237E7A8600D5A706 /* HostModelPersistence.swift in Sources */,
 				22AF3AE72388858B001D9F87 /* NewHostFormDialog.swift in Sources */,
+				223E97602677B25500EB34DC /* TopicLimitReachedView.swift in Sources */,
 				226A6B5224445BA400ACDFC3 /* CocoaMQTTClient.swift in Sources */,
 				2253F8D622C8C007007E35A2 /* AppDelegate.swift in Sources */,
 				226A6B5824449F6200ACDFC3 /* ClientImplTypePicker.swift in Sources */,
@@ -963,6 +981,8 @@ 				223AF5D72477D60A009810E6 /* PKCS12HelpView.swift in Sources */,
 				2281048A2381740000112F24 /* MessageView.swift in Sources */,
 				2253F8D822C8C007007E35A2 /* SceneDelegate.swift in Sources */,
 		2291284724685A92006F8256 /* DataMigrationAuth.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2291284624685A92006F8256 /* DataMigrationAuth.swift */; };
+	objects = {
+		22C9F73123B78F9700892C4B /* PublishMessageFormView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22C9F73023B78F9700892C4B /* PublishMessageFormView.swift */; };
 	objects = {
 				22C9F74023BB5EA700892C4B /* MessageModel.swift in Sources */,
 				2256BDAA246FBE5100F92EFE /* DataMigrationEmptyTopic.swift in Sources */,
@@ -1005,6 +1025,8 @@ 				2291284524685A13006F8256 /* DataMigrationClientImpl.swift in Sources */,
 				228104952381779000112F24 /* TopicToolsView.swift in Sources */,
 				2205E5E1238A7EE2001638DF /* ButtonStyle.swift in Sources */,
 	objects = {
+
+/* Begin PBXBuildFile section */
 
 				22AE64342412636300C2C4FE /* DiagramPath.swift in Sources */,
 				220357232445D6F200A98CD3 /* ClientImplFormView.swift in Sources */,
@@ -1135,7 +1157,7 @@ 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1190,7 +1212,7 @@ 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;




diff --git a/src/Podfile b/src/Podfile
index 9d09cf4954ab61be7ba1500f266bc6bbcb43004d..1d0282e72e6f8ca2f8d74413a7167e35ca6e68e3 100644
--- a/src/Podfile
+++ b/src/Podfile
@@ -1,5 +1,14 @@
 # Uncomment the next line to define a global platform for your project
+platform :ios, '15.2'
+
+post_install do |installer|
+
 platform :ios, '14.3'
+	target.build_configurations.each do |config|
+	 config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.0'
+	end
+ end
+end
 
 target 'MQTTAnalyzer' do
   # Comment the next line if you don't want to use dynamic frameworks




diff --git a/src/Podfile.lock b/src/Podfile.lock
index 4826b494aaff62bbff794db28319509f46f8efc9..928d471d4f9dffcfdb266cfd6fe1cb5d0fe5f642 100644
--- a/src/Podfile.lock
+++ b/src/Podfile.lock
@@ -78,5 +79,6 @@   SwiftLint: 06ac37e4d38c7068e0935bb30cda95f093bec761
   SwiftyJSON: 2f33a42c6fbc52764d96f13368585094bfd8aa5e
 
   - CocoaMQTT/WebSockets (1.3.0-rc.1):
+  - CocoaAsyncSocket (7.6.5)
 
 COCOAPODS: 1.10.1