Selaa lähdekoodia

update fix force close

alqindiirsyam 7 kuukautta sitten
vanhempi
commit
15e3f399c4

+ 1 - 0
.gitignore

@@ -50,3 +50,4 @@ Podfile.lock
 ExampleCode/ExampleCode.xcodeproj/xcshareddata/xcschemes/ExampleCode.xcscheme
 NexilisLite/.DS_Store
 ExampleCode/ExampleCode/Info.plist
+ExampleCode/ExampleCode.xcodeproj/project.pbxproj

+ 4 - 4
ExampleCode/ExampleCode.xcodeproj/project.pbxproj

@@ -508,7 +508,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 4R36B4D29V;
+				DEVELOPMENT_TEAM = FR2C2CZUYZ;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -537,7 +537,7 @@
 				MARKETING_VERSION = 1.0;
 				OTHER_CFLAGS = "";
 				"OTHER_CFLAGS[arch=*]" = "-fstack-protector-all";
-				PRODUCT_BUNDLE_IDENTIFIER = io.nexilis.ExampleCode420;
+				PRODUCT_BUNDLE_IDENTIFIER = io.nexilis.ExampleCode;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
@@ -557,7 +557,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 4R36B4D29V;
+				DEVELOPMENT_TEAM = FR2C2CZUYZ;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -585,7 +585,7 @@
 				INFOPLIST_KEY_UIUserInterfaceStyle = Light;
 				MARKETING_VERSION = 1.0;
 				"OTHER_CFLAGS[arch=*]" = "-fstack-protector-all";
-				PRODUCT_BUNDLE_IDENTIFIER = io.nexilis.ExampleCode420;
+				PRODUCT_BUNDLE_IDENTIFIER = io.nexilis.ExampleCode;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;

+ 8 - 1
NexilisLite/NexilisLite/Source/FloatingButton/FloatingButton.swift

