1
0

3 Коммитууд 8e502b042e ... 2b035a6b41

Эзэн SHA1 Мессеж Огноо
  Marvin 2b035a6b41 Merge branch 'dev' of http://106.54.229.239:3000/hello/SDK into dev 3 сар өмнө
  Marvin 3a05e58d95 更新 3 сар өмнө
  Marvin 969ff6a9f9 更新配置文件 3 сар өмнө

BIN
Doc/WanQiu_dev.p12


BIN
Doc/WanQiu_dis.p12


BIN
Doc/langyuDis.mobileprovision


BIN
Doc/lc_sports_dev.mobileprovision


+ 13 - 11
HBuilder-Hello/HBuilder-Hello.xcodeproj/project.pbxproj

@@ -476,6 +476,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				58C7A1722D1C078300F8D7E3 /* StoreKit.framework in Frameworks */,
 				58C7A1792D1C096800F8D7E3 /* libIAPPay.a in Frameworks */,
 				58C7A1802D1C0CD800F8D7E3 /* Metal.framework in Frameworks */,
 				58C7A19A2D1C10F800F8D7E3 /* QuartzCore.framework in Frameworks */,
@@ -486,7 +487,6 @@
 				58C7A1742D1C08A400F8D7E3 /* liblibPayment.a in Frameworks */,
 				58C7A1912D1C10A200F8D7E3 /* CoreVideo.framework in Frameworks */,
 				58C7A1922D1C10A900F8D7E3 /* VideoToolbox.framework in Frameworks */,
-				58C7A1722D1C078300F8D7E3 /* StoreKit.framework in Frameworks */,
 				2F4864C4293E11CC00142360 /* DCUniRecord.framework in Frameworks */,
 				4FE36666254FE3D100DCD173 /* libuchardet.a in Frameworks */,
 				4F8546B12518D8BF00858D80 /* storage.framework in Frameworks */,
@@ -1193,11 +1193,8 @@
 				"${BUILT_PRODUCTS_DIR}/YDBlockKit/YDBlockKit.framework",
 				"${BUILT_PRODUCTS_DIR}/YYModel/YYModel.framework",
 				"${BUILT_PRODUCTS_DIR}/YYText/YYText.framework",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraInfra_iOS/aosl.framework/aosl",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS/AIAEC/AgoraAiEchoCancellationExtension.framework/AgoraAiEchoCancellationExtension",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS/AIAECLL/AgoraAiEchoCancellationLLExtension.framework/AgoraAiEchoCancellationLLExtension",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS/AINS/AgoraAiNoiseSuppressionExtension.framework/AgoraAiNoiseSuppressionExtension",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS/AINSLL/AgoraAiNoiseSuppressionLLExtension.framework/AgoraAiNoiseSuppressionLLExtension",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS/AudioBeauty/AgoraAudioBeautyExtension.framework/AgoraAudioBeautyExtension",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS/ClearVision/AgoraClearVisionExtension.framework/AgoraClearVisionExtension",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS/ContentInspect/AgoraContentInspectExtension.framework/AgoraContentInspectExtension",
@@ -1206,6 +1203,7 @@
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS/LipSync/AgoraLipSyncExtension.framework/AgoraLipSyncExtension",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS/ReplayKit/AgoraReplayKitExtension.framework/AgoraReplayKitExtension",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS/RtcBasic/AgoraRtcKit.framework/AgoraRtcKit",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS/RtcBasic/aosl.framework/aosl",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS/RtcBasic/Agorafdkaac.framework/Agorafdkaac",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS/RtcBasic/Agoraffmpeg.framework/Agoraffmpeg",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS/RtcBasic/AgoraSoundTouch.framework/AgoraSoundTouch",
@@ -1238,11 +1236,8 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YDBlockKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYModel.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/aosl.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraAiEchoCancellationExtension.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraAiEchoCancellationLLExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraAiNoiseSuppressionExtension.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraAiNoiseSuppressionLLExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraAudioBeautyExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraClearVisionExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraContentInspectExtension.framework",
@@ -1251,6 +1246,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraLipSyncExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraReplayKitExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraRtcKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/aosl.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Agorafdkaac.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Agoraffmpeg.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraSoundTouch.framework",
@@ -1425,7 +1421,7 @@
 				);
 				INFOPLIST_FILE = "HBuilder-Hello/HBuilder-Hello-Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = "玩球数据";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1440,6 +1436,9 @@
 					"$(inherited)",
 					"-ObjC",
 					"-ld_classic",
+					"-llibPayment",
+					"-lIAPPay",
+					"-lalixpayment",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.lc.sports;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1468,7 +1467,7 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = HBuilder/HBuilder.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 33;
 				DEBUG_INFORMATION_FORMAT = dwarf;
@@ -1496,7 +1495,7 @@
 				);
 				INFOPLIST_FILE = "HBuilder-Hello/HBuilder-Hello-Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = "玩球数据";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1511,12 +1510,15 @@
 					"$(inherited)",
 					"-ObjC",
 					"-ld_classic",
