94 94 
     }
95 95 
 }
96 
+
97 
+extension MineViewController: Storyboarded {
98 
+    static func instantiate() -> MineViewController {
99 
+        return UIStoryboard.mine.instantiateViewController(type: MineViewController.self)
100 
+    }
101 
+}

+ 2 - 2
PaiAi/Paiai_iOS/App/Mine/OrderCell.swift
View File 

@@ -1,8 +1,8 @@
1 1 
 //
2 2 
 //  OrderCell.swift
3 
-//  PaiAi
3 
+//  Paiai_iOS
4 4 
 //
5 
-//  Created by zhengjianfei on 16/4/21.
5 
+//  Created by FFIB on 16/4/21.
6 6 
 //  Copyright © 2016年 FFIB. All rights reserved.
7 7 
 //
8 8

+ 2 - 3
PaiAi/Paiai_iOS/App/PhotoCell.swift
View File 

@@ -1,9 +1,9 @@
1 1 
 //
2 2 
 //  PhotoCell.swift
3 
-//  PaiAi
3 
+//  Paiai_iOS
4 4 
 //
5 5 
 //  Created by FFIB on 2017/10/27.
6 
-//  Copyright © 2017年 yb. All rights reserved.
6 
+//  Copyright © 2017年 FFIB. All rights reserved.
7 7 
 //
8 8
9 9 
 import UIKit
 
@@ -27,7 +27,6 @@ class PhotoCell: UICollectionViewCell {
27 27 
     func setInfo(_ info: PhotoItem, source: PhotoCellSource) {
28 28 
         headImageView.cornerRadius = 15
29 29 
         headImageView.borderWidth = 0.5
30 
-        headLabel.text = info.group_name
31 30
32 31 
         switch source {
33 32 
         case .home:

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

@@ -1,8 +1,8 @@
1 1 
 //
2 2 
 //  ImageCell.swift
3 
-//  PaiAi
3 
+//  Paiai_iOS
4 4 
 //
5 
-//  Created by zhengjianfei on 16/4/9.
5 
+//  Created by FFIB on 16/4/9.
6 6 
 //  Copyright © 2016年 FFIB. All rights reserved.
7 7 
 //
8 8

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

@@ -1,8 +1,8 @@
1 1 
 //
2 2 
 //  PhotoDetailCommentCell.swift
3 
-//  PaiAi
3 
+//  Paiai_iOS
4 4 
 //
5 
-//  Created by zhengjianfei on 16/4/8.
5 
+//  Created by FFIB on 16/4/8.
6 6 
 //  Copyright © 2016年 FFIB. All rights reserved.
7 7 
 //
8 8

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

@@ -2,33 +2,31 @@
2 2 
 //  PhotoDetailCoordinator.swift
3 3 
 //  Paiai_iOS
4 4 
 //
5 
-//  Created by ffib on 2018/12/19.
6 
-//  Copyright © 2018 yb. All rights reserved.
5 
+//  Created by FFIB on 2018/12/19.
6 
+//  Copyright © 2018 FFIB. All rights reserved.
7 7 
 //
8 8
9 
-import Foundation
9 
+import UIKit
10 
+import RxSwift
10 11 
 import PaiaiDataKit
11 12
12 
-final class PhotoDetailCoordinator: Coordinator {
13 
+final class PhotoDetailCoordinator: BaseCoordinator<Void> {
13 14 
     let navigationController: UINavigationController
14 15 
     let photoDetailViewController: PhotoDetailViewController
15 16 
     let shareViewModel: PhotoDetailViewModel
16 17
17 
-    fileprivate var coordinators = [CoordinatorKey: Coordinator]()
18 
-
19 18 
     init(_ photoDetailVC: PhotoDetailViewController,
20 19 
          nav: UINavigationController,
21 20 
          viewModel: PhotoDetailViewModel) {
22 21 
         photoDetailViewController = photoDetailVC
23 22 
         shareViewModel = viewModel
24 23 
         navigationController = nav
25 
-        photoDetailViewController.viewModel = viewModel
26 
-
27 
-        viewModel.delegate = self
24 
+        photoDetailViewController.viewModel = viewModel
28 25 
     }
29 26
30 
-    func start() {
31 
-
27 
+    override func start() -> Observable<Void> {
28 
+        photoDetailViewController.viewModel.delegate = self
29 
+        return .never()
32 30 
     }
33 31 
 }
34 32 
 
@@ -37,14 +35,15 @@ extension PhotoDetailCoordinator: PhotoDetailViewModelDelegate {
37 35 
         let vc = GroupViewController.instantiate()
38 36 
         vc.viewModel = GroupViewModel(groupItem: item)
39 37 
         let coordinator = GroupCoordinator(vc,
40 
-                                           navigationController: navigationController)
41 
-        coordinators[.group] = coordinator
38 
+                                           navigationController: navigationController,
39 
+                                           navigationSource: .photoDetail)
42 40
41 
+        coordinate(to: coordinator).subscribe().disposed(by: disposeBag)
43 42 
         navigationController.pushViewController(vc)
44 43 
     }
45 44
46 45 
     func didSelected() {
47 
-        let vc = UIStoryboard.photoDetail.instantiateController(PhotoPreviewViewController.self)
46 
+        let vc = PhotoPreviewViewController.instantiate()
48 47 
         vc.viewModel = shareViewModel
49 48 
         photoDetailViewController.presentController(vc)
50 49 
     }

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

@@ -2,8 +2,8 @@
2 2 
 //  PhotoDetailImageCell.swift
3 3 
 //  Paiai_iOS
4 4 
 //
5 
-//  Created by ffib on 2019/3/19.
6 
-//  Copyright © 2019 yb. All rights reserved.
5 
+//  Created by FFIB on 2019/3/19.
6 
+//  Copyright © 2019 FFIB. All rights reserved.
7 7 
 //
8 8
9 9 
 import UIKit

+ 13 - 7
PaiAi/Paiai_iOS/App/PhotoDetail/PhotoDetailViewController.swift
View File 

@@ -1,8 +1,8 @@
1 1 
 //
2 2 
 //  PhotoDetailViewController.swift
3 
-//  PaiAi
3 
+//  Paiai_iOS
4 4 
 //
5 
-//  Created by zhengjianfei on 16/4/6.
5 
+//  Created by FFIB on 16/4/6.
6 6 
 //  Copyright © 2016年 FFIB. All rights reserved.
7 7 
 //
8 8 
 
@@ -97,11 +97,11 @@ extension PhotoDetailViewController {
97 97 
 /// bind storyboard button action
98 98 
 extension PhotoDetailViewController {
99 99 
     @IBAction func share() {
100 
-        let ctl = UIStoryboard.photoDetail.instantiateController(ShareViewController.self)
101 
-        ctl.shareContent = "我使用拍爱分享了一张美图，你也快来试试吧"
102 
-        //        ctl.shareImgUrlThumb = datas[currentPhotoIndex].photo_thumbnail_url
103 
-        //        ctl.shareUrl = datas[currentPhotoIndex].photo_share_url
104 
-        presentController(ctl)
100 
+//        let ctl = ShareViewController UIStoryboard.photoDetail.instantiateController(ShareViewController.self)
101 
+//        ctl.shareContent = "我使用拍爱分享了一张美图，你也快来试试吧"
102 
+//        //        ctl.shareImgUrlThumb = datas[currentPhotoIndex].photo_thumbnail_url
103 
+//        //        ctl.shareUrl = datas[currentPhotoIndex].photo_share_url
104 
+//        presentController(ctl)
105 105 
     }
106 106
107 107 
     @IBAction func comment() {
 
@@ -380,3 +380,9 @@ extension PhotoDetailViewController: UICollectionViewDelegateFlowLayout {
380 380 
 }
381 381
382 382 
 extension PhotoDetailViewController: NavigationBackViewController {}
383 
+
384 
+extension PhotoDetailViewController: Storyboarded {
385 
+    static func instantiate() -> PhotoDetailViewController {
386 
+        return UIStoryboard.photoDetail.instantiateViewController(type: PhotoDetailViewController.self)
387 
+    }
388 
+}

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

@@ -1,8 +1,8 @@
1 1 
 //
2 2 
 //  PhotoPreviewViewController.swift
3 
-//  PaiAi
3 
+//  Paiai_iOS
4 4 
 //
5 
-//  Created by zhengjianfei on 16/4/9.
5 
+//  Created by FFIB on 16/4/9.
6 6 
 //  Copyright © 2016年 FFIB. All rights reserved.
7 7 
 //
8 8 
 
@@ -122,3 +122,9 @@ extension PhotoPreviewViewController: UICollectionViewDelegateFlowLayout {
122 122 
         return CGSize(width: collectionView.width, height: collectionView.height - 20)
123 123 
     }
124 124 
 }
125 
+
126 
+extension PhotoPreviewViewController: Storyboarded {
127 
+    static func instantiate() -> PhotoPreviewViewController {
128 
+        return UIStoryboard.photoDetail.instantiateViewController(type: PhotoPreviewViewController.self)
129 
+    }
130 
+}

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

@@ -1,8 +1,8 @@
1 1 
 //
2 2 
 //  ShareViewController.swift
3 
-//  PaiAi
3 
+//  Paiai_iOS
4 4 
 //
5 
-//  Created by zhengjianfei on 16/4/7.
5 
+//  Created by FFIB on 16/4/7.
6 6 
 //  Copyright © 2016年 FFIB. All rights reserved.
7 7 
 //
8 8

+ 2 - 2
PaiAi/Paiai_iOS/Paiai_iOS.h
View File 

@@ -2,8 +2,8 @@
2 2 
 //  Paiai_iOS.h
3 3 
 //  Paiai_iOS
4 4 
 //
5 
-//  Created by ffib on 2018/12/19.
6 
-//  Copyright © 2018 yb. All rights reserved.
5 
+//  Created by FFIB on 2018/12/19.
6 
+//  Copyright © 2018 FFIB. All rights reserved.
7 7 
 //
8 8
9 9 
 #import <UIKit/UIKit.h>

+ 41 - 0
PaiAi/Paiai_iOS/Reusable/BaseCoordinator.swift
View File 

@@ -0,0 +1,41 @@
1 
+//
2 
+//  BaseCoordinator.swift
3 
+//  Paiai_iOS
4 
+//
5 
+//  Created by FFIB on 2019/4/29.
6 
+//  Copyright © 2019 FFIB. All rights reserved.
7 
+//
8 
+
9 
+import RxSwift
10 
+import Foundation
11 
+
12 
+public class BaseCoordinator<ResultType> {
13 
+
14 
+    typealias CoordinationResult = ResultType
15 
+
16 
+    let disposeBag = DisposeBag()
17 
+    let didCancel = PublishSubject<Void>()
18 
+
19 
+    private let identifier = UUID()
20 
+    private var childCoordinators = [UUID: Any]()
21 
+
22 
+    private func store<T>(coordinator: BaseCoordinator<T>) {
23 
+        childCoordinators[coordinator.identifier] = coordinator
24 
+    }
25 
+
26 
+    private func free<T>(coordinator: BaseCoordinator<T>) {
27 
+        childCoordinators[coordinator.identifier] = nil
28 
+    }
29 
+
30 
+    func coordinate<T>(to coordinator: BaseCoordinator<T>) -> Observable<T> {
31 
+        store(coordinator: coordinator)
32 
+        return coordinator.start()
33 
+            .do(onNext: { [weak self] _ in
34 
+                self?.free(coordinator: coordinator)
35 
+            })
36 
+    }
37 
+
38 
+    func start() -> Observable<ResultType> {
39 
+        fatalError("Start method should be implemented.")
40 
+    }
41 
+}

+ 2 - 2
PaiAi/Paiai_iOS/Reusable/Extension/UIImageView+Kingfisher.swift
View File 

@@ -1,8 +1,8 @@
1 1 
 //
2 2 
 //  UIImageView+Kingfisher.swift
3 
-//  PaiAi
3 
+//  Paiai_iOS
4 4 
 //
5 
-//  Created by mac on 16/7/21.
5 
+//  Created by FFIB on 16/7/21.
6 6 
 //  Copyright © 2016年 FFIB. All rights reserved.
7 7 
 //
8 8

+ 11 - 0
PaiAi/Paiai_iOS/Reusable/NavigationSource.swift
View File 

@@ -0,0 +1,11 @@
1 
+//
2 
+//  NavigationSource.swift
3 
+//  Paiai_iOS
4 
+//
5 
+//  Created by ffib on 2019/5/5.
6 
+//  Copyright © 2019 FFIB. All rights reserved.
7 
+//
8 
+
9 
+import Foundation
10 
+
11 
+enum NavigationSource {}

kodo - Gogs: Go Git Service
首页 探索 帮助
注册 登录
Kodo
/
kodo
关注 2
点赞 0
派生 0
工单管理 0 合并请求 0 提交历史 154 版本发布 0

暂无描述

ZIP TAR.GZ

admin.py 613B
文件历史 原始文件 

    # -*- coding: utf-8 -*-

from django.contrib import admin

from photo.models import PhotosInfo, UUIDInfo


class UUIDInfoAdmin(admin.ModelAdmin):
    list_display = ('uuid', 'lensman_id', 'status', 'created_at', 'updated_at')
    list_filter = ('lensman_id', 'status')


class PhotosInfoAdmin(admin.ModelAdmin):
    list_display = ('lensman_id', 'session_id', 'photo_id', 'p_photo_path', 'm_photo_path', 'l_photo_path', 'r_photo_path', 'status', 'created_at', 'updated_at')
    list_filter = ('lensman_id', 'status')


admin.site.register(UUIDInfo, UUIDInfoAdmin)
admin.site.register(PhotosInfo, PhotosInfoAdmin)
Pai2/pai2 - Gogs: Go Git Service
Home Erkunden Hilfe
Registrieren Anmelden
Pai2
/
pai2
Beobachten 2
Markieren 0
Fork 0
Issues 0 Pull-Anforderung 0 Commits 330 Veröffentlichungen 0

3 Commits (768af5a2aefb81e46c704a8142650911e242a353)

Author SHA1 Nachricht Datum
  Brightcells 2f29afecbd modify version in operation vor 10 Jahren
  Brightcells af2b3f483f change download.html to be generated from download.tmpl.html vor 10 Jahren
  Brightcells 4defb80fdc gogs first init vor 10 Jahren