Commit 781cb8ef authored by jz's avatar jz

update

parent 7936fa09
...@@ -15,11 +15,11 @@ target 'GMAILab_Example' do ...@@ -15,11 +15,11 @@ target 'GMAILab_Example' do
pod 'GMBaseWeb', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git', :commit => '0752677' pod 'GMBaseWeb', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git', :commit => '0752677'
#9e91ae1 #9e91ae1
pod 'GMBase', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBase.git', :commit => '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 => 'b54da90'
pod 'GMAlbum', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMAlbum.git', :commit => '31dcd07' 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 'Qiniu', '7.2.6'
# pod 'GMBase', :path => '../../GMBase' # pod 'GMBase', :path => '../../GMBase'
......
...@@ -186,7 +186,7 @@ DEPENDENCIES: ...@@ -186,7 +186,7 @@ DEPENDENCIES:
- GMAILab (from `../`) - GMAILab (from `../`)
- "GMAlbum (from `git@git.wanmeizhensuo.com:gengmeiios/GMAlbum.git`, commit `31dcd07`)" - "GMAlbum (from `git@git.wanmeizhensuo.com:gengmeiios/GMAlbum.git`, commit `31dcd07`)"
- "GMBase (from `git@git.wanmeizhensuo.com:gengmeiios/GMBase.git`, commit `9e91ae1`)" - "GMBase (from `git@git.wanmeizhensuo.com:gengmeiios/GMBase.git`, commit `9e91ae1`)"
- GMBaseSwift (from `../../GMBaseSwift`) - "GMBaseSwift (from `git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git`, commit `b54da90`)"
- "GMBaseWeb (from `git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git`, commit `0752677`)" - "GMBaseWeb (from `git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git`, commit `0752677`)"
- "GMPhobos (from `git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git`, commit `960bbb8`)" - "GMPhobos (from `git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git`, commit `960bbb8`)"
- Qiniu (= 7.2.6) - Qiniu (= 7.2.6)
...@@ -242,7 +242,8 @@ EXTERNAL SOURCES: ...@@ -242,7 +242,8 @@ EXTERNAL SOURCES:
:commit: 9e91ae1 :commit: 9e91ae1
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBase.git" :git: "git@git.wanmeizhensuo.com:gengmeiios/GMBase.git"
GMBaseSwift: GMBaseSwift:
:path: "../../GMBaseSwift" :commit: b54da90
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git"
GMBaseWeb: GMBaseWeb:
:commit: '0752677' :commit: '0752677'
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git" :git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git"
...@@ -257,6 +258,9 @@ CHECKOUT OPTIONS: ...@@ -257,6 +258,9 @@ CHECKOUT OPTIONS:
GMBase: GMBase:
:commit: 9e91ae1 :commit: 9e91ae1
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBase.git" :git: "git@git.wanmeizhensuo.com:gengmeiios/GMBase.git"
GMBaseSwift:
:commit: b54da90
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git"
GMBaseWeb: GMBaseWeb:
:commit: '0752677' :commit: '0752677'
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git" :git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git"
...@@ -272,7 +276,7 @@ SPEC CHECKSUMS: ...@@ -272,7 +276,7 @@ SPEC CHECKSUMS:
DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b
EVReflection: 1abc1a81927ab0d30170238cf9b79bff489e9728 EVReflection: 1abc1a81927ab0d30170238cf9b79bff489e9728
GM-Swift-Observable: 756d8fc13638b9faa68cb10266b2ffb47a911595 GM-Swift-Observable: 756d8fc13638b9faa68cb10266b2ffb47a911595
GMAILab: d43cdf95693296138a4f1ccb94940da721a94fa4 GMAILab: 7610d12d410ee173672937fb0efe31d0332cea7e
GMAlbum: d667396a6dab574a45af71dfebd1a75257c80192 GMAlbum: d667396a6dab574a45af71dfebd1a75257c80192
GMBase: 358e72062cb0f64a57ff34ec181b20ad9973d79b GMBase: 358e72062cb0f64a57ff34ec181b20ad9973d79b
GMBaseSwift: 8f327883b33ac24d0dcdb648ac3f9d6c57949ad5 GMBaseSwift: 8f327883b33ac24d0dcdb648ac3f9d6c57949ad5
...@@ -309,6 +313,6 @@ SPEC CHECKSUMS: ...@@ -309,6 +313,6 @@ SPEC CHECKSUMS:
Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089 Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089
YYText: 5c461d709e24d55a182d1441c41dc639a18a4849 YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
PODFILE CHECKSUM: 71157d5ade545a7ce4517f7ff47844f2290e8d89 PODFILE CHECKSUM: 79af3275103458c1b8cd27726da0c5fc73286b01
COCOAPODS: 1.9.1 COCOAPODS: 1.9.1
...@@ -89,7 +89,7 @@ s.vendored_frameworks = 'GMAILab/Frameworks/*.framework' ...@@ -89,7 +89,7 @@ s.vendored_frameworks = 'GMAILab/Frameworks/*.framework'
s.dependency 'Qiniu' s.dependency 'Qiniu'
s.static_framework = true s.static_framework = true
s.pod_target_xcconfig = { 'VALID_ARCHS' => 'arm64 armv7' } # s.pod_target_xcconfig = { 'VALID_ARCHS' => 'armv7' }
end end
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
- (void)setDoctorId:(NSString *)doctorId { - (void)setDoctorId:(NSString *)doctorId {
_doctorId = doctorId; _doctorId = doctorId;
self.webCompent.fullUrl = [NSString stringWithFormat:@"%@/phantom/treatment/user/typing_info_v4/%@?counsellor_id=%@&record_type=1",GMServerDomains.apiHost, SafeString(doctorId), SafeString(self.counsellorId)]; self.webCompent.fullUrl = [NSString stringWithFormat:@"%@/phantom/treatment/user/typing_info_v4/%@?counsellor_id=%@&record_type=1",[GMWebutil getCurrentApiHost], SafeString(doctorId), SafeString(self.counsellorId)];
[self.webCompent webviewLoad:self]; [self.webCompent webviewLoad:self];
} }
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#import "GMBusinessReportResultController.h" #import "GMBusinessReportResultController.h"
#import "QiniuSDK.h" #import "QiniuSDK.h"
#import "RequestHeader.h" #import "RequestHeader.h"
#import "GMAIUploadImagesManager.h"
#import <GMBaseWeb/GMBaseWeb-Swift.h> #import <GMBaseWeb/GMBaseWeb-Swift.h>
#import <GMbase/GMBaseTool.h> #import <GMbase/GMBaseTool.h>
...@@ -55,8 +56,8 @@ ...@@ -55,8 +56,8 @@
self.recordId = SafeString(dict[@"recordId"]); self.recordId = SafeString(dict[@"recordId"]);
self.shareUserId = SafeString(dict[@"userId"]); self.shareUserId = SafeString(dict[@"userId"]);
self.shareImage = [UIImage imageWithData:[[NSData alloc] initWithBase64EncodedString:imageString options:NSDataBase64DecodingIgnoreUnknownCharacters]]; self.shareImage = [UIImage imageWithData:[[NSData alloc] initWithBase64EncodedString:imageString options:NSDataBase64DecodingIgnoreUnknownCharacters]];
__block NSString *key = [[GMUploadImagesManager shareInstance] createImagePath]; __block NSString *key = [[GMAIUploadImagesManager shareInstance] createImagePath];
[[GMUploadImagesManager shareInstance] getTokenWithType:GMTokenTypeImage resultBlock:^(BOOL result, NSString *message) { [[GMAIUploadImagesManager shareInstance] getTokenWithType:GMTokenTypeImage resultBlock:^(BOOL result, NSString *message) {
if (result) { if (result) {
NSData *imageData = UIImageJPEGRepresentation(self.shareImage, 1); NSData *imageData = UIImageJPEGRepresentation(self.shareImage, 1);
QNUploadManager *upManager = [[QNUploadManager alloc] init]; QNUploadManager *upManager = [[QNUploadManager alloc] init];
......
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