Showing
4 changed files
with
17 additions
and
5 deletions
@@ -95,8 +95,16 @@ class LoginVC: UIViewController { | @@ -95,8 +95,16 @@ class LoginVC: UIViewController { | ||
95 | 95 | ||
96 | 96 | ||
97 | @IBAction func skipToHome(_ sender : UIButton) { | 97 | @IBAction func skipToHome(_ sender : UIButton) { |
98 | + if HHSDKOptions.default.mMessageOptions.isByPresent { | ||
99 | + if let vc = HHMSDK.default.chatHomeVC() { | ||
100 | + let nav = UINavigationController(rootViewController: vc) | ||
101 | + nav.modalPresentationStyle = .fullScreen | ||
102 | + self.present(nav, animated: true, completion: nil) | ||
103 | + } | ||
104 | + }else{ | ||
98 | HHMSDK.default.skipChatHome() | 105 | HHMSDK.default.skipChatHome() |
99 | } | 106 | } |
107 | + } | ||
100 | 108 | ||
101 | override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) { | 109 | override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) { |
102 | self.view.endEditing(true) | 110 | self.view.endEditing(true) |
@@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
11 | <!--LoginVC--> | 11 | <!--LoginVC--> |
12 | <scene sceneID="ZuK-Ew-nhs"> | 12 | <scene sceneID="ZuK-Ew-nhs"> |
13 | <objects> | 13 | <objects> |
14 | - <viewController id="H9G-Cx-5aF" customClass="LoginVC" customModule="HHTMedicSDK" customModuleProvider="target" sceneMemberID="viewController"> | 14 | + <viewController id="H9G-Cx-5aF" customClass="LoginVC" customModule="HHMSDKDemo" customModuleProvider="target" sceneMemberID="viewController"> |
15 | <layoutGuides> | 15 | <layoutGuides> |
16 | <viewControllerLayoutGuide type="top" id="pvb-0q-YKi"/> | 16 | <viewControllerLayoutGuide type="top" id="pvb-0q-YKi"/> |
17 | <viewControllerLayoutGuide type="bottom" id="N1D-F5-d1D"/> | 17 | <viewControllerLayoutGuide type="bottom" id="N1D-F5-d1D"/> |
@@ -29,7 +29,7 @@ | @@ -29,7 +29,7 @@ | ||
29 | <color key="textColor" red="0.39215686274509803" green="0.39215686274509803" blue="0.39215686274509803" alpha="1" colorSpace="calibratedRGB"/> | 29 | <color key="textColor" red="0.39215686274509803" green="0.39215686274509803" blue="0.39215686274509803" alpha="1" colorSpace="calibratedRGB"/> |
30 | <nil key="highlightedColor"/> | 30 | <nil key="highlightedColor"/> |
31 | </label> | 31 | </label> |
32 | - <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="EC313F3198AF4F1972484E49E718D4DED7B294C6D4F4B9CB52C7CC1AF9E5140B" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="tXq-br-C4i"> | 32 | + <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="FA0A5E533F3E828AF2FDBFB3220872163F0D04F68EA2608F6783B874E4F50EEF" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="tXq-br-C4i"> |
33 | <rect key="frame" x="141" y="102.5" width="198" height="100"/> | 33 | <rect key="frame" x="141" y="102.5" width="198" height="100"/> |
34 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> | 34 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> |
35 | <constraints> | 35 | <constraints> |
@@ -185,7 +185,7 @@ | @@ -185,7 +185,7 @@ | ||
185 | <!--SettingVC--> | 185 | <!--SettingVC--> |
186 | <scene sceneID="pv9-J4-of0"> | 186 | <scene sceneID="pv9-J4-of0"> |
187 | <objects> | 187 | <objects> |
188 | - <viewController id="o3F-Mf-qyV" customClass="SettingVC" customModule="HHTMedicSDK" customModuleProvider="target" sceneMemberID="viewController"> | 188 | + <viewController id="o3F-Mf-qyV" customClass="SettingVC" customModule="HHMSDKDemo" customModuleProvider="target" sceneMemberID="viewController"> |
189 | <layoutGuides> | 189 | <layoutGuides> |
190 | <viewControllerLayoutGuide type="top" id="B3S-wn-Uqm"/> | 190 | <viewControllerLayoutGuide type="top" id="B3S-wn-Uqm"/> |
191 | <viewControllerLayoutGuide type="bottom" id="YOS-cd-yhV"/> | 191 | <viewControllerLayoutGuide type="bottom" id="YOS-cd-yhV"/> |
@@ -198,7 +198,7 @@ | @@ -198,7 +198,7 @@ | ||
198 | <rect key="frame" x="0.0" y="44" width="375" height="623"/> | 198 | <rect key="frame" x="0.0" y="44" width="375" height="623"/> |
199 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> | 199 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> |
200 | <prototypes> | 200 | <prototypes> |
201 | - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="SettingCell" id="Bgf-fW-wAR" customClass="SettingCell" customModule="HHTMedicSDK" customModuleProvider="target"> | 201 | + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="SettingCell" id="Bgf-fW-wAR" customClass="SettingCell" customModule="HHMSDKDemo" customModuleProvider="target"> |
202 | <rect key="frame" x="0.0" y="28" width="375" height="43.5"/> | 202 | <rect key="frame" x="0.0" y="28" width="375" height="43.5"/> |
203 | <autoresizingMask key="autoresizingMask"/> | 203 | <autoresizingMask key="autoresizingMask"/> |
204 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Bgf-fW-wAR" id="Ied-xa-MDf"> | 204 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Bgf-fW-wAR" id="Ied-xa-MDf"> |
@@ -69,6 +69,7 @@ class SettingVC : UIViewController { | @@ -69,6 +69,7 @@ class SettingVC : UIViewController { | ||
69 | ("小助手默认昵称",false,false), | 69 | ("小助手默认昵称",false,false), |
70 | ("信息流默认标题",false,false), | 70 | ("信息流默认标题",false,false), |
71 | ("开启定位",false,true), | 71 | ("开启定位",false,true), |
72 | + ("是否通过Present弹出信息流",HHSDKOptions.default.mMessageOptions.isByPresent,true), | ||
72 | ]) | 73 | ]) |
73 | sections.append(infoListSetting) | 74 | sections.append(infoListSetting) |
74 | 75 | ||
@@ -224,6 +225,9 @@ extension SettingVC { | @@ -224,6 +225,9 @@ extension SettingVC { | ||
224 | HHLocation.default.closeLocation() | 225 | HHLocation.default.closeLocation() |
225 | } | 226 | } |
226 | 227 | ||
228 | + case (2,6): | ||
229 | + HHSDKOptions.default.mMessageOptions.isByPresent = isOpen | ||
230 | + | ||
227 | case (3,0): | 231 | case (3,0): |
228 | HHSDKOptions.default.mUserCenterOptions.hideUserCenter = isOpen | 232 | HHSDKOptions.default.mUserCenterOptions.hideUserCenter = isOpen |
229 | 233 |
@@ -8,7 +8,7 @@ target 'HHMSDKDemo' do | @@ -8,7 +8,7 @@ target 'HHMSDKDemo' do | ||
8 | project './HHMSDKDemo.xcodeproj' | 8 | project './HHMSDKDemo.xcodeproj' |
9 | pod 'SVProgressHUD' | 9 | pod 'SVProgressHUD' |
10 | pod 'SnapKit' | 10 | pod 'SnapKit' |
11 | - pod 'HHVDoctorSDK', :git => "http://code.hh-medic.com/hh_public/hhvDoctorSDK.ios.git" | 11 | + pod 'HHVDoctorSDK', :git => "http://code.hh-medic.com/hh_public/hhvDoctorSDK.ios.git", :branch => 'feature/medic' |
12 | 12 | ||
13 | end | 13 | end |
14 | 14 |
-
Please register or login to post a comment