iOS Team / CNLiveMineModule · Commits

Commit d2841db326cf4e19c1237b547c6d0df5019885f0

Authored by zhangxiaowen
1 parent 9f9c5e76

no message

Inline Side-by-side
Showing 5 changed files with 53 additions and 31 deletions
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_gift_box.imageset/Contents.json 0 → 100644
  View file @d2841db
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "mine_gift_box@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "filename" : "mine_gift_box@3x.png",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "version" : 1,
  20 + "author" : "xcode"
  21 + }
  22 +}
0 23 \ No newline at end of file
... ...
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_gift_box.imageset/mine_gift_box@2x.png 0 → 100644
View file @d2841db

2.37 KB
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_gift_box.imageset/mine_gift_box@3x.png 0 → 100644
View file @d2841db

4.86 KB
CNLiveMineModule/Classes/Controller/CNLiveMineController.m
  View file @d2841db
... ... @@ -57,8 +57,8 @@ static const CGFloat timeValue = 1.5;
57 57 @"name":@"常用工具",
58 58 @"style":@"2",
59 59 @"margin":@"10",
60   - @"titles": @[@"收货地址", @"补贴余额", @"我的收藏",@"发布记录",@"邀请好友",@"设置",@"路径工具",@"小家音响",@"我的礼物"],
61   - @"images":@[@"mine_address",@"mine_card",@"mine_like",@"mine_release",@"mine_invitation",@"mine_set",@"mine_tool_map",@"mine_home_box",@"mine_home_box"]
  60 + @"titles": @[@"收货地址", @"补贴余额", @"我的收藏",@"发布记录",@"邀请好友",@"设置",@"小家音响",@"我的礼盒",@"路径工具"],
  61 + @"images":@[@"mine_address",@"mine_card",@"mine_like",@"mine_release",@"mine_invitation",@"mine_set",@"mine_home_box",@"mine_gift_box",@"mine_tool_map"]