+					"-llibPayment",
+					"-lIAPPay",
+					"-lalixpayment",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.lc.sports;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = langyuDis;
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = lc_sports_dev;
 				SWIFT_OBJC_BRIDGING_HEADER = "HBuilder-Hello/HBuilder-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

+ 11 - 11
HBuilder-Hello/HBuilder-Hello/HBuilder-Hello-Info.plist

@@ -116,28 +116,28 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+	<key>NSBluetoothAlwaysUsageDescription</key>
+	<string>"玩球数据"获取您的位置信息,方便推送优惠服务</string>
 	<key>NSCameraUsageDescription</key>
-	<string>&quot;玩球数据&quot;获取您的相册权限便于选择图片用于设置头像和用户反馈添加图片</string>
+	<string>"玩球数据"获取您的相册权限便于选择图片用于设置头像和用户反馈添加图片</string>
 	<key>NSContactsUsageDescription</key>
-	<string>&quot;玩球数据&quot;获取您的通讯录信息,方便邀请其他用户</string>
+	<string>"玩球数据"获取您的通讯录信息,方便邀请其他用户</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>&quot;玩球数据&quot;获取您的位置信息,方便推送优惠服务</string>
+	<string>"玩球数据"获取您的位置信息,方便推送优惠服务</string>
 	<key>NSLocationAlwaysUsageDescription</key>
-	<string>&quot;玩球数据&quot;获取您的位置信息,方便推送优惠服务</string>
+	<string>"玩球数据"获取您的位置信息,方便推送优惠服务</string>
 	<key>NSLocationWhenInUseDescription</key>
-	<string>&quot;玩球数据&quot;获取您的位置信息,方便推送优惠服务</string>
+	<string>"玩球数据"获取您的位置信息,方便推送优惠服务</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>&quot;玩球数据&quot;获取您的位置信息,方便推送优惠服务</string>
+	<string>"玩球数据"获取您的位置信息,方便推送优惠服务</string>
 	<key>NSMicrophoneUsageDescription</key>
-	<string>&quot;玩球数据&quot;获取您的相册权限便于采集您的声音</string>
+	<string>"玩球数据"获取您的相册权限便于采集您的声音</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>&quot;玩球数据&quot;获取您的相册权限便于选择图片用于设置头像和用户反馈添加图片</string>
+	<string>"玩球数据"获取您的相册权限便于选择图片用于设置头像和用户反馈添加图片</string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>&quot;玩球数据&quot;获取您的相册权限便于选择图片用于设置头像和用户反馈添加图片</string>
+	<string>"玩球数据"获取您的相册权限便于选择图片用于设置头像和用户反馈添加图片</string>
 	<key>NSUserTrackingUsageDescription</key>
 	<string>请放心,开启权限不会获取您在其他站点的隐私信息,该权限仅用于标识设备并保障服务安全与提示浏览体验</string>
-	<key>NSBluetoothAlwaysUsageDescription</key>
-	<string>&quot;玩球数据&quot;获取您的位置信息,方便推送优惠服务</string>
 	<key>StatusBarBackground</key>
 	<string>#FFFFFF</string>
 	<key>UIApplicationShortcutItems</key>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
HBuilder-Hello/HBuilder-Hello/Pandora/apps/__UNI__9F88893/www/app-config-service.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
HBuilder-Hello/HBuilder-Hello/Pandora/apps/__UNI__9F88893/www/app-service.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
HBuilder-Hello/HBuilder-Hello/Pandora/apps/__UNI__9F88893/www/app-view.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
HBuilder-Hello/HBuilder-Hello/Pandora/apps/__UNI__9F88893/www/manifest.json


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
HBuilder-Hello/HBuilder-Hello/Pandora/apps/__UNI__9F88893/www/pages/live/index.js


+ 4 - 0
HBuilder-Hello/HBuilder/HBuilder.entitlements

@@ -4,5 +4,9 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>m.wanqiushuju.com</string>
+	</array>
 </dict>
 </plist>

+ 1 - 1
HBuilder-Hello/Podfile

@@ -24,7 +24,7 @@ target 'HBuilder' do
   #pod 'PBSDK', :path => '../PBSDK'
   #源代码依懒
   pod 'PBSDK', :path => '../../playBall'
-
+  #pod 'PBSDK', :git => 'http://106.54.229.239:3000/chenmin/playBall.git', :commit => '35eb7e3'
   pod 'WQPlayBallLiveQiu', :path => '../WQPlayBallLiveQiu'
   # Pods for HBuilder
 

+ 8 - 1
SDK/Bundles/PandoraApi.bundle/feature.plist

@@ -205,7 +205,14 @@
 		<key>class</key>
 		<string>PGPlatbyManager</string>
 		<key>extend</key>
-		<dict/>
+		<dict>
+			<key>alix</key>
+			<string>PGAlixPay</string>
+			<key>appleiap</key>
+			<string>PGPlatbyIAP</string>
+			<key>weixin</key>
+			<string>PGWXPay</string>
+		</dict>
 		<key>global</key>
 		<true/>
 	</dict>

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно