Skip to content

G
GMAILab
Commit 562199ab authored by jz's avatar jz
Browse files
Options

update

parent adc6a790
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 41 deletions
Example/GMAILab.xcodeproj/project.pbxproj
View file @ 562199ab
......@@ -346,6 +346,7 @@
"${PODS_ROOT}/PLMediaStreamingKit/Pod/Library/PLMediaStreamingKit.framework",
"${PODS_ROOT}/PLMediaStreamingKit/Pod/Library/HappyDNS.framework",
"${PODS_ROOT}/PLPlayerKit/Pod/Library/PLPlayerKit.framework",
"${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework",
"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
"${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework",
"${BUILT_PRODUCTS_DIR}/TMCache/TMCache.framework",
......@@ -384,6 +385,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLMediaStreamingKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLPlayerKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TMCache.framework",
......
Example/Podfile
View file @ 562199ab
......@@ -15,11 +15,13 @@ target 'GMAILab_Example' do
pod 'GMBaseWeb', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git', :commit => '0752677'
#9e91ae1
pod 'GMBase', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBase.git', :commit => '9e91ae1'
pod 'GMBaseSwift', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git', :commit => '04bf8c0'
# pod 'GMBaseSwift', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git', :commit => '04bf8c0'
pod 'GMAlbum', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMAlbum.git', :commit => '31dcd07'
# pod 'GMBaseSwift', :path => '../../GMBaseSwift'
pod 'GMBaseSwift', :path => '../../GMBaseSwift'
pod 'Qiniu', '7.2.6'
# pod 'GMBase', :path => '../../GMBase'
# pod 'GMBaseWeb', :path => '../../GMBaseWeb'
......
Example/Podfile.lock
View file @ 562199ab
......@@ -41,6 +41,7 @@ PODS:
- NIMSDK (= 7.5.0)
- PLMediaStreamingKit
- PLPlayerKit
- Qiniu
- YYText
- GMAlbum (4.1.3):
- GMBase
......@@ -170,6 +171,7 @@ PODS:
- PLPlayerKit (3.4.3):
- PLPlayerKit/iphoneos (= 3.4.3)
- PLPlayerKit/iphoneos (3.4.3)
- Qiniu (7.2.6)
- SDWebImage (5.8.0):
- SDWebImage/Core (= 5.8.0)
- SDWebImage/Core (5.8.0)
......@@ -184,9 +186,10 @@ DEPENDENCIES:
- GMAILab (from `../`)
- "GMAlbum (from `git@git.wanmeizhensuo.com:gengmeiios/GMAlbum.git`, commit `31dcd07`)"
- "GMBase (from `git@git.wanmeizhensuo.com:gengmeiios/GMBase.git`, commit `9e91ae1`)"
- "GMBaseSwift (from `git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git`, commit `04bf8c0`)"
- GMBaseSwift (from `../../GMBaseSwift`)
- "GMBaseWeb (from `git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git`, commit `0752677`)"
- "GMPhobos (from `git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git`, commit `960bbb8`)"
- Qiniu (= 7.2.6)
SPEC REPOS:
"git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git":
......@@ -220,6 +223,7 @@ SPEC REPOS:
- NIMSDK
- PLMediaStreamingKit
- PLPlayerKit
- Qiniu
- SDWebImage
- SnapKit
- TMCache
......@@ -238,8 +242,7 @@ EXTERNAL SOURCES:
:commit: 9e91ae1
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBase.git"
GMBaseSwift:
:commit: 04bf8c0
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git"
:path: "../../GMBaseSwift"
GMBaseWeb:
:commit: '0752677'
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git"
......@@ -254,9 +257,6 @@ CHECKOUT OPTIONS:
GMBase:
:commit: 9e91ae1
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBase.git"
GMBaseSwift:
:commit: 04bf8c0
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git"
GMBaseWeb:
:commit: '0752677'
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git"
......@@ -272,7 +272,7 @@ SPEC CHECKSUMS:
DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b
EVReflection: 1abc1a81927ab0d30170238cf9b79bff489e9728
GM-Swift-Observable: 756d8fc13638b9faa68cb10266b2ffb47a911595
GMAILab: ad3f084f94cfb9d3c85e7c1cf58ef02ceca28945
GMAILab: d43cdf95693296138a4f1ccb94940da721a94fa4
GMAlbum: d667396a6dab574a45af71dfebd1a75257c80192
GMBase: 358e72062cb0f64a57ff34ec181b20ad9973d79b
GMBaseSwift: 8f327883b33ac24d0dcdb648ac3f9d6c57949ad5
......@@ -300,6 +300,7 @@ SPEC CHECKSUMS:
NIMSDK: a43eb9b8bf83ddb0338c51ae2d756b683edc0cb8
PLMediaStreamingKit: 3f4fafe3535de54a02c219f40331afa2b47592e0
PLPlayerKit: a44734dc78c1f8f9fb22c537fa1916612fa46b06
Qiniu: 9d1f20dcc348919972b4ee1b1272f9b9d4a7e69e
SDWebImage: 84000f962cbfa70c07f19d2234cbfcf5d779b5dc
SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
......@@ -308,6 +309,6 @@ SPEC CHECKSUMS:
Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089
YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
PODFILE CHECKSUM: 6bf81f186728322854cebf9cac5a818e62d181a5
PODFILE CHECKSUM: 71157d5ade545a7ce4517f7ff47844f2290e8d89
COCOAPODS: 1.9.1
GMAILab.podspec
View file @ 562199ab
......@@ -86,6 +86,7 @@ s.vendored_frameworks = 'GMAILab/Frameworks/*.framework'
s.dependency 'AlipaySDK-iOS', '15.6.8'
s.dependency 'PLMediaStreamingKit'
s.dependency 'PLPlayerKit'
s.dependency 'Qiniu'
s.static_framework = true
s.pod_target_xcconfig = { 'VALID_ARCHS' => 'arm64 armv7' }
......
GMAILab/Classes/ToFace/WorkingTable/ViewController/GMBusinessReportListController.m
View file @ 562199ab
......@@ -12,8 +12,10 @@
#import "GMComplaintResultView.h"
#import "GMComplaintObject.h"
#import "RequestHeader.h"
#import <GMBaseWeb/GMBaseWeb-Swift.h>
#import <GMFoundation/GMFoundation-umbrella.h>
@import GMNetworking;
@import WebKit.WKWebView;
@interface GMBusinessReportListController () <WKWebViewDelegate>
@end
......
GMAILab/Classes/ToFace/WorkingTable/ViewController/GMBusinessReportResultController.m
View file @ 562199ab
......@@ -7,13 +7,12 @@
//
#import "GMBusinessReportResultController.h"
#import "Gengmei-Swift.h"
#import "GMUploadImagesManager.h"
#import "QiniuSDK.h"
#import "RequestHeader.h"
#import <GMBaseWeb/GMBaseWeb-Swift.h>
@import GMNetworking;
@import GMFoundation;
@interface GMBusinessReportResultController () <WKWebViewDelegate>
@property (nonatomic, strong) UIImage *shareImage;
......
GMAILab/Classes/ToFace/WorkingTable/ViewModel/GMEditQuesPartViewModel.m
View file @ 562199ab
......@@ -8,9 +8,12 @@
#import "GMEditQuesPartViewModel.h"
#import "GMBusinessReportListController.h"
#import "WMBrowserViewController.h"
#import <GMBase/GMBaseTool.h>
//#import "WMBrowserViewController.h"
#import "RequestHeader.h"
@import GMHud;
@import GMRouter;
@import GMFoundation;
@import GMNetworking;
@implementation GMEditQuesPartViewModel
......@@ -106,30 +109,23 @@
}];
}
//TODO: 待测试
- (BOOL)isFromReportDetail {
NSArray<__kindof UIViewController *> *viewControllers = [GMBaseTool getCurrentViewController].navigationController.viewControllers;
if (viewControllers.count > 1) {
UIViewController *preVC = viewControllers[viewControllers.count - 2];
if ([preVC isKindOfClass:[WMBrowserViewController class]]) {
if ([((WMBrowserViewController *)preVC).fullURL containsString:API_TREETMENT_BUSINESS_REPORT_DETAIL]) {
return YES;
}
}
}
return NO;
BOOL isDetail = [[[GMRouter sharedInstance] pushScheme:@"gengmei://gm_isFromReportDetail"] boolValue];
return isDetail;
}
- (void)editQuesPartFinish {
NSArray<__kindof UIViewController *> *viewControllers = [GMBaseTool getCurrentViewController].navigationController.viewControllers;
if (viewControllers.count > 1) {
UIViewController *preVC = viewControllers[viewControllers.count - 2];
if ([preVC isKindOfClass:[GMBusinessReportListController class]]) {
[[NSNotificationCenter defaultCenter] postNotificationName:GM_WORKING_EDIT_QUESTION_PART_NOTIFICATION object:nil];
} else if ([preVC isKindOfClass:[WMBrowserViewController class]]) {
[((WMBrowserViewController *)preVC) reloadURL];
}
}
[[GMRouter sharedInstance] pushScheme:@"gengmei://gm_editQuesPartFinish"];
// NSArray<__kindof UIViewController *> *viewControllers = [GMBaseTool getCurrentViewController].navigationController.viewControllers;
// if (viewControllers.count > 1) {
// UIViewController *preVC = viewControllers[viewControllers.count - 2];
// if ([preVC isKindOfClass:[GMBusinessReportListController class]]) {
// [[NSNotificationCenter defaultCenter] postNotificationName:GM_WORKING_EDIT_QUESTION_PART_NOTIFICATION object:nil];
// } else if ([preVC isKindOfClass:[WMBrowserViewController class]]) {
// [((WMBrowserViewController *)preVC) reloadURL];
// }
// }
}
@end
GMAILab/Classes/ToFace/diagnoseRecord/GMDiagnoseRecordWebViewController.m
View file @ 562199ab
......@@ -7,18 +7,20 @@
//
#import "GMDiagnoseRecordWebViewController.h"
#import "Gengmei-Swift.h"
//#import "Gengmei-Swift.h"
#import "GMEndConsultView.h"
#import "GMComplaintObject.h"
#import "GMComplaintResultView.h"
#import "GMSureOrderPopView.h"
#import "GMToFaceOrderInfoModel.h"
#import "GMToFaceNetworking.h"
#import "<#header#>"
#import "NSString+AIJsonData.h"
#import <GMBase/GMBase-Swift.h>
#import "RequestHeader.h"
#import <GMBaseWeb/GMBaseWeb-Swift.h>
@import GMBase;
@import WebKit.WKWebView;
@interface GMViewEvaluateModel: GMObject
//面诊id
@property (nonatomic, copy) NSString *consultationId;
......@@ -42,8 +44,9 @@
-(void)initController {
[super initController];
self.path = API_USER_RECORD_LIST_V4;
NSInteger userI = (NSInteger)[[GMRouter sharedInstance] pushScheme:@"gengmei://gm_userId"];
self.businessId = [NSString stringWithFormat:@"%ld", userI]
//TODO: 待测试
NSInteger userId = (NSInteger)[[GMRouter sharedInstance] pushScheme:@"gengmei://gm_userId"];
self.businessId = [NSString stringWithFormat:@"%ld", userId];
self.pageName = @"video_face_consultation_order_record";
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment