25 
+        createTimeLabel.text =  info.create_at
26 26 
         photoNumLabel.text = "有\(info.group_photo_num)张照片"
27 27 
     }
28 28 
 }

+ 4 - 4
PaiAi/Paiai_iOS/App/PhotoCell.swift
Bestand weergeven 

@@ -30,9 +30,9 @@ class PhotoCell: UICollectionViewCell {
30 30
31 31 
         switch source {
32 32 
         case .home:
33 
-            headLabel.text = info.groupName
34 
-            headImageView.setImage(info.groupAvatar, placeholder: UIImage(named: "Group\(info.groupDefaultAvatar)"))
35 
-            timeLabel.text = info.createAt
33 
+            headLabel.text = info.group_name
34 
+            headImageView.setImage(info.group_avatar, placeholder: UIImage(named: "Group\(info.group_default_avatar)"))
35 
+            timeLabel.text = info.create_at
36 36 
         case .group:
37 37 
             headLabel.text = info.nickname
38 38 
             headImageView.setImage(info.avatar, placeholder: UIImage.photoPlaceholder)
 
@@ -40,7 +40,7 @@ class PhotoCell: UICollectionViewCell {
40 40 
         }
41 41
42 42 
         thumbupLabel.text = "\(info.thumbup_num)"
43 
-        commentLabel.text = "\(info.commentNum)"
43 
+        commentLabel.text = "\(info.comment_num)"
44 44 
     }
45 45
46 46 
 }

+ 2 - 2
PaiAi/Paiai_iOS/App/PhotoDetail/ImageCell.swift
Bestand weergeven 

@@ -36,12 +36,12 @@ final class ImageCell: UICollectionViewCell, UIScrollViewDelegate {
36 36 
         return photoImage
37 37 
     }
38 38 
     // MARK: zoom
