Browse Source

bugs fixed and progress add friend request

alqindiirsyam 4 tháng trước cách đây
mục cha
commit
ca203591fd

+ 3 - 3
AppBuilder/AppBuilder/FirstTabViewController.swift

@@ -241,7 +241,6 @@ class FirstTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
     
     @objc func onRefreshWebView(notification: NSNotification) {
         FirstTabViewController.forceRefresh = true
-        processURL()
     }
     
     override func viewWillDisappear(_ animated: Bool) {
@@ -272,8 +271,9 @@ class FirstTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
     }
 
     @objc func reloadWebView(_ sender: UIRefreshControl) {
-        FirstTabViewController.forceRefresh = true
-        viewWillAppear(false)
+//        FirstTabViewController.forceRefresh = true
+//        viewWillAppear(false)
+        webView.reload()
         ViewController.alwaysHideButton = false
         showTabBar()
         sender.endRefreshing()

+ 3 - 2
AppBuilder/AppBuilder/ThirdTabViewController.swift

@@ -276,8 +276,9 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
     }
     
     @objc func reloadWebView(_ sender: UIRefreshControl) {
-        ThirdTabViewController.forceRefresh = true
-        viewWillAppear(false)
+//        ThirdTabViewController.forceRefresh = true
+//        viewWillAppear(false)
+        webView.reload()
         ViewController.alwaysHideButton = false
         showTabBar()
         sender.endRefreshing()

+ 28 - 4
AppBuilder/AppBuilderShare/ShareViewController.swift

@@ -29,6 +29,7 @@ class ShareViewController: UIViewController, UITableViewDelegate, UITableViewDat
     var selectedImage: URL!
     var selectedVideo: URL!
     var selectedFile: URL!
+    var selectedImageTypeImage: UIImage!
     private var previewView: VideoPreviewView?
     let previewController = QLPreviewController()
     let nameGroupShare = "group.nexilis.share"
@@ -148,13 +149,18 @@ class ShareViewController: UIViewController, UITableViewDelegate, UITableViewDat
                 dataShared["idContact"] = selectedContact.id
                 dataShared["data"] = textView.text
                 if typeShareNum == TypeShare.image {
-                    let compressedImageName = "Nexilis_image_\(Int(Date().timeIntervalSince1970 * 1000))_\(selectedImage.lastPathComponent)"
-                    let thumbName = "THUMB_Nexilis_image_\(Int(Date().timeIntervalSince1970 * 1000))_\(selectedImage.lastPathComponent)"
+                    let compressedImageName = "Nexilis_image_\(Int(Date().timeIntervalSince1970 * 1000))_\(selectedImage != nil ? selectedImage.lastPathComponent : "SS_Image")"
+                    let thumbName = "THUMB_Nexilis_image_\(Int(Date().timeIntervalSince1970 * 1000))_\(selectedImage != nil ? selectedImage.lastPathComponent : "SS_Image")"
                     if let appGroupURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: nameGroupShare) {
                         let sharedImageURL = appGroupURL.appendingPathComponent(compressedImageName)
                         let sharedThumbURL = appGroupURL.appendingPathComponent(thumbName)
-                        try? UIImage(contentsOfFile: selectedImage.path)?.jpegData(compressionQuality: 0.25)?.write(to: sharedThumbURL)
-                        try? UIImage(contentsOfFile: selectedImage.path)?.jpegData(compressionQuality: 0.5)?.write(to: sharedImageURL)
+                        if selectedImage != nil {
+                            try? UIImage(contentsOfFile: selectedImage.path)?.jpegData(compressionQuality: 0.25)?.write(to: sharedThumbURL)
+                            try? UIImage(contentsOfFile: selectedImage.path)?.jpegData(compressionQuality: 0.5)?.write(to: sharedImageURL)
+                        } else {
+                            try? selectedImageTypeImage?.jpegData(compressionQuality: 0.25)?.write(to: sharedThumbURL)
+                            try? selectedImageTypeImage?.jpegData(compressionQuality: 0.5)?.write(to: sharedImageURL)
+                        }
                     }
                     dataShared["thumb"] = thumbName
                     dataShared["image"] = compressedImageName
@@ -565,6 +571,24 @@ class ShareViewController: UIViewController, UITableViewDelegate, UITableViewDat
                                 
                                 buildAppearance(contact, viewVc)
                                 
+                                vcHandleImage.modalPresentationStyle = .fullScreen
+                                self.navigationController?.present(vcHandleImage, animated: true)
+                            }
+                        }
+                    } else if let image = imageItem as? UIImage {
+                        DispatchQueue.main.async { [self] in
+                            typeShareNum = TypeShare.image
+                            selectedImageTypeImage = image
+                            if let viewVc = vcHandleImage.view {
+                                let imageView = UIImageView()
+                                imageView.image = image
+                                imageView.contentMode = .scaleAspectFit
+                                imageView.clipsToBounds = true
+                                viewVc.addSubview(imageView)
+                                imageView.frame = CGRect(x: 0, y: 70, width: viewVc.bounds.size.width, height: self.view.bounds.height - 150)
+                                
+                                buildAppearance(contact, viewVc)
+                                
                                 vcHandleImage.modalPresentationStyle = .fullScreen
                                 self.navigationController?.present(vcHandleImage, animated: true)
                             }

+ 21 - 0
NexilisLite/NexilisLite/Source/CoreMessage_TMessageBank.swift

@@ -2667,4 +2667,25 @@ public class CoreMessage_TMessageBank {
         return tMessage
     }
     
+    public static func getAddFriendRequest(fPin: String) -> TMessage {
+        let tMessage = NexilisLite.TMessage()
+        let me = User.getMyPin() ?? ""
+        tMessage.mPIN = me
+        tMessage.mCode = CoreMessage_TMessageCode.FRIEND_REQUEST
+        tMessage.mStatus = CoreMessage_TMessageUtil.getTID()
+        tMessage.mBodies[CoreMessage_TMessageKey.L_PIN] = fPin
+        return tMessage
+    }
+    
+    public static func getAddFriendApproval(lPin: String, isAccept: Bool) -> TMessage {
+        let tMessage = NexilisLite.TMessage()
+        let me = User.getMyPin() ?? ""
+        tMessage.mPIN = me
+        tMessage.mCode = CoreMessage_TMessageCode.APPROVAL_FRIEND_REQUEST
+        tMessage.mStatus = CoreMessage_TMessageUtil.getTID()
+        tMessage.mBodies[CoreMessage_TMessageKey.F_PIN] = lPin
+        tMessage.mBodies[CoreMessage_TMessageKey.DATA] = isAccept ? "1" : "2"
+        return tMessage
+    }
+    
 }

+ 2 - 0
NexilisLite/NexilisLite/Source/CoreMessage_TMessageCode.swift

@@ -255,6 +255,8 @@ public class CoreMessage_TMessageCode {
     public static let ADD_FRIEND_IMEI              = "A100A";
     public static let REMOVE_FRIEND                = "A100B";
     public static let CHECK_FRIEND                 = "A100C";
+    public static let FRIEND_REQUEST = "A100R";
+    public static let APPROVAL_FRIEND_REQUEST = "A100RA";
     public static let CONTACT_LIST                 = "CL";
     
     //    public static let REQUEST_APPS          = "A100";

+ 2 - 2
NexilisLite/NexilisLite/Source/Nexilis.swift

@@ -565,7 +565,7 @@ public class Nexilis: NSObject {
     public static func checkingAccess(key: String) -> Bool {
         let dataAccess = Utils.getFeatureAccess()
         if dataAccess.isEmpty {
-            if key == "sms" || key == "email" || key == "whatsapp" || key == "battery_optimization_force" || key == "backup_restore" || key == "check_sim_swap" || key == "admin_features" || key == "can_config_fb" {
+            if key == "sms" || key == "email" || key == "whatsapp" || key == "battery_optimization_force" || key == "backup_restore" || key == "check_sim_swap" || key == "admin_features" || key == "can_config_fb" || key == "friend_request_approval" {
                 return false
             } else {
                 return true
@@ -574,7 +574,7 @@ public class Nexilis: NSObject {
             if jsonArray[key] != nil {
                 return jsonArray[key] as! String == "1"
             } else {
-                if key == "sms" || key == "email" || key == "whatsapp" || key == "battery_optimization_force" || key == "backup_restore" || key == "check_sim_swap" || key == "admin_features" || key == "can_config_fb" {
+                if key == "sms" || key == "email" || key == "whatsapp" || key == "battery_optimization_force" || key == "backup_restore" || key == "check_sim_swap" || key == "admin_features" || key == "can_config_fb" || key == "friend_request_approval" {
                     return false
                 } else {
                     return true