@@ -246,7 +246,14 @@ public class FloatingButton: UIView {
         if configModeFB != MODE_VERTICAL_FLOATING_BUTTON {
             return
         }
-        let task = URLSession.shared.dataTask(with: URL(string: (isDocked ? Utils.getUrlDock() : Utils.getIconCenter())!)!) { dataImage, response, error in
+        var urlFb = Utils.getIconCenter()
+        if isDocked {
+            urlFb = Utils.getUrlDock() ?? ""
+        }
+        if urlFb.isEmpty {
+            return
+        }
+        let task = URLSession.shared.dataTask(with: URL(string: (urlFb))!) { dataImage, response, error in
             if let error = error {
                 print("Failed to load data: \(error)")
                 return

+ 31 - 31
NexilisLite/NexilisLite/Source/Utils.swift

@@ -639,97 +639,97 @@ public final class Utils {
                 let json = Array(jsonArray)[0]
                 for i in 0..<json.keys.count {
                     if Array(json.keys)[i] == "app_builder_url_first_tab" {
-                        Utils.setURLFirstTab(value: Array(json.values)[i] as! String)
+                        Utils.setURLFirstTab(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "app_builder_url_third_tab" {
-                        Utils.setURLThirdTab(value: Array(json.values)[i] as! String)
+                        Utils.setURLThirdTab(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "app_builder_custom_tab" {
-                        Utils.setCustomTab(cust: Array(json.values)[i] as! String)
+                        Utils.setCustomTab(cust: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "app_builder_url_base" {
-                        Utils.setURLBase(value: Array(json.values)[i] as! String)
+                        Utils.setURLBase(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "app_builder_url_qms" {
-                        Utils.setURLQMS(value: Array(json.values)[i] as! String)
+                        Utils.setURLQMS(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "app_builder_icon_dock" {
-                        Utils.setIconDock(value: Array(json.values)[i] as! String)
+                        Utils.setIconDock(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "app_builder_icon_ss" {
-                        Utils.setIconSS(value: Array(json.values)[i] as! String)
+                        Utils.setIconSS(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "app_builder_background" {
-                        Utils.setBackground(value: Array(json.values)[i] as! String)
+                        Utils.setBackground(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "app_builder_url_privacy_policy" {
-                        Utils.setURLPrivacyPolicy(value: Array(json.values)[i] as! String)
+                        Utils.setURLPrivacyPolicy(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "app_builder_enable_privacy_policy" {
-                        Utils.setEnablePrivacyPolicy(value: Array(json.values)[i] as! String == "1" ? true : false)
+                        Utils.setEnablePrivacyPolicy(value: Array(json.values)[i] as? String == "1" ? true : false)
                     }
                     if Array(json.keys)[i] == "pb_fb_icon_center_self_mode2" {
-                        Utils.setIconCenterAnim2(value: Array(json.values)[i] as! String)
+                        Utils.setIconCenterAnim2(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "pb_fb_icon_center_self_mode4" {
-                        Utils.setIconCenterAnim4(value: Array(json.values)[i] as! String)
+                        Utils.setIconCenterAnim4(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "app_builder_ac_theme" {
-                        Utils.setACTheme(value: Array(json.values)[i] as! String)
+                        Utils.setACTheme(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "app_builder_button_url" {
-                        Utils.setButtonURL(value: Array(json.values)[i] as! String)
+                        Utils.setButtonURL(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "app_builder_custom_buttons" {
-                        Utils.setCustomButtons(value: Array(json.values)[i] as! String)
+                        Utils.setCustomButtons(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "app_builder_enable_mobile_builder" {
-                        Utils.setEnableMobileBuilder(value: Array(json.values)[i] as! String)
+                        Utils.setEnableMobileBuilder(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "app_builder_enable_mobile_builder" {
-                        Utils.setEnableMobileBuilder(value: Array(json.values)[i] as! String)
+                        Utils.setEnableMobileBuilder(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "fb_config_mode" {
-                        Utils.setConfigModeFB(value: Array(json.values)[i] as! String)
+                        Utils.setConfigModeFB(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "app_builder_button_icon" {
-                        Utils.setCustomFBIcon(value: Array(json.values)[i] as! String)
+                        Utils.setCustomFBIcon(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "fb_floating_anim" {
-                        Utils.setFloatingAnim(value: Array(json.values)[i] as! String)
+                        Utils.setFloatingAnim(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "fb_icon_with_bg" {
-                        Utils.setFBIconBg(value: Array(json.values)[i] as! String)
+                        Utils.setFBIconBg(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "fb_item_with_bg" {
-                        Utils.setFBItemBg(value: Array(json.values)[i] as! String)
+                        Utils.setFBItemBg(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "user_agent" {
-                        Utils.setUserAgent(value: Array(json.values)[i] as! String)
+                        Utils.setUserAgent(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "app_builder_background_light" {
-                        Utils.setBackgroundLight(value: Array(json.values)[i] as! String)
+                        Utils.setBackgroundLight(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "app_builder_background_dark" {
-                        Utils.setBackgroundDark(value: Array(json.values)[i] as! String)
+                        Utils.setBackgroundDark(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "sms_center" {
-                        Utils.setSMSCenter(value: Array(json.values)[i] as! String)
+                        Utils.setSMSCenter(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "whatsapp_center" {
-                        Utils.setWhatsappCenter(value: Array(json.values)[i] as! String)
+                        Utils.setWhatsappCenter(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "call_center" {
-                        Utils.setCallCenter(value: Array(json.values)[i] as! String)
+                        Utils.setCallCenter(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "enable_valid_trans" {
-                        Utils.setValidTrans(value: Array(json.values)[i] as! String)
+                        Utils.setValidTrans(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "chatbot_greetings" {
-                        Utils.setValidTrans(value: Array(json.values)[i] as! String)
+                        Utils.setValidTrans(value: Array(json.values)[i] as? String ?? "")
                     }
                     if Array(json.keys)[i] == "fb_icon_center" {
-                        Utils.setIconCenter(value: Array(json.values)[i] as! String)
+                        Utils.setIconCenter(value: Array(json.values)[i] as? String ?? "")
                     }
                 }
                 Utils.setFinishInitPrefs(value: true)