> 
         ShareRecentGroupInfo.add(groupItem)

+ 4 - 2
PaiAi/PaiaiDataKit/PresentLayer/PhotoDetail/PhotoDetailViewModel.swift
View File 

@@ -13,7 +13,7 @@ import RxDataSources
13 13
14 14 
 public protocol PhotoDetailViewModelDelegate: class {
15 15 
     func didSelected()
16 
-    func navigateToGroup(_ item: GroupItem)
16 
+    func navigateToGroup(_ item: GroupItem, photoItems: [PhotoItem])
17 17 
 }
18 18
19 19 
 
@@ -180,7 +180,9 @@ public final class PhotoDetailViewModel {
180 180
181 181 
 extension PhotoDetailViewModel {
182 182 
     public func navigateToGroup() {
183 
-        delegate?.navigateToGroup(GroupItem(json: _items.value[currIndex].toJSON() as [String : AnyObject]))
183 
+        let currItem = _items.value[currIndex]
184 
+        delegate?.navigateToGroup(GroupItem(json: currItem.toJSON() as [String : AnyObject]),
185 
+                                  photoItems: _items.value.filter { $0.photo_id == currItem.photo_id })
184 186 
     }
185 187
186 188 
     public func didSelected() {

+ 1 - 1
PaiAi/Paiai_iOS/App/Home/HomeCoordinator.swift
View File 

@@ -38,7 +38,7 @@ extension HomeCoordinator: HomeViewModelDelegate {
38 38 
         let coordinator = PhotoDetailCoordinator(vc,
39 39 
                                                  nav: navigationController,
40 40 
                                                  viewModel: PhotoDetailViewModel(items: items, currIndex: currIndex))
41 
-        coordinator.start().subscribe().disposed(by: disposeBag)
41 
+        coordinate(to: coordinator).subscribe().disposed(by: disposeBag)
42 42 
         navigationController.pushViewController(coordinator.photoDetailViewController)
43 43 
     }
44 44

+ 2 - 2
PaiAi/Paiai_iOS/App/PhotoDetail/PhotoDetailCoordinator.swift
View File 

@@ -31,9 +31,9 @@ final class PhotoDetailCoordinator: BaseCoordinator<Void> {
31 31 
 }
32 32
33 33 
 extension PhotoDetailCoordinator: PhotoDetailViewModelDelegate {
34 
-    func navigateToGroup(_ item: GroupItem) {
34 
+    func navigateToGroup(_ item: GroupItem, photoItems: [PhotoItem]) {
35 35 
         let vc = GroupViewController.instantiate()
36 
-        vc.viewModel = GroupViewModel(groupItem: item)
36 
+        vc.viewModel = GroupViewModel(groupItem: item, items: photoItems)
37 37 
         let coordinator = GroupCoordinator(vc,
38 38 
                                            navigationController: navigationController,
39 39 
                                            navigationSource: .photoDetail)

kodo - Gogs: Go Git Service
首頁 探索 幫助
註冊 登錄
Kodo
/
kodo
關註 2
讚好 0
派生 0
問題管理 0 Pull Requests 0 提交歷史 1001 版本發佈 0

暫無描述

ZIP TAR.GZ

0017_groupphotoinfo_photo_from.py 538B
文件歷史 原始文件 

    # -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations


class Migration(migrations.Migration):

    dependencies = [
        ('group', '0016_auto_20160321_1535'),
    ]

    operations = [
        migrations.AddField(
            model_name='groupphotoinfo',
            name='photo_from',
            field=models.IntegerField(default=0, help_text='\u7167\u7247\u6765\u6e90', verbose_name='photo_from', choices=[(0, 'APP \u5efa\u7fa4'), (1, 'SESSION \u5efa\u7fa4')]),
        ),
    ]