wangguolei

fix

@@ -56,5 +56,5 @@ flutter { @@ -56,5 +56,5 @@ flutter {
56 56
57 dependencies { 57 dependencies {
58 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" 58 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
59 - implementation 'com.hhmedic.android.sdk:hh_trtc:3.2.0.01131726' 59 + implementation 'com.hhmedic.android.sdk:hh_trtc:3.4.0.04191618'
60 } 60 }
@@ -6,6 +6,11 @@ target 'Runner' do @@ -6,6 +6,11 @@ target 'Runner' do
6 use_frameworks! 6 use_frameworks!
7 7
8 # Pods for Runner 8 # Pods for Runner
9 - pod 'HHVDoctorSDK', :git => "http://code.hh-medic.com/hh_public/hhvDoctorSDK.ios.git", :tag => "3.1.8.12081754" 9 + pod 'HHVDoctorSDK', :git => "http://code.hh-medic.com/hh_public/hhvDoctorSDK.ios.git",:tag=>'z3.4.0.04201608'
10 10
  11 + pod 'TXLiteAVSDK_TRTC', '~> 9.5.11344'
  12 +#
  13 + pod 'TXIMSDK_Plus_iOS'
  14 +
  15 +# pod 'HHFaceSDK' ,:git=>"http://code.hh-medic.com/hh_public/HHFaceSDK.ios.git"
11 end 16 end
1 PODS: 1 PODS:
2 - - HHVDoctorSDK (3.1.8.12081754):  
3 - - HHVDoctorSDK/Base (= 3.1.8.12081754)  
4 - - TXIMSDK_iOS  
5 - - HHVDoctorSDK/Base (3.1.8.12081754):  
6 - - TXIMSDK_iOS  
7 - - TXIMSDK_iOS (5.1.62) 2 + - HHFaceSDK (1.0.0.032210):
  3 + - HHFaceSDK/Base (= 1.0.0.032210)
  4 + - HHFaceSDK/Base (1.0.0.032210)
  5 + - HHVDoctorSDK (3.4.0.04201608)
  6 + - TXIMSDK_Plus_iOS (6.1.2166)
  7 + - TXLiteAVSDK_TRTC (9.5.11344):
  8 + - TXLiteAVSDK_TRTC/TRTC (= 9.5.11344)
  9 + - TXLiteAVSDK_TRTC/TRTC (9.5.11344)
8 10
9 DEPENDENCIES: 11 DEPENDENCIES:
10 - - HHVDoctorSDK (from `http://code.hh-medic.com/hh_public/hhvDoctorSDK.ios.git`, tag `3.1.8.12081754`) 12 + - HHFaceSDK (from `http://code.hh-medic.com/hh_public/HHFaceSDK.ios.git`)
  13 + - HHVDoctorSDK (from `http://code.hh-medic.com/hh_public/hhvDoctorSDK.ios.git`, tag `z3.4.0.04201608`)
  14 + - TXIMSDK_Plus_iOS
  15 + - TXLiteAVSDK_TRTC (~> 9.5.11344)
11 16
12 SPEC REPOS: 17 SPEC REPOS:
13 trunk: 18 trunk:
14 - - TXIMSDK_iOS 19 + - TXIMSDK_Plus_iOS
  20 + - TXLiteAVSDK_TRTC
15 21
16 EXTERNAL SOURCES: 22 EXTERNAL SOURCES:
  23 + HHFaceSDK:
  24 + :git: http://code.hh-medic.com/hh_public/HHFaceSDK.ios.git
17 HHVDoctorSDK: 25 HHVDoctorSDK:
18 :git: http://code.hh-medic.com/hh_public/hhvDoctorSDK.ios.git 26 :git: http://code.hh-medic.com/hh_public/hhvDoctorSDK.ios.git
19 - :tag: 3.1.8.12081754 27 + :tag: z3.4.0.04201608
20 28
21 CHECKOUT OPTIONS: 29 CHECKOUT OPTIONS:
  30 + HHFaceSDK:
  31 + :commit: 55f71add80d996a90e7212bfce6a8f4acf9da98f
  32 + :git: http://code.hh-medic.com/hh_public/HHFaceSDK.ios.git
22 HHVDoctorSDK: 33 HHVDoctorSDK:
23 :git: http://code.hh-medic.com/hh_public/hhvDoctorSDK.ios.git 34 :git: http://code.hh-medic.com/hh_public/hhvDoctorSDK.ios.git
24 - :tag: 3.1.8.12081754 35 + :tag: z3.4.0.04201608
25 36
26 SPEC CHECKSUMS: 37 SPEC CHECKSUMS:
27 - HHVDoctorSDK: becd28c5f8d790054f9aac97764c7a2aa66712db  
28 - TXIMSDK_iOS: 4016cc84a61db57fc8ca024becf47ad229bbeef1 38 + HHFaceSDK: f21365b7800160d37761b11909355750f00ff7d9
  39 + HHVDoctorSDK: 6b412e07938c09925213b4563200dc90d94e687c
  40 + TXIMSDK_Plus_iOS: 9edddba97d7ad3691ac278e81ee89e0a72a90f5e
  41 + TXLiteAVSDK_TRTC: 8262c47c3e9ea0506677e3b746a5fbafe94f35f7
29 42
30 -PODFILE CHECKSUM: 891c2c78423fe3d936fe4806920fa8d0bf437e99 43 +PODFILE CHECKSUM: 92d78fcb8e421539174022c9a7d25c9e5ad53098
31 44
32 COCOAPODS: 1.11.2 45 COCOAPODS: 1.11.2
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
142 9705A1C41CF9048500538489 /* Embed Frameworks */, 142 9705A1C41CF9048500538489 /* Embed Frameworks */,
143 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 143 3B06AD1E1E4923F5004D2608 /* Thin Binary */,
144 CD4A7ED612D76914EC032036 /* [CP] Embed Pods Frameworks */, 144 CD4A7ED612D76914EC032036 /* [CP] Embed Pods Frameworks */,
145 - 15D85B9C4CB25F3ADA418C31 /* [CP] Copy Pods Resources */, 145 + F1C5D6BBCDF18EEC53ACF507 /* [CP] Copy Pods Resources */,
146 ); 146 );
147 buildRules = ( 147 buildRules = (
148 ); 148 );
@@ -201,23 +201,6 @@ @@ -201,23 +201,6 @@
201 /* End PBXResourcesBuildPhase section */ 201 /* End PBXResourcesBuildPhase section */
202 202
203 /* Begin PBXShellScriptBuildPhase section */ 203 /* Begin PBXShellScriptBuildPhase section */
204 - 15D85B9C4CB25F3ADA418C31 /* [CP] Copy Pods Resources */ = {  
205 - isa = PBXShellScriptBuildPhase;  
206 - buildActionMask = 2147483647;  
207 - files = (  
208 - );  
209 - inputFileListPaths = (  
210 - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",  
211 - );  
212 - name = "[CP] Copy Pods Resources";  
213 - outputFileListPaths = (  
214 - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",  
215 - );  
216 - runOnlyForDeploymentPostprocessing = 0;  
217 - shellPath = /bin/sh;  
218 - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";  
219 - showEnvVarsInLog = 0;  
220 - };  
221 34DD5C6CA50A5873482FC0A4 /* [CP] Check Pods Manifest.lock */ = { 204 34DD5C6CA50A5873482FC0A4 /* [CP] Check Pods Manifest.lock */ = {
222 isa = PBXShellScriptBuildPhase; 205 isa = PBXShellScriptBuildPhase;
223 buildActionMask = 2147483647; 206 buildActionMask = 2147483647;
@@ -285,6 +268,23 @@ @@ -285,6 +268,23 @@
285 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; 268 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
286 showEnvVarsInLog = 0; 269 showEnvVarsInLog = 0;
287 }; 270 };
  271 + F1C5D6BBCDF18EEC53ACF507 /* [CP] Copy Pods Resources */ = {
  272 + isa = PBXShellScriptBuildPhase;
  273 + buildActionMask = 2147483647;
  274 + files = (
  275 + );
  276 + inputFileListPaths = (
  277 + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
  278 + );
  279 + name = "[CP] Copy Pods Resources";
  280 + outputFileListPaths = (
  281 + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
  282 + );
  283 + runOnlyForDeploymentPostprocessing = 0;
  284 + shellPath = /bin/sh;
  285 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
  286 + showEnvVarsInLog = 0;
  287 + };
