fix bugs

chengyanfang
Commit 8b000337cc1a881e5cbcd1594db2aa931f5b78a1 8b000337 1 parent 6d45033b
Showing 5 changed files with 18 additions and 36 deletions
.DS_Store
HHMSDKDemo.xcodeproj/project.pbxproj
HHMSDKDemo/LoginVC.swift
HHMSDKDemo/Res/Base.lproj/Main.storyboard
HHMSDKDemo/SettingVC.swift
--- a/.DS_Store
View file @8b00033
+++ b/.DS_Store
View file @8b00033
--- a/HHMSDKDemo.xcodeproj/project.pbxproj
View file @8b00033
+++ b/HHMSDKDemo.xcodeproj/project.pbxproj
View file @8b00033
@@ -527,7 +527,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.6;
+				MARKETING_VERSION = 3.0.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.hh.hhvdoctorSDK;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -557,7 +557,8 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.6;
+				MARKETING_VERSION = 3.0.8;
+				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.hh.hhvdoctorSDK;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
--- a/HHMSDKDemo/LoginVC.swift
View file @8b00033
+++ b/HHMSDKDemo/LoginVC.swift
View file @8b00033
@@ -96,17 +96,12 @@ class LoginVC: UIViewController {
     @IBAction func skipToHome(_ sender : UIButton) {
-        HHSDKOptions.default.mMessageOptions.isByPresent = true
-        
-        if let vc = HHMSDK.default.chatHomeVC() {
-            let nav = UINavigationController(rootViewController: vc)
-            nav.modalPresentationStyle = .fullScreen
-            self.present(nav, animated: true, completion: nil)
-        }
-        
-        
         if HHSDKOptions.default.mMessageOptions.isByPresent {
-            
+            if let vc = HHMSDK.default.chatHomeVC() {
+                let nav = UINavigationController(rootViewController: vc)
+                nav.modalPresentationStyle = .fullScreen
+                self.present(nav, animated: true, completion: nil)
+            }
         }else{
             HHMSDK.default.skipChatHome()
         }
--- a/HHMSDKDemo/Res/Base.lproj/Main.storyboard
View file @8b00033
+++ b/HHMSDKDemo/Res/Base.lproj/Main.storyboard
View file @8b00033
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="gh6-uF-nli">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="gh6-uF-nli">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -29,7 +29,7 @@
                                 <color key="textColor" red="0.39215686274509803" green="0.39215686274509803" blue="0.39215686274509803" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="FA0A5E533F3E828AF2FDBFB3220872163F0D04F68EA2608F6783B874E4F50EEF" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="tXq-br-C4i">
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="69831AA2CD985438D1DB957A1D079FB13F0D04F68EA2608F6783B874E4F50EEF" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="tXq-br-C4i">
                                 <rect key="frame" x="141" y="102.5" width="198" height="100"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
@@ -180,7 +180,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="v4Z-Mu-IOA" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1276" y="-564.46776611694156"/>
+            <point key="canvasLocation" x="1247" y="-564"/>
         </scene>
         <!--SettingVC-->
         <scene sceneID="pv9-J4-of0">
--- a/HHMSDKDemo/SettingVC.swift
View file @8b00033
+++ b/HHMSDKDemo/SettingVC.swift
View file @8b00033
@@ -65,9 +65,9 @@ class SettingVC : UIViewController {
         let infoListSetting = ("信息流设置",[
             ("是否过滤总结卡片",HHSDKOptions.default.mMessageOptions.isFilterSummary,true),
             ("是否过滤药卡",HHSDKOptions.default.mMessageOptions.isFilterMedicinal,true),
-            ("小助手默认头像",false,false),
-            ("小助手默认昵称",false,false),
-            ("信息流默认标题",false,false),
+//            ("小助手默认头像",false,false),
+//            ("小助手默认昵称",false,false),
+//            ("信息流默认标题",false,false),
             ("开启定位",false,true),
             ("是否通过Present弹出信息流",HHSDKOptions.default.mMessageOptions.isByPresent,true),
         ])
@@ -201,22 +201,8 @@ extension SettingVC {
         case (2,1):
             HHSDKOptions.default.mMessageOptions.isFilterMedicinal = isOpen
-        case (2,5):
-            
-//            if isOpen {
-//                HHMSDK.default.aliPayHook = {(url,scheme,callback) in
-//                    let isOk = AlipaySDK.defaultService()?.payInterceptor(withUrl: url, fromScheme: scheme, callback: { (result) in
-//                        callback(result as? [String : Any] ?? ["test":""])
-//                    })
-//
-//
-//                    return isOk ?? false
-//                }
-//            }else{
-//
-//                HHMSDK.default.aliPayHook = nil
-//            }
-            
+        case (2,2):
+                        
             if isOpen {
                 HHLocation.default.startLocation(lng: "116.431941", lat: "39.940199")
@@ -225,7 +211,7 @@ extension SettingVC {
                 HHLocation.default.closeLocation()
             }
-        case (2,6):
+        case (2,3):
             HHSDKOptions.default.mMessageOptions.isByPresent = isOpen
         case (3,0):