62 62 },
63 63 @{
64 64 @"name":@"购买的商品",
... ...
Example/CNLiveMineModule.xcodeproj/project.pbxproj
  View file @d2841db
... ... @@ -234,8 +234,8 @@
234 234 6003F586195388D20070C39A /* Sources */,
235 235 6003F587195388D20070C39A /* Frameworks */,
236 236 6003F588195388D20070C39A /* Resources */,
237   - AA1FA6A7BB640248D40DE198 /* [CP] Embed Pods Frameworks */,
238   - FA29A0502F7D41B0EFC3AAD5 /* [CP] Copy Pods Resources */,
  237 + 6F29CADAA3D57AE5E75D49B9 /* [CP] Embed Pods Frameworks */,
  238 + 4A1C888253535AB722F2627B /* [CP] Copy Pods Resources */,
239 239 );
240 240 buildRules = (
241 241 );
... ... @@ -326,29 +326,31 @@
326 326 /* End PBXResourcesBuildPhase section */
327 327  
328 328 /* Begin PBXShellScriptBuildPhase section */
329   - A9B5D0EFC5B6FCA241FAE929 /* [CP] Check Pods Manifest.lock */ = {
  329 + 4A1C888253535AB722F2627B /* [CP] Copy Pods Resources */ = {
330 330 isa = PBXShellScriptBuildPhase;
331 331 buildActionMask = 2147483647;
332 332 files = (
333 333 );
334   - inputFileListPaths = (
335   - );
336 334 inputPaths = (
337   - "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
338   - "${PODS_ROOT}/Manifest.lock",
339   - );
340   - name = "[CP] Check Pods Manifest.lock";
341   - outputFileListPaths = (
  335 + "${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh",
  336 + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMineModule/CNLiveMineModule.bundle",
  337 + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMyOrderModule/CNLiveMyOrderModule.bundle",
  338 + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.bundle",
  339 + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveSettingModule/CNLiveSettingModule.bundle",
342 340 );
  341 + name = "[CP] Copy Pods Resources";
343 342 outputPaths = (
344   - "$(DERIVED_FILE_DIR)/Pods-CNLiveMineModule_Example-checkManifestLockResult.txt",
  343 + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMineModule.bundle",
  344 + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMyOrderModule.bundle",
  345 + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveQrCodeModule.bundle",
  346 + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveSettingModule.bundle",
345 347 );
346 348 runOnlyForDeploymentPostprocessing = 0;
347 349 shellPath = /bin/sh;
348   - 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";
  350 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh\"\n";
349 351 showEnvVarsInLog = 0;
350 352 };
351   - AA1FA6A7BB640248D40DE198 /* [CP] Embed Pods Frameworks */ = {
  353 + 6F29CADAA3D57AE5E75D49B9 /* [CP] Embed Pods Frameworks */ = {
352 354 isa = PBXShellScriptBuildPhase;
353 355 buildActionMask = 2147483647;
354 356 files = (
... ... @@ -374,7 +376,6 @@
374 376 "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
375 377 "${BUILT_PRODUCTS_DIR}/CNLiveIntegralModule/CNLiveIntegralModule.framework",
376 378 "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework",
377   - "${BUILT_PRODUCTS_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.framework",
378 379 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
379 380 "${PODS_ROOT}/CNLiveSDKs/CNLiveSDKs/Classes/CNLivePaySDK.framework",
380 381 "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
... ... @@ -422,7 +423,6 @@
422 423 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
423 424 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveIntegralModule.framework",
424 425 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework",
425   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveQrCodeModule.framework",
426 426 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
427 427 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLivePaySDK.framework",
428 428 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
... ... @@ -454,7 +454,7 @@
454 454 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-frameworks.sh\"\n";
455 455 showEnvVarsInLog = 0;
456 456 };
457   - BFE3DD8ECDF347EE483385B5 /* [CP] Check Pods Manifest.lock */ = {
  457 + A9B5D0EFC5B6FCA241FAE929 /* [CP] Check Pods Manifest.lock */ = {
458 458 isa = PBXShellScriptBuildPhase;
459 459 buildActionMask = 2147483647;
460 460 files = (
... ... @@ -469,33 +469,33 @@
469 469 outputFileListPaths = (
470 470 );
471 471 outputPaths = (
472   - "$(DERIVED_FILE_DIR)/Pods-CNLiveMineModule_Tests-checkManifestLockResult.txt",
  472 + "$(DERIVED_FILE_DIR)/Pods-CNLiveMineModule_Example-checkManifestLockResult.txt",
473 473 );
474 474 runOnlyForDeploymentPostprocessing = 0;
475 475 shellPath = /bin/sh;
476 476 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";
477 477 showEnvVarsInLog = 0;
478 478 };
479   - FA29A0502F7D41B0EFC3AAD5 /* [CP] Copy Pods Resources */ = {
  479 + BFE3DD8ECDF347EE483385B5 /* [CP] Check Pods Manifest.lock */ = {
480 480 isa = PBXShellScriptBuildPhase;
481 481 buildActionMask = 2147483647;
482 482 files = (
483 483 );
  484 + inputFileListPaths = (
  485 + );
484 486 inputPaths = (
485   - "${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh",
486   - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMineModule/CNLiveMineModule.bundle",
487   - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMyOrderModule/CNLiveMyOrderModule.bundle",
488   - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveSettingModule/CNLiveSettingModule.bundle",
  487 + "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
  488 + "${PODS_ROOT}/Manifest.lock",
  489 + );
  490 + name = "[CP] Check Pods Manifest.lock";
  491 + outputFileListPaths = (
489 492 );
490   - name = "[CP] Copy Pods Resources";
491 493 outputPaths = (
492   - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMineModule.bundle",
493   - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMyOrderModule.bundle",
494   - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveSettingModule.bundle",
  494 + "$(DERIVED_FILE_DIR)/Pods-CNLiveMineModule_Tests-checkManifestLockResult.txt",
495 495 );
496 496 runOnlyForDeploymentPostprocessing = 0;
497 497 shellPath = /bin/sh;
498   - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh\"\n";
  498 + 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";
499 499 showEnvVarsInLog = 0;
500 500 };
501 501 /* End PBXShellScriptBuildPhase section */
... ... @@ -648,7 +648,7 @@
648 648 INFOPLIST_FILE = "CNLiveMineModule/CNLiveMineModule-Info.plist";
649 649 MARKETING_VERSION = 1.0;
650 650 MODULE_NAME = ExampleApp;
651   - PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAddd;
  651 + PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAddd.CNLiveMineModule;
652 652 PRODUCT_NAME = "我的模块";
653 653 SWIFT_VERSION = 4.0;
654 654 TARGETED_DEVICE_FAMILY = 1;
... ... @@ -669,7 +669,7 @@
669 669 INFOPLIST_FILE = "CNLiveMineModule/CNLiveMineModule-Info.plist";
670 670 MARKETING_VERSION = 1.0;
671 671 MODULE_NAME = ExampleApp;
672   - PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAddd;
  672 + PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAddd.CNLiveMineModule;
673 673 PRODUCT_NAME = "我的模块";
674 674 SWIFT_VERSION = 4.0;
675 675 TARGETED_DEVICE_FAMILY = 1;
... ...