288 /* End PBXShellScriptBuildPhase section */ 288 /* End PBXShellScriptBuildPhase section */
289 289
290 /* Begin PBXSourcesBuildPhase section */ 290 /* Begin PBXSourcesBuildPhase section */
@@ -374,19 +374,26 @@ @@ -374,19 +374,26 @@
374 isa = XCBuildConfiguration; 374 isa = XCBuildConfiguration;
375 baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; 375 baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
376 buildSettings = { 376 buildSettings = {
  377 + ARCHS = arm64;
377 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 378 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
378 CLANG_ENABLE_MODULES = YES; 379 CLANG_ENABLE_MODULES = YES;
379 - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; 380 + CODE_SIGN_IDENTITY = "Apple Development";
  381 + CODE_SIGN_STYLE = Automatic;
  382 + CURRENT_PROJECT_VERSION = 2022.04.2018;
  383 + DEVELOPMENT_TEAM = SX7LU85BSD;
380 ENABLE_BITCODE = NO; 384 ENABLE_BITCODE = NO;
381 INFOPLIST_FILE = Runner/Info.plist; 385 INFOPLIST_FILE = Runner/Info.plist;
382 LD_RUNPATH_SEARCH_PATHS = ( 386 LD_RUNPATH_SEARCH_PATHS = (
383 "$(inherited)", 387 "$(inherited)",
384 "@executable_path/Frameworks", 388 "@executable_path/Frameworks",
385 ); 389 );
386 - PRODUCT_BUNDLE_IDENTIFIER = com.example.hhDemo; 390 + MARKETING_VERSION = 3.1.2;
  391 + PRODUCT_BUNDLE_IDENTIFIER = com.hh.hhvdoctorSDK;
387 PRODUCT_NAME = "$(TARGET_NAME)"; 392 PRODUCT_NAME = "$(TARGET_NAME)";
  393 + PROVISIONING_PROFILE_SPECIFIER = "";
388 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 394 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
389 SWIFT_VERSION = 5.0; 395 SWIFT_VERSION = 5.0;
  396 + TARGETED_DEVICE_FAMILY = 1;
390 VERSIONING_SYSTEM = "apple-generic"; 397 VERSIONING_SYSTEM = "apple-generic";
391 }; 398 };
392 name = Profile; 399 name = Profile;
@@ -502,20 +509,27 @@ @@ -502,20 +509,27 @@
502 isa = XCBuildConfiguration; 509 isa = XCBuildConfiguration;
503 baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; 510 baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
504 buildSettings = { 511 buildSettings = {
  512 + ARCHS = arm64;
505 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 513 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
506 CLANG_ENABLE_MODULES = YES; 514 CLANG_ENABLE_MODULES = YES;
507 - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; 515 + CODE_SIGN_IDENTITY = "Apple Development";
  516 + CODE_SIGN_STYLE = Automatic;
  517 + CURRENT_PROJECT_VERSION = 2022.04.2018;
  518 + DEVELOPMENT_TEAM = SX7LU85BSD;
508 ENABLE_BITCODE = NO; 519 ENABLE_BITCODE = NO;
509 INFOPLIST_FILE = Runner/Info.plist; 520 INFOPLIST_FILE = Runner/Info.plist;
510 LD_RUNPATH_SEARCH_PATHS = ( 521 LD_RUNPATH_SEARCH_PATHS = (
511 "$(inherited)", 522 "$(inherited)",
512 "@executable_path/Frameworks", 523 "@executable_path/Frameworks",
513 ); 524 );
514 - PRODUCT_BUNDLE_IDENTIFIER = com.example.hhDemo; 525 + MARKETING_VERSION = 3.1.2;
  526 + PRODUCT_BUNDLE_IDENTIFIER = com.hh.hhvdoctorSDK;
515 PRODUCT_NAME = "$(TARGET_NAME)"; 527 PRODUCT_NAME = "$(TARGET_NAME)";
  528 + PROVISIONING_PROFILE_SPECIFIER = "";
516 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 529 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
517 SWIFT_OPTIMIZATION_LEVEL = "-Onone"; 530 SWIFT_OPTIMIZATION_LEVEL = "-Onone";
518 SWIFT_VERSION = 5.0; 531 SWIFT_VERSION = 5.0;
  532 + TARGETED_DEVICE_FAMILY = 1;
519 VERSIONING_SYSTEM = "apple-generic"; 533 VERSIONING_SYSTEM = "apple-generic";
520 }; 534 };
521 name = Debug; 535 name = Debug;
@@ -524,19 +538,26 @@ @@ -524,19 +538,26 @@
524 isa = XCBuildConfiguration; 538 isa = XCBuildConfiguration;
525 baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; 539 baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
526 buildSettings = { 540 buildSettings = {
  541 + ARCHS = arm64;
527 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 542 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
528 CLANG_ENABLE_MODULES = YES; 543 CLANG_ENABLE_MODULES = YES;
529 - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; 544 + CODE_SIGN_IDENTITY = "Apple Development";
  545 + CODE_SIGN_STYLE = Automatic;
  546 + CURRENT_PROJECT_VERSION = 2022.04.2018;
  547 + DEVELOPMENT_TEAM = SX7LU85BSD;
530 ENABLE_BITCODE = NO; 548 ENABLE_BITCODE = NO;
531 INFOPLIST_FILE = Runner/Info.plist; 549 INFOPLIST_FILE = Runner/Info.plist;
532 LD_RUNPATH_SEARCH_PATHS = ( 550 LD_RUNPATH_SEARCH_PATHS = (
533 "$(inherited)", 551 "$(inherited)",
534 "@executable_path/Frameworks", 552 "@executable_path/Frameworks",
535 ); 553 );
536 - PRODUCT_BUNDLE_IDENTIFIER = com.example.hhDemo; 554 + MARKETING_VERSION = 3.1.2;
  555 + PRODUCT_BUNDLE_IDENTIFIER = com.hh.hhvdoctorSDK;
537 PRODUCT_NAME = "$(TARGET_NAME)"; 556 PRODUCT_NAME = "$(TARGET_NAME)";
  557 + PROVISIONING_PROFILE_SPECIFIER = "";
538 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 558 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
539 SWIFT_VERSION = 5.0; 559 SWIFT_VERSION = 5.0;
  560 + TARGETED_DEVICE_FAMILY = 1;
540 VERSIONING_SYSTEM = "apple-generic"; 561 VERSIONING_SYSTEM = "apple-generic";
541 }; 562 };
542 name = Release; 563 name = Release;
@@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
4 <dict> 4 <dict>
5 <key>CFBundleDevelopmentRegion</key> 5 <key>CFBundleDevelopmentRegion</key>
6 <string>$(DEVELOPMENT_LANGUAGE)</string> 6 <string>$(DEVELOPMENT_LANGUAGE)</string>
  7 + <key>CFBundleDisplayName</key>
  8 + <string>招商信诺im_plus</string>
