fix ui

chengyanfang
Commit 834a9158c977e2e09aef3d7627df30a37ffa24aa 834a9158 1 parent 07539340
Showing 7 changed files with 2 additions and 145 deletions
.DS_Store
HHMSDKDemo.xcodeproj/project.pbxproj
HHMSDKDemo/LoginVC.swift
HHMSDKDemo/Res/Base.lproj/Main.storyboard
HHMSDKDemo/Res/Info.plist
HHMSDKDemo/SettingVC.swift
Podfile
--- a/.DS_Store
View file @834a915
+++ b/.DS_Store
View file @834a915
--- a/HHMSDKDemo.xcodeproj/project.pbxproj
View file @834a915
+++ b/HHMSDKDemo.xcodeproj/project.pbxproj
View file @834a915
@@ -212,8 +212,6 @@
 				95F31C3A20D0F8C9000BDAC4 /* Frameworks */,
 				95F31C3B20D0F8C9000BDAC4 /* Resources */,
 				2F2866C9626CA31B9760B5C4 /* [CP] Embed Pods Frameworks */,
-				F8948772789F21F588832CFB /* [CP] Copy Pods Resources */,
-				7EFDD5BE25A6A2EA0021A7DB /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -325,40 +323,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		7EFDD5BE25A6A2EA0021A7DB /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nAPP_PATH=\"${TARGET_BUILD_DIR}/${WRAPPER_NAME}\"  \n\n# This script loops through the frameworks embedded in the application and  \n\n# removes unused architectures.  \n\n find \"$APP_PATH\" -name '*.framework' -type d | while read -r FRAMEWORK  \n do  \n FRAMEWORK_EXECUTABLE_NAME=$(defaults read \"$FRAMEWORK/Info.plist\" CFBundleExecutable)  \n FRAMEWORK_EXECUTABLE_PATH=\"$FRAMEWORK/$FRAMEWORK_EXECUTABLE_NAME\"  \n echo \"Executable is $FRAMEWORK_EXECUTABLE_PATH\"  \n\n EXTRACTED_ARCHS=()  \n\n for ARCH in $ARCHS  \n do  \n echo \"Extracting $ARCH from $FRAMEWORK_EXECUTABLE_NAME\"  \n lipo -extract \"$ARCH\" \"$FRAMEWORK_EXECUTABLE_PATH\" -o \"$FRAMEWORK_EXECUTABLE_PATH-$ARCH\"  \n EXTRACTED_ARCHS+=(\"$FRAMEWORK_EXECUTABLE_PATH-$ARCH\")  \n done  \n\n echo \"Merging extracted architectures: ${ARCHS}\"  \n lipo -o \"$FRAMEWORK_EXECUTABLE_PATH-merged\" -create \"${EXTRACTED_ARCHS[@]}\"  \n rm \"${EXTRACTED_ARCHS[@]}\"  \n\n echo \"Replacing original executable with thinned version\"  \n rm \"$FRAMEWORK_EXECUTABLE_PATH\"  \n mv \"$FRAMEWORK_EXECUTABLE_PATH-merged\" \"$FRAMEWORK_EXECUTABLE_PATH\"  \n\n done\n";
-		};
-		F8948772789F21F588832CFB /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-HHMSDKDemo/Pods-HHMSDKDemo-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-HHMSDKDemo/Pods-HHMSDKDemo-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-HHMSDKDemo/Pods-HHMSDKDemo-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 /* Begin PBXSourcesBuildPhase section */
--- a/HHMSDKDemo/LoginVC.swift
View file @834a915
+++ b/HHMSDKDemo/LoginVC.swift
View file @834a915
@@ -17,7 +17,6 @@ class LoginVC: UIViewController {
     @IBOutlet weak var mLoginBtn: UIButton!
     @IBOutlet weak var mMemberBtn: UIButton!
     @IBOutlet weak var mPidText: UITextField!
-    @IBOutlet weak var mSkipHomeBt : UIButton!
     fileprivate lazy var mTestBt : UIButton = {
@@ -66,7 +65,6 @@ class LoginVC: UIViewController {
             mLoginBtn.isHidden = true
             mCallBtn.isHidden = false
             mMemberBtn.isHidden = false
-            mSkipHomeBt.isHidden = false
         }
     }
@@ -94,19 +92,6 @@ class LoginVC: UIViewController {
     }
-    @IBAction func skipToHome(_ sender : UIButton) {
-        
-        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()
-        }
-    }
-    
     override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
         self.view.endEditing(true)
     }