39 
-    @objc func doubleTap(_ gr: UITapGestureRecognizer) {
39 
+    @objc func doubleTap(_ gestureRecognizer: UITapGestureRecognizer) {
40 40 
         if scrollView.zoomScale > scrollView.minimumZoomScale {
41 41 
             scrollView.setZoomScale(scrollView.minimumZoomScale, animated: true)
42 42 
         } else {
43 43 
             //Zoom to rect
44 
-            let tapPt = gr.location(in: scrollView)
44 
+            let tapPt = gestureRecognizer.location(in: scrollView)
45 45 
             var zoomRect = CGRect.zero
46 46 
             zoomRect.size.width = frame.width / scrollView.maximumZoomScale
47 47 
             zoomRect.size.height = frame.height / scrollView.maximumZoomScale

+ 26 - 30
PaiAi/Paiai_iOS/App/PhotoDetail/PhotoDetail.storyboard
Bestand weergeven 

@@ -1,11 +1,7 @@
1 1 
 <?xml version="1.0" encoding="UTF-8"?>
2 
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES">
3 
-    <device id="retina4_7" orientation="portrait">
4 
-        <adaptation id="fullscreen"/>
5 
-    </device>
2 
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES">
6 3 
     <dependencies>
7 
-        <deployment identifier="iOS"/>
8 
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
4 
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
9 5 
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
10 6 
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
11 7 
     </dependencies>
 
@@ -156,7 +152,7 @@
156 152 
                                                     <nil key="highlightedColor"/>
157 153 
                                                 </label>
158 154 
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-time" translatesAutoresizingMaskIntoConstraints="NO" id="xXQ-Hj-wzP">
159 
-                                                    <rect key="frame" x="286" y="0.0" width="36" height="36"/>
155 
+                                                    <rect key="frame" x="306" y="10" width="16" height="16"/>
160 156 
                                                 </imageView>
161 157 
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5分钟前" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QpI-Mp-URP">
162 158 
                                                     <rect key="frame" x="332" y="12" width="37" height="12"/>
 
@@ -183,24 +179,24 @@
183 179 
                                             <rect key="frame" x="0.0" y="444" width="375" height="44"/>
184 180 
                                             <subviews>
185 181 
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-thumbup" translatesAutoresizingMaskIntoConstraints="NO" id="haH-1L-wfF">
186 
-                                                    <rect key="frame" x="15" y="4" width="36" height="36"/>
182 
+                                                    <rect key="frame" x="15" y="14" width="16" height="16"/>
187 183 
                                                 </imageView>
188 184 
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="赞" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vrx-vV-ymg">
189 
-                                                    <rect key="frame" x="57" y="13.5" width="14.5" height="17"/>
185 
+                                                    <rect key="frame" x="37" y="13.5" width="14.5" height="17"/>
190 186 
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
191 187 
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
192 188 
                                                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
193 189 
                                                     <nil key="highlightedColor"/>
194 190 
                                                 </label>
195 191 
                                                 <label opaque="NO" userInteractionEnabled="NO" tag="1002" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(0)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h88-PP-cvG">
196 
-                                                    <rect key="frame" x="77.5" y="14.5" width="17" height="15"/>
192 
+                                                    <rect key="frame" x="57.5" y="14.5" width="17" height="15"/>
197 193 
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
198 194 
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
199 195 
                                                     <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
200 196 
                                                     <nil key="highlightedColor"/>
201 197 
                                                 </label>
202 198 
                                                 <imageView userInteractionEnabled="NO" tag="1008" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="list-arrow" translatesAutoresizingMaskIntoConstraints="NO" id="sg5-Nx-u2C">
203 
-                                                    <rect key="frame" x="341" y="4" width="24" height="36"/>
199 
+                                                    <rect key="frame" x="349" y="14" width="16" height="16"/>
204 200 
                                                 </imageView>
205 201 
                                             </subviews>
206 202 
                                             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
 
@@ -227,24 +223,24 @@
227 223 
                                             <rect key="frame" x="0.0" y="489" width="375" height="44"/>
228 224 
                                             <subviews>
229 225 
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-comment" translatesAutoresizingMaskIntoConstraints="NO" id="zTQ-T2-IMt">
230 
-                                                    <rect key="frame" x="15" y="4" width="36" height="36"/>
226 
+                                                    <rect key="frame" x="15" y="14" width="16" height="16"/>
231 227 
                                                 </imageView>
232 228 
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="评论" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vLK-B7-FQc">
233 
-                                                    <rect key="frame" x="57" y="13.5" width="29" height="17"/>
229 
+                                                    <rect key="frame" x="37" y="13.5" width="29" height="17"/>
234 230 
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
235 231 
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
236 232 
                                                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
237 233 
                                                     <nil key="highlightedColor"/>
238 234 
                                                 </label>
239 235 
                                                 <label opaque="NO" userInteractionEnabled="NO" tag="1002" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(0)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cuT-s1-NnA">
240 
-                                                    <rect key="frame" x="92" y="14.5" width="17" height="15"/>
236 
+                                                    <rect key="frame" x="72" y="14.5" width="17" height="15"/>
241 237 
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
242 238 
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
243 239 
                                                     <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
244 240 
                                                     <nil key="highlightedColor"/>
245 241 
                                                 </label>
246 242 
                                                 <imageView userInteractionEnabled="NO" tag="1009" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="list-arrow" translatesAutoresizingMaskIntoConstraints="NO" id="ns5-B1-ilP">
247 
-                                                    <rect key="frame" x="341" y="4" width="24" height="36"/>
243 
+                                                    <rect key="frame" x="349" y="14" width="16" height="16"/>
248 244 
                                                 </imageView>
249 245 
                                             </subviews>
250 246 
                                             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
 
@@ -527,8 +523,8 @@
527 523 
                         <outlet property="commentTableView" destination="fD2-Ow-gtt" id="jog-WM-p44"/>
528 524 
                         <outlet property="commentTextField" destination="1va-ae-Juh" id="TpO-kE-PhT"/>
529 525 
                         <outlet property="enterGroupView" destination="gSr-Cm-y1W" id="bNT-Z4-eOG"/>
530 
-                        <outlet property="groupAvatar" destination="nng-M9-7cj" id="Y42-Tc-QnV"/>
531 
-                        <outlet property="groupName" destination="XM7-FX-tOk" id="ifP-h1-72j"/>
526 
+                        <outlet property="group_avatar" destination="nng-M9-7cj" id="Y42-Tc-QnV"/>
527 
+                        <outlet property="group_name" destination="XM7-FX-tOk" id="ifP-h1-72j"/>
532 528 
                         <outlet property="keyboardGestureRcognizer" destination="bqM-7G-5Nw" id="uUS-Ox-osk"/>
533 529 
                         <outlet property="photoCollectionView" destination="dtf-M8-otl" id="VlY-wa-ekc"/>
534 530 
                         <outlet property="photoTime" destination="QpI-Mp-URP" id="rJM-TG-fZW"/>
 
@@ -567,14 +563,14 @@
567 563 
             <objects>
568 564 
                 <viewController storyboardIdentifier="ShareViewController" automaticallyAdjustsScrollViewInsets="NO" id="KnW-jg-4H5" customClass="ShareViewController" customModule="Paiai_iOS" customModuleProvider="target" sceneMemberID="viewController">
569 565 
                     <view key="view" contentMode="scaleToFill" id="rN5-Zb-vwm">
570 
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
566 
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
571 567 
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
572 568 
                         <subviews>
573 569 
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="edT-EA-xhZ" userLabel="Share View">
574 
-                                <rect key="frame" x="0.0" y="463" width="375" height="77"/>
570 
+                                <rect key="frame" x="0.0" y="692" width="414" height="77"/>
575 571 
                                 <subviews>
576 572 
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="itC-HJ-ZaT" userLabel="circle">
577 
-                                        <rect key="frame" x="30.5" y="0.0" width="54" height="71"/>
573 
+                                        <rect key="frame" x="36.5" y="0.0" width="54" height="71"/>
578 574 
                                         <subviews>
579 575 
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yKG-rx-pgX">
580 576 
                                                 <rect key="frame" x="0.0" y="0.0" width="54" height="54"/>
 
@@ -599,7 +595,7 @@
599 595 
                                         </constraints>
600 596 
                                     </stackView>
601 597 
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="W6V-MR-s2s" userLabel="weixin">
602 
-                                        <rect key="frame" x="117" y="0.0" width="54" height="71"/>
598 
+                                        <rect key="frame" x="131.5" y="0.0" width="54" height="71"/>
603 599 
                                         <subviews>
604 600 
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WHf-tp-9sX">
605 601 
                                                 <rect key="frame" x="0.0" y="0.0" width="54" height="54"/>
 
@@ -624,7 +620,7 @@
624 620 
                                         </constraints>
625 621 
                                     </stackView>
626 622 
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="KU1-aO-nLf" userLabel="QQ">
627 
-                                        <rect key="frame" x="202" y="0.0" width="54" height="71"/>
623 
+                                        <rect key="frame" x="226" y="0.0" width="54" height="71"/>
628 624 
                                         <subviews>
629 625 
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kgp-ou-XXF">
630 626 
                                                 <rect key="frame" x="0.0" y="0.0" width="54" height="54"/>
 
@@ -649,7 +645,7 @@
649 645 
                                         </constraints>
650 646 
                                     </stackView>
651 647 
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="ZLk-gf-Jzh" userLabel="weibo">
652 
-                                        <rect key="frame" x="285.5" y="0.0" width="54" height="71"/>
648 
+                                        <rect key="frame" x="318" y="0.0" width="54" height="71"/>
653 649 
                                         <subviews>
654 650 
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uCq-aJ-DOY">
655 651 
                                                 <rect key="frame" x="0.0" y="0.0" width="54" height="54"/>
 
@@ -708,11 +704,11 @@
708 704 
             <objects>
709 705 
                 <viewController storyboardIdentifier="PhotoPreviewViewController" automaticallyAdjustsScrollViewInsets="NO" id="p3y-A2-QU1" userLabel="PhotoPreviewViewController" customClass="PhotoPreviewViewController" customModule="Paiai_iOS" customModuleProvider="target" sceneMemberID="viewController">
710 706 
                     <view key="view" contentMode="scaleToFill" id="MdC-Fu-zFL">
711 
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
707 
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
712 708 
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
713 709 
                         <subviews>
714 710 
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" pagingEnabled="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" indicatorStyle="white" dataMode="prototypes" prefetchingEnabled="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cvI-jg-TrD">
715 
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
711 
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
716 712 
                                 <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="nE7-Ce-1KB">
717 713 
                                     <size key="itemSize" width="237.5" height="357"/>
718 714 
                                     <size key="headerReferenceSize" width="0.0" height="0.0"/>
 
@@ -721,7 +717,7 @@
721 717 
                                 </collectionViewFlowLayout>
722 718 
                                 <cells>
723 719 
                                     <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="imageCell" id="PAU-eQ-c9k" customClass="ImageCell" customModule="Paiai_iOS" customModuleProvider="target">
724 
-                                        <rect key="frame" x="0.0" y="155" width="237.5" height="357"/>
720 
+                                        <rect key="frame" x="0.0" y="0.0" width="237.5" height="357"/>
725 721 
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
726 722 
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
727 723 
                                             <rect key="frame" x="0.0" y="0.0" width="237.5" height="357"/>
 
@@ -749,24 +745,24 @@
749 745 
                                 </cells>
750 746 
                             </collectionView>
751 747 
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BRP-J0-WGF" userLabel="button group">
752 
-                                <rect key="frame" x="0.0" y="623" width="375" height="44"/>
748 
+                                <rect key="frame" x="0.0" y="852" width="414" height="44"/>
753 749 
                                 <subviews>
754 750 
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2r6-s1-9be" userLabel="back">
755 
-                                        <rect key="frame" x="43.5" y="-26" width="96" height="96"/>
751 
+                                        <rect key="frame" x="93" y="11" width="16" height="22"/>
756 752 
                                         <state key="normal" image="navigation-back"/>
757 753 
                                         <connections>
758 754 
                                             <action selector="back" destination="p3y-A2-QU1" eventType="touchUpInside" id="xKk-c3-Iub"/>
759 755 
                                         </connections>
760 756 
                                     </button>
761 757 
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aOC-mu-785" userLabel="rotate">
762 
-                                        <rect key="frame" x="139.5" y="-26" width="96" height="96"/>
758 
+                                        <rect key="frame" x="199" y="11" width="16" height="22"/>
763 759 
                                         <state key="normal" image="BTN-rotate"/>
764 760 
                                         <connections>
765 761 
                                             <action selector="rotateTheImage:" destination="p3y-A2-QU1" eventType="touchUpInside" id="LiB-TG-UYL"/>
766 762 
                                         </connections>
767 763 
                                     </button>
768 764 
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Q90-2h-mGx" userLabel="download">
769 
-                                        <rect key="frame" x="231" y="-26" width="96" height="96"/>
765 
+                                        <rect key="frame" x="300" y="11" width="16" height="22"/>
770 766 
                                         <state key="normal" image="BTN-download"/>
771 767 
                                         <connections>
772 768 
                                             <action selector="download:" destination="p3y-A2-QU1" eventType="touchUpInside" id="cEE-Yt-FWf"/>

+ 1 - 1
PaiAi/Paiai_iOS/App/PhotoDetail/PhotoDetailCommentCell.swift
Bestand weergeven 

@@ -32,6 +32,6 @@ class PhotoDetailCommentCell: UITableViewCell {
32 32 
         headImage.setImage(info.avatar, placeholder: UIImage.defaultAvatar)
33 33 
         name.text = info.nickname
34 34 
         content.text = info.comment
35 
-        time.text = info.createAt
35 
+        time.text = info.create_at
36 36 
     }
37 37 
 }

+ 7 - 7
PaiAi/Paiai_iOS/App/PhotoDetail/PhotoDetailViewController.swift
Bestand weergeven 

@@ -16,8 +16,8 @@ import PaiaiUIKit
16 16 
 final class PhotoDetailViewController: UIViewController {
17 17
18 18 
     @IBOutlet weak var enterGroupView: UIView!
19 
-    @IBOutlet weak var groupAvatar: UIImageView!
20 
-    @IBOutlet weak var groupName: UILabel!
19 
+    @IBOutlet weak var group_avatar: UIImageView!
20 
+    @IBOutlet weak var group_name: UILabel!
21 21
22 22 
     @IBOutlet weak var photoCollectionView: UICollectionView!
23 23 
 
@@ -99,7 +99,7 @@ extension PhotoDetailViewController {
99 99 
     @IBAction func share() {
100 100 
 //        let ctl = ShareViewController UIStoryboard.photoDetail.instantiateController(ShareViewController.self)
101 101 
 //        ctl.shareContent = "我使用拍爱分享了一张美图，你也快来试试吧"
102 
-//        //        ctl.shareImgUrlThumb = datas[currentPhotoIndex].photoThumbnailUrl
102 
+//        //        ctl.shareImgUrlThumb = datas[currentPhotoIndex].photo_thumbnail_url
103 103 
 //        //        ctl.shareUrl = datas[currentPhotoIndex].photo_share_url
104 104 
 //        presentController(ctl)
105 105 
     }
 
@@ -139,7 +139,7 @@ extension PhotoDetailViewController {
139 139 
             configureCell: {(_, collectionView, indexPath, item) in
140 140 
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "photoDetailImageCell",
141 141 
                                                           for: indexPath) as! PhotoDetailImageCell
142 
-            cell.imageView.setImage(item.murl.isEmpty ? item.photoThumbnail2Url : item.murl,
142 
+            cell.imageView.setImage(item.murl.isEmpty ? item.photo_thumbnail2_url : item.murl,
143 143 
                                     placeholder: UIImage.photoPlaceholder)
144 144 
             return cell
145 145 
         })
 
@@ -185,13 +185,13 @@ extension PhotoDetailViewController {
185 185 
     }
186 186
187 187 
     func bindViewModelToGroupName() {
188 
-        viewModel.groupName.bind(to: groupName.rx.text).disposed(by: disposeBag)
188 
+        viewModel.group_name.bind(to: group_name.rx.text).disposed(by: disposeBag)
189 189 
     }
190 190
191 191 
     func bindViewModelToGroupAvatar() {
192 
-        viewModel.groupAvatar
192 
+        viewModel.group_avatar
193 193 
             .map { UIImage(named: #"Group\#($0)"#)}
194 
-            .bind(to: groupAvatar.rx.image)
194 
+            .bind(to: group_avatar.rx.image)
195 195 
             .disposed(by: disposeBag)
196 196 
     }
197 197

Kodo/kodo - Gogs: Go Git Service
Inicio Explorar Ayuda
Registro Iniciar sesión
Kodo
/
kodo
Vigilar 2
Destacar 0
Fork 0
Incidencias 0 Pull Requests 0 Commits 751 Releases 0

8 Commits (09cd1abe7f33d39b00e8f405ca5c180b8b29e567)

Autor SHA1 Mensaje Fecha
  Brightcells 285acfc352 Opt %!s(int64=8) %!d(string=hace) años
  Brightcells d45acb268d Remove unique of phone %!s(int64=8) %!d(string=hace) años
  Brightcells d17e62ec95 Update list_filter %!s(int64=8) %!d(string=hace) años
  Brightcells 659be0c05b Update requirements.txt %!s(int64=8) %!d(string=hace) años
  Brightcells e31a588800 Update requirements_dj.txt %!s(int64=8) %!d(string=hace) años
  Brightcells 2de7fe4114 Fix Bug: Sale clerk or not %!s(int64=8) %!d(string=hace) años
  Brightcells 669701737b Update requirements_xxx.txt %!s(int64=8) %!d(string=hace) años
  Brightcells 926f0ef06a Update requirements_xxx.txt %!s(int64=8) %!d(string=hace) años