7 <key>CFBundleExecutable</key> 9 <key>CFBundleExecutable</key>
8 <string>$(EXECUTABLE_NAME)</string> 10 <string>$(EXECUTABLE_NAME)</string>
9 <key>CFBundleIdentifier</key> 11 <key>CFBundleIdentifier</key>
@@ -15,13 +17,23 @@ @@ -15,13 +17,23 @@
15 <key>CFBundlePackageType</key> 17 <key>CFBundlePackageType</key>
16 <string>APPL</string> 18 <string>APPL</string>
17 <key>CFBundleShortVersionString</key> 19 <key>CFBundleShortVersionString</key>
18 - <string>$(FLUTTER_BUILD_NAME)</string> 20 + <string>$(MARKETING_VERSION)</string>
19 <key>CFBundleSignature</key> 21 <key>CFBundleSignature</key>
20 <string>????</string> 22 <string>????</string>
21 <key>CFBundleVersion</key> 23 <key>CFBundleVersion</key>
22 - <string>$(FLUTTER_BUILD_NUMBER)</string> 24 + <string>$(CURRENT_PROJECT_VERSION)</string>
23 <key>LSRequiresIPhoneOS</key> 25 <key>LSRequiresIPhoneOS</key>
24 <true/> 26 <true/>
  27 + <key>NSCameraUsageDescription</key>
  28 + <string>应用需使用相机权限,以便您向医生进行视频咨询。</string>
  29 + <key>NSMicrophoneUsageDescription</key>
  30 + <string>应用需使用麦克风权限,以便您向医生进行视频咨询。</string>
  31 + <key>NSPhotoLibraryUsageDescription</key>
  32 + <string>应用需要使用相册权限,以便您向医生发送健康资料。</string>
  33 + <key>UIBackgroundModes</key>
  34 + <array>
  35 + <string>audio</string>
  36 + </array>