@@ -116,7 +101,6 @@ class LoginVC: UIViewController {
             self?.mLoginBtn.isHidden = false
             self?.mCallBtn.isHidden = true
             self?.mMemberBtn.isHidden = true
-            self?.mSkipHomeBt.isHidden = true
             if let aError = $0 {
                 self?.mDescLbl.text = "退出登录失败:\(aError)"
--- a/HHMSDKDemo/Res/Base.lproj/Main.storyboard
View file @834a915
+++ b/HHMSDKDemo/Res/Base.lproj/Main.storyboard
View file @834a915
@@ -98,19 +98,6 @@
                                     <action selector="doSelectMem:" destination="H9G-Cx-5aF" eventType="touchUpInside" id="SnD-7P-d52"/>
                                 </connections>
                             </button>
-                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HAJ-cu-o1I">
-                                <rect key="frame" x="46" y="427.5" width="283" height="50"/>
-                                <color key="backgroundColor" red="0.026365790516138077" green="0.7069585919380188" blue="0.95850151777267456" alpha="0.9990234375" colorSpace="custom" customColorSpace="sRGB"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="50" id="VyT-1E-E2P"/>
-                                </constraints>
-                                <state key="normal" title="跳转首页">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                </state>
-                                <connections>
-                                    <action selector="skipToHome:" destination="H9G-Cx-5aF" eventType="touchUpInside" id="Ogg-hL-Exq"/>
-                                </connections>
-                            </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SDKProductID" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vGE-5O-Jnp">
                                 <rect key="frame" x="36" y="74" width="99" height="18"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
@@ -143,16 +130,13 @@
                             <constraint firstItem="WDq-Dc-IOR" firstAttribute="top" secondItem="vGE-5O-Jnp" secondAttribute="bottom" constant="50" id="UuJ-ZL-pny"/>
                             <constraint firstItem="8oo-l9-0xS" firstAttribute="leading" secondItem="8W4-aR-lG5" secondAttribute="leading" id="ZWz-DC-qe9"/>
                             <constraint firstItem="tXq-br-C4i" firstAttribute="centerY" secondItem="WDq-Dc-IOR" secondAttribute="centerY" id="d6z-rc-7Hm"/>
-                            <constraint firstItem="HAJ-cu-o1I" firstAttribute="leading" secondItem="Hxg-q0-rWs" secondAttribute="leadingMargin" constant="30" id="gbT-y9-FiN"/>
                             <constraint firstItem="8oo-l9-0xS" firstAttribute="trailing" secondItem="8W4-aR-lG5" secondAttribute="trailing" id="hEl-M1-WZ9"/>
                             <constraint firstItem="8W4-aR-lG5" firstAttribute="centerX" secondItem="Hxg-q0-rWs" secondAttribute="centerX" id="k7H-CD-dJB"/>
                             <constraint firstItem="8W4-aR-lG5" firstAttribute="top" secondItem="poL-z9-aP0" secondAttribute="bottom" constant="25" id="lbY-4y-PGG"/>
-                            <constraint firstAttribute="trailingMargin" secondItem="HAJ-cu-o1I" secondAttribute="trailing" constant="30" id="n3M-dU-lw9"/>
                             <constraint firstItem="LMZ-Wb-ONz" firstAttribute="leading" secondItem="Hxg-q0-rWs" secondAttribute="leading" constant="150" id="n6s-bX-QgY"/>
                             <constraint firstItem="3Ez-hY-hE0" firstAttribute="centerX" secondItem="Hxg-q0-rWs" secondAttribute="centerX" id="tNe-km-eME"/>
                             <constraint firstItem="WDq-Dc-IOR" firstAttribute="leading" secondItem="Hxg-q0-rWs" secondAttribute="leadingMargin" constant="20" id="wmc-fH-91m"/>
                             <constraint firstItem="poL-z9-aP0" firstAttribute="top" secondItem="tXq-br-C4i" secondAttribute="bottom" constant="20" id="xXs-dA-lRG"/>
-                            <constraint firstItem="HAJ-cu-o1I" firstAttribute="top" secondItem="8oo-l9-0xS" secondAttribute="bottom" constant="10" id="xc5-7d-vGv"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="83O-Gf-RkC">
@@ -174,7 +158,6 @@
                         <outlet property="mLoginBtn" destination="poL-z9-aP0" id="iZz-fi-zBw"/>
                         <outlet property="mMemberBtn" destination="8oo-l9-0xS" id="jkY-bH-DFI"/>
                         <outlet property="mPidText" destination="LMZ-Wb-ONz" id="3LE-zP-K1g"/>
-                        <outlet property="mSkipHomeBt" destination="HAJ-cu-o1I" id="TNg-Ha-66n"/>
                         <outlet property="mTextView" destination="tXq-br-C4i" id="jhn-qC-kjs"/>
                     </connections>
                 </viewController>
--- a/HHMSDKDemo/Res/Info.plist
View file @834a915
+++ b/HHMSDKDemo/Res/Info.plist
View file @834a915
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>视频SDK&lt;腾讯版&gt;</string>
+	<string>视频SDK&lt;腾讯smart版&gt; </string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
--- a/HHMSDKDemo/SettingVC.swift
View file @834a915
+++ b/HHMSDKDemo/SettingVC.swift
View file @834a915
@@ -61,29 +61,6 @@ class SettingVC : UIViewController {
         sections.append(videoSetting)
-        
-        let infoListSetting = ("信息流设置",[
-            ("是否过滤总结卡片",HHSDKOptions.default.mMessageOptions.isFilterSummary,true),
-            ("是否过滤药卡",HHSDKOptions.default.mMessageOptions.isFilterMedicinal,true),
-//            ("小助手默认头像",false,false),
-//            ("小助手默认昵称",false,false),
-//            ("信息流默认标题",false,false),
-            ("开启定位",false,true),
-            ("是否通过Present弹出信息流",HHSDKOptions.default.mMessageOptions.isByPresent,true),
-        ])
-        sections.append(infoListSetting)
-        
-        
-        
-        let userCenterSetting = ("个人中心设置",[
-            ("是否隐藏个人中心入口",HHSDKOptions.default.mUserCenterOptions.hideUserCenter,true),
-            ("是否展示激活码入口",HHSDKOptions.default.mUserCenterOptions.enableActivate,true),
-            ("是否展示档案库入口",HHSDKOptions.default.mUserCenterOptions.enableMedical,true),
-            
-        ])
-        sections.append(userCenterSetting)
-        
-        
         mTableView.reloadData()
     }
 }
@@ -135,30 +112,7 @@ extension SettingVC : UITableViewDelegate,UITableViewDataSource {
             }
             break
-            
-        case (2,2):
-            
-            showEditAlter(title: "小助手默认头像",info: HHSDKOptions.default.mExtension) { info in
-                HHSDKOptions.default.mMessageOptions.defaultDocHeader = info
-            }
-            
-            break
-            
-        case (2,3):
-            
-            showEditAlter(title: "小助手默认昵称",info: HHSDKOptions.default.mExtension) { info in
-                HHSDKOptions.default.mMessageOptions.defaultDocName = info
-            }
-            
-            break
-        case (2,4):
-            
-            showEditAlter(title: "信息流默认标题",info: HHSDKOptions.default.mExtension) { info in
-                HHSDKOptions.default.mMessageOptions.messageTitle = info
-            }
-            
-            break
         default:
             break
@@ -195,34 +149,6 @@ extension SettingVC {
         case (1,4):
             HHSDKOptions.default.mVideoOptions.allowEvaluate = isOpen
-        case (2,0):
-            HHSDKOptions.default.mMessageOptions.isFilterSummary = isOpen
-            
-        case (2,1):
-            HHSDKOptions.default.mMessageOptions.isFilterMedicinal = isOpen
-            
-        case (2,2):
-                        
-            if isOpen {
-                HHLocation.default.startLocation(lng: "116.431941", lat: "39.940199")
-                    
-            }else{
-                
-                HHLocation.default.closeLocation()
-            }
-        
-        case (2,3):
-            HHSDKOptions.default.mMessageOptions.isByPresent = isOpen
-            
-        case (3,0):
-            HHSDKOptions.default.mUserCenterOptions.hideUserCenter = isOpen
-        
-        case (3,1):
-            HHSDKOptions.default.mUserCenterOptions.enableActivate = isOpen
-            
-        case (3,2):
-            HHSDKOptions.default.mUserCenterOptions.enableMedical = isOpen
-            
         default:
             break
         }
--- a/Podfile
View file @834a915
+++ b/Podfile
View file @834a915
@@ -8,7 +8,7 @@ target 'HHMSDKDemo' do
   project './HHMSDKDemo.xcodeproj'
   pod 'SVProgressHUD'
   pod 'SnapKit'
-  pod 'HHVDoctorSDK', :git => "http://code.hh-medic.com/hh_public/hhvDoctorSDK.ios.git"
+  pod 'HH_TRTC_Mini'
 end