alqindiirsyam 2 lat temu
rodzic
commit
4a4b94d064

+ 2 - 2
appbuilder-ios/AppBuilder/AppBuilder.xcodeproj/project.pbxproj

@@ -536,7 +536,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.8;
+				MARKETING_VERSION = 2.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = io.newuniverse.AppBuilder1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -568,7 +568,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.8;
+				MARKETING_VERSION = 2.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = io.newuniverse.AppBuilder1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

+ 1 - 0
appbuilder-ios/AppBuilder/AppBuilder/FirstTabViewController.swift

@@ -171,6 +171,7 @@ class FirstTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
             self.webView.scrollView.setContentOffset(CGPoint.zero, animated: true)
         }
         self.webView.evaluateJavaScript("{if(pauseAll){pauseAll();}}")
+        self.webView.evaluateJavaScript("hideAddToCart();")
     }
     
     func scrollViewDidScroll(_ scrollView: UIScrollView) {

+ 4 - 4
appbuilder-ios/AppBuilder/AppBuilder/Info.plist

@@ -6,10 +6,6 @@
 	<array>
 		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	</array>
-    <key>NSUserActivityTypes</key>
-    <array>
-      <string>INSendMessageIntent</string>
-    </array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -46,6 +42,10 @@
 	<string>Get File Photos from Local Dictionary for Send Message and Content Creation.</string>
 	<key>NSSpeechRecognitionUsageDescription</key>
 	<string>Used for speech recognition features.</string>
+	<key>NSUserActivityTypes</key>
+	<array>
+		<string>INSendMessageIntent</string>
+	</array>
 	<key>UIAppFonts</key>
 	<array>
 		<string>Poppins-Light.ttf</string>

+ 1 - 0
appbuilder-ios/AppBuilder/AppBuilder/ThirdTabViewController.swift

@@ -181,6 +181,7 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
         view.endEditing(true)
         resignFirstResponder()
         ThirdTabViewController.inView = false
+        self.webView.evaluateJavaScript("hideAddToCart();")
     }
     
     func scrollViewDidScroll(_ scrollView: UIScrollView) {

+ 15 - 15
appbuilder-ios/AppBuilder/NotificationService/Info.plist

@@ -2,20 +2,20 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>NSExtension</key>
-    <dict>
-        <key>NSExtensionAttributes</key>
-        <dict>
-            <key>IntentsSupported</key>
-            <array>
-                <string>INSendMessageIntent</string>
-                <string></string>
-            </array>
-        </dict>
-        <key>NSExtensionPointIdentifier</key>
-        <string>com.apple.usernotifications.service</string>
-        <key>NSExtensionPrincipalClass</key>
-        <string>$(PRODUCT_MODULE_NAME).NotificationService</string>
-    </dict>
+	<key>NSExtension</key>
+	<dict>
+		<key>NSExtensionAttributes</key>
+		<dict>
+			<key>IntentsSupported</key>
+			<array>
+				<string>INSendMessageIntent</string>
+				<string></string>
+			</array>
+		</dict>
+		<key>NSExtensionPointIdentifier</key>
+		<string>com.apple.usernotifications.service</string>
+		<key>NSExtensionPrincipalClass</key>
+		<string>$(PRODUCT_MODULE_NAME).NotificationService</string>
+	</dict>
 </dict>
 </plist>

+ 1 - 1
appbuilder-ios/NexilisLite/NexilisLite/Resource/id.lproj/Localizable.strings

@@ -288,4 +288,4 @@
 "Are you sure want to unset" = "Apakah anda ingin menghapus";
 "from CS Account?" = "dari Akun CS";
 "from Internal Account?" = "dari Akun Internal";
-"Invalid Password" = "Kata sandi salah";
+"Invalid password" = "Kata sandi salah";

+ 11 - 8
appbuilder-ios/NexilisLite/NexilisLite/Source/Extension.swift

@@ -759,14 +759,17 @@ extension String {
                 }
             }
             if !isEditing {
-                let listText = finalText.string.split(separator: " ")
-                for i in 0...listText.count - 1 {
-                    if listText[i].lowercased().checkStartWithLink() {
-                        if ((listText[i].lowercased().starts(with: "www.") && listText[i].lowercased().split(separator: ".").count >= 3) || (!listText[i].lowercased().starts(with: "www.") && listText[i].lowercased().split(separator: ".").count >= 2)) && listText[i].lowercased().split(separator: ".").last!.count >= 2 {
-                            if let range: Range<String.Index> = finalText.string.range(of: listText[i]) {
-                                let index: Int = finalText.string.distance(from: finalText.string.startIndex, to: range.lowerBound)
-                                finalText.addAttribute(.foregroundColor, value: UIColor.linkColor, range: NSRange(index...index + listText[i].count - 1))
-                                finalText.addAttribute(.underlineStyle, value: NSUnderlineStyle.thick.rawValue, range: NSRange(index...index + listText[i].count - 1))
+                let listTextEnter = finalText.string.split(separator: "\n")
+                for j in 0...listTextEnter.count - 1 {
+                    let listText = listTextEnter[j].split(separator: " ")
+                    for i in 0...listText.count - 1 {
+                        if listText[i].lowercased().checkStartWithLink() {
+                            if ((listText[i].lowercased().starts(with: "www.") && listText[i].lowercased().split(separator: ".").count >= 3) || (!listText[i].lowercased().starts(with: "www.") && listText[i].lowercased().split(separator: ".").count >= 2)) && listText[i].lowercased().split(separator: ".").last!.count >= 2 {
+                                if let range: Range<String.Index> = finalText.string.range(of: listText[i]) {
+                                    let index: Int = finalText.string.distance(from: finalText.string.startIndex, to: range.lowerBound)
+                                    finalText.addAttribute(.foregroundColor, value: UIColor.linkColor, range: NSRange(index...index + listText[i].count - 1))
+                                    finalText.addAttribute(.underlineStyle, value: NSUnderlineStyle.thick.rawValue, range: NSRange(index...index + listText[i].count - 1))
+                                }
                             }
                         }
                     }

+ 17 - 6
appbuilder-ios/NexilisLite/NexilisLite/Source/Nexilis.swift

@@ -431,12 +431,12 @@ public class Nexilis: NSObject {
     }
 
     
-    public static func initiateAudio() {
-        do {
-            try AVAudioSession.sharedInstance().setPreferredSampleRate(AVAudioSession.sharedInstance().sampleRate)
-        } catch {
-        }
-    }
+//    public static func initiateAudio() {
+//        do {
+//            try AVAudioSession.sharedInstance().setPreferredSampleRate(AVAudioSession.sharedInstance().sampleRate)
+//        } catch {
+//        }
+//    }
     
 //    public static func startAudio(isVideo: Bool = true) {
 //        do {
@@ -1679,6 +1679,17 @@ extension Nexilis: CallDelegate {
                     controller.user = User.getData(pin: String(deviceId))
                     controller.isOutgoing = false
                     controller.modalPresentationStyle = .overCurrentContext
+                    if UIApplication.shared.visibleViewController is UIAlertController {
+                        let vc = UIApplication.shared.visibleViewController as! UIAlertController
+                        vc.dismiss(animated: true, completion: {
+                            if UIApplication.shared.visibleViewController?.navigationController != nil {
+                                UIApplication.shared.visibleViewController?.navigationController?.present(controller, animated: true, completion: nil)
+                            } else {
+                                UIApplication.shared.visibleViewController?.present(controller, animated: true, completion: nil)
+                            }
+                        })
+                        return
+                    }
                     if UIApplication.shared.visibleViewController?.navigationController != nil {
                         UIApplication.shared.visibleViewController?.navigationController?.present(controller, animated: true, completion: nil)
                     } else {

+ 2 - 1
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Call/QmeraAudioViewController.swift

@@ -376,7 +376,8 @@ class QmeraAudioViewController: UIViewController {
             } else {
                 self.users.append(user)
                 // Start Calling
-                Nexilis.shared.callManager.startCall(handle: user.pin)
+//                Nexilis.shared.callManager.startCall(handle: user.pin)
+                API.initiateCCall(sParty: user.pin)
             }
         }
         controller.selectedUser.append(contentsOf: users)

+ 5 - 1
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Call/QmeraVideoViewController.swift

@@ -887,7 +887,11 @@ class QmeraVideoViewController: UIViewController {
         else if (state == 34){
             if(arrayMessage[3] == "0"){
                 DispatchQueue.main.async {
-                    self.zoomView.transform = CGAffineTransform.init(scaleX: 1.9, y: 1.9).rotated(by: (CGFloat.pi)/2)
+                    if self.dataPerson.count == 1 && arrayMessage[2] == "1" && arrayMessage[4] == "1" {
+                        self.zoomView.transform = CGAffineTransform.init(scaleX: 1.9, y: 1.9).rotated(by: (CGFloat.pi * 3)/2)
+                    } else {
+                        self.zoomView.transform = CGAffineTransform.init(scaleX: 1.9, y: 1.9).rotated(by: (CGFloat.pi)/2)
+                    }
                 }
             }
         }

+ 11 - 7
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Chat/EditorPersonal.swift

@@ -4413,13 +4413,17 @@ extension EditorPersonal: UITableViewDelegate, UITableViewDataSource {
         }
         messageText.isUserInteractionEnabled = true
         if !textChat.isEmpty {
-            let listText = textChat.split(separator: " ")
-            for i in 0...listText.count - 1 {
-                if listText[i].lowercased().checkStartWithLink() {
-                    if ((listText[i].lowercased().starts(with: "www.") && listText[i].lowercased().split(separator: ".").count >= 3) || (!listText[i].lowercased().starts(with: "www.") && listText[i].lowercased().split(separator: ".").count >= 2)) && listText[i].lowercased().split(separator: ".").last!.count >= 2 {
-                        let objectGesture = ObjectGesture(target: self, action: #selector(tapMessageText(_:)))
-                        objectGesture.message_id = "\(listText[i])"
-                        messageText.addGestureRecognizer(objectGesture)
+            let listTextEnter = textChat.split(separator: "\n")
+            for j in 0...listTextEnter.count - 1 {
+                let listText = listTextEnter[j].split(separator: " ")
+                for i in 0...listText.count - 1 {
+                    print("HMM \(listText[i].lowercased().checkStartWithLink())")
+                    if listText[i].lowercased().checkStartWithLink() {
+                        if ((listText[i].lowercased().starts(with: "www.") && listText[i].lowercased().split(separator: ".").count >= 3) || (!listText[i].lowercased().starts(with: "www.") && listText[i].lowercased().split(separator: ".").count >= 2)) && listText[i].lowercased().split(separator: ".").last!.count >= 2 {
+                            let objectGesture = ObjectGesture(target: self, action: #selector(tapMessageText(_:)))
+                            objectGesture.message_id = "\(listText[i])"
+                            messageText.addGestureRecognizer(objectGesture)
+                        }
                     }
                 }
             }