25 <key>UILaunchStoryboardName</key> 37 <key>UILaunchStoryboardName</key>
26 <string>LaunchScreen</string> 38 <string>LaunchScreen</string>
27 <key>UIMainStoryboardFile</key> 39 <key>UIMainStoryboardFile</key>
@@ -41,11 +53,5 @@ @@ -41,11 +53,5 @@
41 </array> 53 </array>
42 <key>UIViewControllerBasedStatusBarAppearance</key> 54 <key>UIViewControllerBasedStatusBarAppearance</key>
43 <false/> 55 <false/>
44 - <key>NSPhotoLibraryUsageDescription</key>  
45 - <string>应用需要使用相册权限,以便您向医生发送健康资料。</string>  
46 - <key>NSCameraUsageDescription</key>  
47 - <string>应用需使用相机权限,以便您向医生进行视频咨询。</string>  
48 - <key>NSMicrophoneUsageDescription</key>  
49 - <string>应用需使用麦克风权限,以便您向医生进行视频咨询。</string>  
50 </dict> 56 </dict>
51 </plist> 57 </plist>
@@ -41,7 +41,7 @@ class _MyHomePageState extends State<MyHomePage> { @@ -41,7 +41,7 @@ class _MyHomePageState extends State<MyHomePage> {
41 41
42 void skipToChatHome(){ 42 void skipToChatHome(){
43 _hhPlatform.invokeMapMethod("skipToChatHome" , { 43 _hhPlatform.invokeMapMethod("skipToChatHome" , {
44 - "sdkProductId": "3000", // 分配的产品ID 44 + "sdkProductId": "9001", // 分配的产品ID
45 "isDevelop": true, // 是否开始测试服模式,开启后连接测试服务器 45 "isDevelop": true, // 是否开始测试服模式,开启后连接测试服务器
46 "userToken": "3BCC438BBBE99F86C48A3C1DB11A43843F0D04F68EA2608F6783B874E4F50EEF" // 用户 userToken 46 "userToken": "3BCC438BBBE99F86C48A3C1DB11A43843F0D04F68EA2608F6783B874E4F50EEF" // 用户 userToken
47 }); 47 });