Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeWebViewController.swift

@@ -113,6 +113,8 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
         api.delegate = self
         webview.addJavascriptObject(api, namespace: nil)
         
+        
+        url = "http://192.168.23.35:10300/articleDetail.html?id=3046"//for test hjl
         // 创建网址
         let url = NSURL(string: url)
         // 创建请求

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift

@@ -18,23 +18,31 @@ class YHJsApi: NSObject {
 
 extension YHJsApi {
     //展示pics
-    @objc func showPicsSyn(_ dicPics:[String : Any]) {
-        //dsBridge.call("showPicsSyn",{pics:["123","456"], curIndex:1})
-      
-        
-        
+    @objc func showPicsSyn(_ dicPics: String) {
         DispatchQueue.main.async {
-//            YHPictureReviewManager.shared.showNetWorkPicturs(curIndex: curIndex, arrPicturs: arrPics)
-            YHHUD.flash(message: "ddddddd")
-            if !dicPics.isEmpty {
-                let curIndex : Int = dicPics["curIndex"] as? Int ?? -1
-                let arrPics : [String] = dicPics["pics"] as? [String] ?? []
-                if curIndex > -1,arrPics.count > 0 {
-                    YHPictureReviewManager.shared.showNetWorkPicturs(curIndex: curIndex, arrPicturs: arrPics)
+            if let data = dicPics.data(using: .utf8) {
+                do {
+                    if let jsonObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                        // 转换成功，jsonObject 是一个字典
+                        print("JSON字符串转换为字典成功: \(jsonObject)")
+                        
+                        if !jsonObject.isEmpty {
+                            let curIndex : Int = jsonObject["curIndex"] as? Int ?? -1
+                            let arrPics : [String] = jsonObject["pics"] as? [String] ?? []
+                            if curIndex > -1,arrPics.count > 0 {
+                                YHPictureReviewManager.shared.showNetWorkPicturs(curIndex: curIndex, arrPicturs: arrPics)
+                            }
+                        } else {
+                            printLog("ddddd")
+                        }
+                    } else {
+                        printLog("JSON字符串不是有效的字典格式")
+                    }
+                } catch {
+                    printLog("JSON解析错误: \(error)")
                 }
             }
         }
-        
     }
     
     //设置app导航栏隐藏、显示

galaxy/galaxy/Classes/Modules/PictureReview(图片预览)/YHPictureReviewManager.swift

@@ -26,40 +26,40 @@ class YHPictureReviewManager: NSObject {
 
 extension YHPictureReviewManager {
     func showNetWorkPicturs(curIndex : Int,arrPicturs:[String]) {
-//        guard  curIndex > -1,arrPicturs.count > 0 else { return }
-//        
-//        self.curIndex = curIndex
-//        self.arrPics = arrPicturs
-//        
-//        
-//        let browser = JXPhotoBrowser()
-//        browser.numberOfItems = {
-//            self.arrPics.count
-//        }
-//        
-//        browser.reloadCellAtIndex = { context in
-//            if context.index >= self.arrPics.count {
-//                return
-//            }
-//            let string = self.arrPics[context.index]
-//            guard string.count > 0,let url = URL(string: string) else { return }
-//            let browserCell = context.cell as? JXPhotoBrowserImageCell
-//            browserCell?.index = context.index
-//            let placeholder = UIImage(named: "global_default_image")
-//            browserCell?.imageView.sd_setImage(with: url, placeholderImage: placeholder, options: [], completed: { (_, _, _, _) in
-//                browserCell?.setNeedsLayout()
-//            })
-//            
-//            // 添加长按事件
-//            browserCell?.longPressedAction = { cell, _ in
-//                self.longPress(cell: cell)
-//            }
-//        }
-//        
-//        // 数字样式的页码指示器
-//        browser.pageIndicator = JXPhotoBrowserNumberPageIndicator()
-//        browser.pageIndex = self.curIndex
-//        browser.show()
+        guard  curIndex > -1,arrPicturs.count > 0 else { return }
+        
+        self.curIndex = curIndex
+        self.arrPics = arrPicturs
+        
+        
+        let browser = JXPhotoBrowser()
+        browser.numberOfItems = {
+            self.arrPics.count
+        }
+        
+        browser.reloadCellAtIndex = { context in
+            if context.index >= self.arrPics.count {
+                return
+            }
+            let string = self.arrPics[context.index]
+            guard string.count > 0,let url = URL(string: string) else { return }
+            let browserCell = context.cell as? JXPhotoBrowserImageCell
+            browserCell?.index = context.index
+            let placeholder = UIImage(named: "global_default_image")
+            browserCell?.imageView.sd_setImage(with: url, placeholderImage: placeholder, options: [], completed: { (_, _, _, _) in
+                browserCell?.setNeedsLayout()
+            })
+            
+            // 添加长按事件
+            browserCell?.longPressedAction = { cell, _ in
+                self.longPress(cell: cell)
+            }
+        }
+        
+        // 数字样式的页码指示器
+        browser.pageIndicator = JXPhotoBrowserNumberPageIndicator()
+        browser.pageIndex = self.curIndex
+        browser.show()
         
     }
 }