3.0.8

chengyanfang
Commit cea3da471cd561eeb4d43af1269b71757ddfe774 cea3da47 1 parent 8b000337
Showing 6 changed files with 94 additions and 54 deletions
.DS_Store
HHMSDKDemo.xcodeproj/project.pbxproj
HHMSDKDemo.xcodeproj/xcshareddata/xcschemes/HHMSDKDemo.xcscheme
HHMSDKDemo.xcodeproj/xcshareddata/xcschemes/HHMedicineDemo.xcscheme
HHMSDKDemo/Res/Info.plist
README.md
--- a/.DS_Store
View file @cea3da4
+++ b/.DS_Store
View file @cea3da4
--- a/HHMSDKDemo.xcodeproj/project.pbxproj
View file @cea3da4
+++ b/HHMSDKDemo.xcodeproj/project.pbxproj
View file @cea3da4
@@ -213,6 +213,7 @@
 				95F31C3B20D0F8C9000BDAC4 /* Resources */,
 				2F2866C9626CA31B9760B5C4 /* [CP] Embed Pods Frameworks */,
 				F8948772789F21F588832CFB /* [CP] Copy Pods Resources */,
+				7E39885B25A5CA5E00A49ABE /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -230,7 +231,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0940;
-				LastUpgradeCheck = 0940;
+				LastUpgradeCheck = 1230;
 				ORGANIZATIONNAME = shmily;
 				TargetAttributes = {
 					95F31C3C20D0F8C9000BDAC4 = {
@@ -324,6 +325,23 @@
 			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;
 		};
+		7E39885B25A5CA5E00A49ABE /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 12;
+			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;
@@ -417,6 +435,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -442,7 +461,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -479,6 +498,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -498,7 +518,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -520,9 +540,10 @@
 				CURRENT_PROJECT_VERSION = 2020.1113.13;
 				DEVELOPMENT_TEAM = SX7LU85BSD;
 				ENABLE_BITCODE = NO;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 armv7";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "$(SRCROOT)/HHMSDKDemo/Res/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -550,9 +571,10 @@
 				CURRENT_PROJECT_VERSION = 2020.1113.13;
 				DEVELOPMENT_TEAM = SX7LU85BSD;
 				ENABLE_BITCODE = NO;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 armv7";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "$(SRCROOT)/HHMSDKDemo/Res/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
--- a/HHMSDKDemo.xcodeproj/xcshareddata/xcschemes/HHMSDKDemo.xcscheme
View file @cea3da4
+++ b/HHMSDKDemo.xcodeproj/xcshareddata/xcschemes/HHMSDKDemo.xcscheme
View file @cea3da4
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1230"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:HHMSDKDemo.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -62,8 +60,6 @@
             ReferencedContainer = "container:HHMSDKDemo.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
--- a/HHMSDKDemo.xcodeproj/xcshareddata/xcschemes/HHMedicineDemo.xcscheme
View file @cea3da4
+++ b/HHMSDKDemo.xcodeproj/xcshareddata/xcschemes/HHMedicineDemo.xcscheme
View file @cea3da4
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1230"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:HHMSDKDemo.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -62,8 +60,6 @@
             ReferencedContainer = "container:HHMSDKDemo.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
--- a/HHMSDKDemo/Res/Info.plist
View file @cea3da4
+++ b/HHMSDKDemo/Res/Info.plist
View file @cea3da4
@@ -69,6 +69,11 @@
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>NSCameraUsageDescription</key>
 	<string>应用需使用相机权限，以便您向医生进行视频咨询。</string>
 	<key>NSMicrophoneUsageDescription</key>
--- a/README.md
View file @cea3da4
+++ b/README.md
View file @cea3da4
@@ -5,52 +5,25 @@
 网址：https://www.hh-medic.com <br/>
 地址：北京市东城区东直门来福士7层
 </p>
+[toc]
+
+
-   * [HHDoctorSDK 接入说明](#hhdoctorsdk-接入说明)
-      * [0. 更新日志](#0-更新日志)
-
-      * [1. 集成方式](#1-集成方式)
-         * [1.1. 手动集成](#11-手动集成)
-         * [1.2. 自动集成（推荐）](#12-自动集成推荐)
-         * [1.3. 调用规则](#13-调用规则)
-         
-      * [2. 初始化](#2-初始化)
-
-      * [3. 登录账户](#3-登录账户)
-         * [3.1. 登录](#31-登录)
-         * [3.2. 登出](#32-登出)
-         
-      * [4. 视频呼叫](#4-视频呼叫)
-
-      * [5. 代理(delegate)(可选)](#5-代理delegate可选)
-         * [5.1. 加入](#51-加入)
-         * [5.2. 移除](#52-移除)
-         
-      * [6. 信息流](#6-信息流)
-
-           [6.1. 跳转信息流](#61-加入)
-
-           [6.2. 饿了么购药配置](#62-加入)
-
-      * [7. 其他配置](#6-其他配置)
-        
-         * [7.1. APNs](#61-apns)
-         * [7.2. Background Modes](#62-background-modes)
-         * [7.3. 扩展参数](#63-extension-params)
-         
 ##  0. 更新日志
-> 3.0.6.120416  (2020-12-04)
+> 3.0.8
- - 删除项目中UIWebview的引用
- - 适配不同版本的xcode
+ - 增加多人视频功能
+ - 适配模拟器运行
 > 3.0.6
  - HHMVideoDelegate增加getChatParentView(_ view : UIView)，以便开发者在呼叫页面添加自定义view
  - 增加跳转信息流的接口
+ - 删除项目中UIWebview的引用
+ - 适配不同版本的xcode
 > 2.0.2
@@ -354,3 +327,51 @@ xxx target -> Capabilities -> Background Modes -> 勾选 Audio，Airplay and Pic
 ```
 HHSDKOptions.default.setCallExtension(callExtension: "xxx")
 ```
+
+
+
+### 7.4. 上架 App Store 时，出现 x86_64, i386 架构错误该如何解决？
+
+该问题是由于 App Store 不支持 x86_64, i386 架构引起的，具体解决方法如下：
+
+1. 清空项目编译缓存：
+   选择【Product】>【clean】，按住Alt变成 clean build Folder...，等待操作完成。
+2. 剔除 App Store 不支持的 x86_64 和 i386 架构：
+   a. 选择【TARGETS】>【Build Phases】。
+   b. 单击加号，选择【New Run Script Phase】。
+   c. 添加如下代码：
+
+```
+APP_PATH="${TARGET_BUILD_DIR}/${WRAPPER_NAME}"  
+
+# This script loops through the frameworks embedded in the application and  
+
+# removes unused architectures.  
+
+ find "$APP_PATH" -name '*.framework' -type d | while read -r FRAMEWORK  
+ do  
+ FRAMEWORK_EXECUTABLE_NAME=$(defaults read "$FRAMEWORK/Info.plist" CFBundleExecutable)  
+ FRAMEWORK_EXECUTABLE_PATH="$FRAMEWORK/$FRAMEWORK_EXECUTABLE_NAME"  
+ echo "Executable is $FRAMEWORK_EXECUTABLE_PATH"  
+
+ EXTRACTED_ARCHS=()  
+
+ for ARCH in $ARCHS  
+ do  
+ echo "Extracting $ARCH from $FRAMEWORK_EXECUTABLE_NAME"  
+ lipo -extract "$ARCH" "$FRAMEWORK_EXECUTABLE_PATH" -o "$FRAMEWORK_EXECUTABLE_PATH-$ARCH"  
+ EXTRACTED_ARCHS+=("$FRAMEWORK_EXECUTABLE_PATH-$ARCH")  
+ done  
+
+ echo "Merging extracted architectures: ${ARCHS}"  
+ lipo -o "$FRAMEWORK_EXECUTABLE_PATH-merged" -create "${EXTRACTED_ARCHS[@]}"  
+ rm "${EXTRACTED_ARCHS[@]}"  
+
+ echo "Replacing original executable with thinned version"  
+ rm "$FRAMEWORK_EXECUTABLE_PATH"  
+ mv "$FRAMEWORK_EXECUTABLE_PATH-merged" "$FRAMEWORK_EXECUTABLE_PATH"  
+
+ done
+```
+
+3. 重新打包上传。