iOS Team / ScioLive · Commits

Commit 956334a2fdbe0f3fd0ae6b92c42b4ab825fe8d84

Authored by zhangxiaowen
1 parent c3cdea15

细节调整

Inline Side-by-side
Showing 47 changed files with 628 additions and 75 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
  View file @956334a
@@ -415,6 +415,117 @@ @@ -415,6 +415,117 @@
415 0870DACE215F1CE6008DC811 /* VideoPlayBackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0870DACD215F1CE6008DC811 /* VideoPlayBackViewController.m */; }; 415 0870DACE215F1CE6008DC811 /* VideoPlayBackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0870DACD215F1CE6008DC811 /* VideoPlayBackViewController.m */; };
416 0870DACF215F1CE6008DC811 /* VideoPlayBackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0870DACD215F1CE6008DC811 /* VideoPlayBackViewController.m */; }; 416 0870DACF215F1CE6008DC811 /* VideoPlayBackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0870DACD215F1CE6008DC811 /* VideoPlayBackViewController.m */; };
417 0870DAD0215F1CE6008DC811 /* VideoPlayBackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0870DACD215F1CE6008DC811 /* VideoPlayBackViewController.m */; }; 417 0870DAD0215F1CE6008DC811 /* VideoPlayBackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0870DACD215F1CE6008DC811 /* VideoPlayBackViewController.m */; };
  418 + 0886E32B2179A8BD00C777A3 /* aboutEN.html in Resources */ = {isa = PBXBuildFile; fileRef = 0886E32A2179A8BD00C777A3 /* aboutEN.html */; };
  419 + 0886E32C2179A8BD00C777A3 /* aboutEN.html in Resources */ = {isa = PBXBuildFile; fileRef = 0886E32A2179A8BD00C777A3 /* aboutEN.html */; };
  420 + 0886E32D2179A8BD00C777A3 /* aboutEN.html in Resources */ = {isa = PBXBuildFile; fileRef = 0886E32A2179A8BD00C777A3 /* aboutEN.html */; };
  421 + 0886E3532179AE0B00C777A3 /* arscan_back@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3302179AE0B00C777A3 /* arscan_back@3x.png */; };
  422 + 0886E3542179AE0B00C777A3 /* arscan_back@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3302179AE0B00C777A3 /* arscan_back@3x.png */; };
  423 + 0886E3552179AE0B00C777A3 /* arscan_back@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3302179AE0B00C777A3 /* arscan_back@3x.png */; };
  424 + 0886E3562179AE0B00C777A3 /* Thumbs.db in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3312179AE0B00C777A3 /* Thumbs.db */; };
  425 + 0886E3572179AE0B00C777A3 /* Thumbs.db in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3312179AE0B00C777A3 /* Thumbs.db */; };
  426 + 0886E3582179AE0B00C777A3 /* Thumbs.db in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3312179AE0B00C777A3 /* Thumbs.db */; };
  427 + 0886E3592179AE0B00C777A3 /* arscan_flip@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3322179AE0B00C777A3 /* arscan_flip@2x.png */; };
  428 + 0886E35A2179AE0B00C777A3 /* arscan_flip@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3322179AE0B00C777A3 /* arscan_flip@2x.png */; };
  429 + 0886E35B2179AE0B00C777A3 /* arscan_flip@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3322179AE0B00C777A3 /* arscan_flip@2x.png */; };
  430 + 0886E35C2179AE0B00C777A3 /* arscan_lock@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3332179AE0B00C777A3 /* arscan_lock@3x.png */; };
  431 + 0886E35D2179AE0B00C777A3 /* arscan_lock@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3332179AE0B00C777A3 /* arscan_lock@3x.png */; };
  432 + 0886E35E2179AE0B00C777A3 /* arscan_lock@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3332179AE0B00C777A3 /* arscan_lock@3x.png */; };
  433 + 0886E35F2179AE0B00C777A3 /* arscan_lock@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3342179AE0B00C777A3 /* arscan_lock@2x.png */; };
  434 + 0886E3602179AE0B00C777A3 /* arscan_lock@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3342179AE0B00C777A3 /* arscan_lock@2x.png */; };
  435 + 0886E3612179AE0B00C777A3 /* arscan_lock@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3342179AE0B00C777A3 /* arscan_lock@2x.png */; };
  436 + 0886E3622179AE0B00C777A3 /* arscan_flip@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3352179AE0B00C777A3 /* arscan_flip@3x.png */; };
  437 + 0886E3632179AE0B00C777A3 /* arscan_flip@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3352179AE0B00C777A3 /* arscan_flip@3x.png */; };
  438 + 0886E3642179AE0B00C777A3 /* arscan_flip@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3352179AE0B00C777A3 /* arscan_flip@3x.png */; };
  439 + 0886E3652179AE0B00C777A3 /* arscan_back@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3362179AE0B00C777A3 /* arscan_back@2x.png */; };
  440 + 0886E3662179AE0B00C777A3 /* arscan_back@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3362179AE0B00C777A3 /* arscan_back@2x.png */; };
  441 + 0886E3672179AE0B00C777A3 /* arscan_back@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3362179AE0B00C777A3 /* arscan_back@2x.png */; };
  442 + 0886E3682179AE0B00C777A3 /* arscan_unlock@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3372179AE0B00C777A3 /* arscan_unlock@2x.png */; };
  443 + 0886E3692179AE0B00C777A3 /* arscan_unlock@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3372179AE0B00C777A3 /* arscan_unlock@2x.png */; };
  444 + 0886E36A2179AE0B00C777A3 /* arscan_unlock@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3372179AE0B00C777A3 /* arscan_unlock@2x.png */; };
  445 + 0886E36B2179AE0B00C777A3 /* arscan_unlock@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3382179AE0B00C777A3 /* arscan_unlock@3x.png */; };
  446 + 0886E36C2179AE0B00C777A3 /* arscan_unlock@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3382179AE0B00C777A3 /* arscan_unlock@3x.png */; };
  447 + 0886E36D2179AE0B00C777A3 /* arscan_unlock@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3382179AE0B00C777A3 /* arscan_unlock@3x.png */; };
  448 + 0886E36E2179AE0B00C777A3 /* loader_spinner0013.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33A2179AE0B00C777A3 /* loader_spinner0013.png */; };
  449 + 0886E36F2179AE0B00C777A3 /* loader_spinner0013.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33A2179AE0B00C777A3 /* loader_spinner0013.png */; };
  450 + 0886E3702179AE0B00C777A3 /* loader_spinner0013.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33A2179AE0B00C777A3 /* loader_spinner0013.png */; };
  451 + 0886E3712179AE0B00C777A3 /* loader_spinner0007.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33B2179AE0B00C777A3 /* loader_spinner0007.png */; };
  452 + 0886E3722179AE0B00C777A3 /* loader_spinner0007.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33B2179AE0B00C777A3 /* loader_spinner0007.png */; };
  453 + 0886E3732179AE0B00C777A3 /* loader_spinner0007.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33B2179AE0B00C777A3 /* loader_spinner0007.png */; };
  454 + 0886E3742179AE0B00C777A3 /* loader_spinner0006.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33C2179AE0B00C777A3 /* loader_spinner0006.png */; };
  455 + 0886E3752179AE0B00C777A3 /* loader_spinner0006.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33C2179AE0B00C777A3 /* loader_spinner0006.png */; };
  456 + 0886E3762179AE0B00C777A3 /* loader_spinner0006.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33C2179AE0B00C777A3 /* loader_spinner0006.png */; };
  457 + 0886E3772179AE0B00C777A3 /* loader_spinner0012.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33D2179AE0B00C777A3 /* loader_spinner0012.png */; };
  458 + 0886E3782179AE0B00C777A3 /* loader_spinner0012.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33D2179AE0B00C777A3 /* loader_spinner0012.png */; };
  459 + 0886E3792179AE0B00C777A3 /* loader_spinner0012.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33D2179AE0B00C777A3 /* loader_spinner0012.png */; };
  460 + 0886E37A2179AE0B00C777A3 /* loader_spinner0004.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33E2179AE0B00C777A3 /* loader_spinner0004.png */; };
  461 + 0886E37B2179AE0B00C777A3 /* loader_spinner0004.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33E2179AE0B00C777A3 /* loader_spinner0004.png */; };
  462 + 0886E37C2179AE0B00C777A3 /* loader_spinner0004.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33E2179AE0B00C777A3 /* loader_spinner0004.png */; };
  463 + 0886E37D2179AE0B00C777A3 /* loader_spinner0010.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33F2179AE0B00C777A3 /* loader_spinner0010.png */; };
  464 + 0886E37E2179AE0B00C777A3 /* loader_spinner0010.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33F2179AE0B00C777A3 /* loader_spinner0010.png */; };
  465 + 0886E37F2179AE0B00C777A3 /* loader_spinner0010.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33F2179AE0B00C777A3 /* loader_spinner0010.png */; };
  466 + 0886E3802179AE0B00C777A3 /* loader_spinner0011.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3402179AE0B00C777A3 /* loader_spinner0011.png */; };
  467 + 0886E3812179AE0B00C777A3 /* loader_spinner0011.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3402179AE0B00C777A3 /* loader_spinner0011.png */; };
  468 + 0886E3822179AE0B00C777A3 /* loader_spinner0011.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3402179AE0B00C777A3 /* loader_spinner0011.png */; };
  469 + 0886E3832179AE0B00C777A3 /* loader_spinner0005.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3412179AE0B00C777A3 /* loader_spinner0005.png */; };
  470 + 0886E3842179AE0B00C777A3 /* loader_spinner0005.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3412179AE0B00C777A3 /* loader_spinner0005.png */; };
  471 + 0886E3852179AE0B00C777A3 /* loader_spinner0005.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3412179AE0B00C777A3 /* loader_spinner0005.png */; };
  472 + 0886E3862179AE0B00C777A3 /* loader_spinner0001.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3422179AE0B00C777A3 /* loader_spinner0001.png */; };
  473 + 0886E3872179AE0B00C777A3 /* loader_spinner0001.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3422179AE0B00C777A3 /* loader_spinner0001.png */; };
  474 + 0886E3882179AE0B00C777A3 /* loader_spinner0001.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3422179AE0B00C777A3 /* loader_spinner0001.png */; };
  475 + 0886E3892179AE0B00C777A3 /* loader_spinner0015.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3432179AE0B00C777A3 /* loader_spinner0015.png */; };
  476 + 0886E38A2179AE0B00C777A3 /* loader_spinner0015.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3432179AE0B00C777A3 /* loader_spinner0015.png */; };
  477 + 0886E38B2179AE0B00C777A3 /* loader_spinner0015.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3432179AE0B00C777A3 /* loader_spinner0015.png */; };
  478 + 0886E38C2179AE0B00C777A3 /* loader_spinner0014.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3442179AE0B00C777A3 /* loader_spinner0014.png */; };
  479 + 0886E38D2179AE0B00C777A3 /* loader_spinner0014.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3442179AE0B00C777A3 /* loader_spinner0014.png */; };
  480 + 0886E38E2179AE0B00C777A3 /* loader_spinner0014.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3442179AE0B00C777A3 /* loader_spinner0014.png */; };
  481 + 0886E38F2179AE0B00C777A3 /* loader_spinner0000.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3452179AE0B00C777A3 /* loader_spinner0000.png */; };
  482 + 0886E3902179AE0B00C777A3 /* loader_spinner0000.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3452179AE0B00C777A3 /* loader_spinner0000.png */; };
  483 + 0886E3912179AE0B00C777A3 /* loader_spinner0000.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3452179AE0B00C777A3 /* loader_spinner0000.png */; };
  484 + 0886E3922179AE0B00C777A3 /* loader_spinner0016.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3462179AE0B00C777A3 /* loader_spinner0016.png */; };
  485 + 0886E3932179AE0B00C777A3 /* loader_spinner0016.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3462179AE0B00C777A3 /* loader_spinner0016.png */; };
  486 + 0886E3942179AE0B00C777A3 /* loader_spinner0016.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3462179AE0B00C777A3 /* loader_spinner0016.png */; };
  487 + 0886E3952179AE0B00C777A3 /* loader_spinner0002.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3472179AE0B00C777A3 /* loader_spinner0002.png */; };
  488 + 0886E3962179AE0B00C777A3 /* loader_spinner0002.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3472179AE0B00C777A3 /* loader_spinner0002.png */; };
  489 + 0886E3972179AE0B00C777A3 /* loader_spinner0002.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3472179AE0B00C777A3 /* loader_spinner0002.png */; };
  490 + 0886E3982179AE0B00C777A3 /* loader_spinner0003.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3482179AE0B00C777A3 /* loader_spinner0003.png */; };
  491 + 0886E3992179AE0B00C777A3 /* loader_spinner0003.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3482179AE0B00C777A3 /* loader_spinner0003.png */; };
  492 + 0886E39A2179AE0B00C777A3 /* loader_spinner0003.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3482179AE0B00C777A3 /* loader_spinner0003.png */; };
  493 + 0886E39B2179AE0B00C777A3 /* loader_spinner0017.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3492179AE0B00C777A3 /* loader_spinner0017.png */; };
  494 + 0886E39C2179AE0B00C777A3 /* loader_spinner0017.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3492179AE0B00C777A3 /* loader_spinner0017.png */; };
  495 + 0886E39D2179AE0B00C777A3 /* loader_spinner0017.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3492179AE0B00C777A3 /* loader_spinner0017.png */; };
  496 + 0886E39E2179AE0B00C777A3 /* loader_spinner0019.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34A2179AE0B00C777A3 /* loader_spinner0019.png */; };
  497 + 0886E39F2179AE0B00C777A3 /* loader_spinner0019.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34A2179AE0B00C777A3 /* loader_spinner0019.png */; };
  498 + 0886E3A02179AE0B00C777A3 /* loader_spinner0019.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34A2179AE0B00C777A3 /* loader_spinner0019.png */; };
  499 + 0886E3A12179AE0B00C777A3 /* loader_spinner0018.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34B2179AE0B00C777A3 /* loader_spinner0018.png */; };
  500 + 0886E3A22179AE0B00C777A3 /* loader_spinner0018.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34B2179AE0B00C777A3 /* loader_spinner0018.png */; };
  501 + 0886E3A32179AE0B00C777A3 /* loader_spinner0018.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34B2179AE0B00C777A3 /* loader_spinner0018.png */; };
  502 + 0886E3A42179AE0B00C777A3 /* loader_spinner0008.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34C2179AE0B00C777A3 /* loader_spinner0008.png */; };
  503 + 0886E3A52179AE0B00C777A3 /* loader_spinner0008.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34C2179AE0B00C777A3 /* loader_spinner0008.png */; };
  504 + 0886E3A62179AE0B00C777A3 /* loader_spinner0008.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34C2179AE0B00C777A3 /* loader_spinner0008.png */; };
  505 + 0886E3A72179AE0B00C777A3 /* loader_spinner0020.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34D2179AE0B00C777A3 /* loader_spinner0020.png */; };
  506 + 0886E3A82179AE0B00C777A3 /* loader_spinner0020.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34D2179AE0B00C777A3 /* loader_spinner0020.png */; };
  507 + 0886E3A92179AE0B00C777A3 /* loader_spinner0020.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34D2179AE0B00C777A3 /* loader_spinner0020.png */; };
  508 + 0886E3AA2179AE0B00C777A3 /* loader_spinner0021.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34E2179AE0B00C777A3 /* loader_spinner0021.png */; };
  509 + 0886E3AB2179AE0B00C777A3 /* loader_spinner0021.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34E2179AE0B00C777A3 /* loader_spinner0021.png */; };
  510 + 0886E3AC2179AE0B00C777A3 /* loader_spinner0021.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34E2179AE0B00C777A3 /* loader_spinner0021.png */; };
  511 + 0886E3AD2179AE0B00C777A3 /* loader_spinner0009.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34F2179AE0B00C777A3 /* loader_spinner0009.png */; };
  512 + 0886E3AE2179AE0B00C777A3 /* loader_spinner0009.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34F2179AE0B00C777A3 /* loader_spinner0009.png */; };
  513 + 0886E3AF2179AE0B00C777A3 /* loader_spinner0009.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34F2179AE0B00C777A3 /* loader_spinner0009.png */; };
  514 + 0886E3B02179AE0B00C777A3 /* loader_spinner0023.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3502179AE0B00C777A3 /* loader_spinner0023.png */; };
  515 + 0886E3B12179AE0B00C777A3 /* loader_spinner0023.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3502179AE0B00C777A3 /* loader_spinner0023.png */; };
  516 + 0886E3B22179AE0B00C777A3 /* loader_spinner0023.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3502179AE0B00C777A3 /* loader_spinner0023.png */; };
  517 + 0886E3B32179AE0B00C777A3 /* loader_spinner0022.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3512179AE0B00C777A3 /* loader_spinner0022.png */; };
  518 + 0886E3B42179AE0B00C777A3 /* loader_spinner0022.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3512179AE0B00C777A3 /* loader_spinner0022.png */; };
  519 + 0886E3B52179AE0B00C777A3 /* loader_spinner0022.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3512179AE0B00C777A3 /* loader_spinner0022.png */; };
  520 + 0886E3B62179AE0B00C777A3 /* KJARLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0886E3522179AE0B00C777A3 /* KJARLib.framework */; };
  521 + 0886E3B72179AE0B00C777A3 /* KJARLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0886E3522179AE0B00C777A3 /* KJARLib.framework */; };
  522 + 0886E3B82179AE0B00C777A3 /* KJARLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0886E3522179AE0B00C777A3 /* KJARLib.framework */; };
  523 + 0886E3B92179AF0000C777A3 /* KJARLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0886E3522179AE0B00C777A3 /* KJARLib.framework */; };
  524 + 0886E3BA2179AF0000C777A3 /* KJARLib.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0886E3522179AE0B00C777A3 /* KJARLib.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
  525 + 0886E3C02179D6E100C777A3 /* cnlive_zhouxin_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3BF2179D6E100C777A3 /* cnlive_zhouxin_icon.png */; };
  526 + 0886E3C12179D6E100C777A3 /* cnlive_zhouxin_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3BF2179D6E100C777A3 /* cnlive_zhouxin_icon.png */; };
  527 + 0886E3C22179D6E100C777A3 /* cnlive_zhouxin_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3BF2179D6E100C777A3 /* cnlive_zhouxin_icon.png */; };
  528 + 0886E3C42179D99900C777A3 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0886E3C32179D99900C777A3 /* WebKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
418 08940D752154EB2C00F85DB6 /* UILabel+TextAlign.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D742154EB2C00F85DB6 /* UILabel+TextAlign.m */; }; 529 08940D752154EB2C00F85DB6 /* UILabel+TextAlign.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D742154EB2C00F85DB6 /* UILabel+TextAlign.m */; };
419 08940D762154EB2C00F85DB6 /* UILabel+TextAlign.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D742154EB2C00F85DB6 /* UILabel+TextAlign.m */; }; 530 08940D762154EB2C00F85DB6 /* UILabel+TextAlign.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D742154EB2C00F85DB6 /* UILabel+TextAlign.m */; };
420 08940D772154EB2C00F85DB6 /* UILabel+TextAlign.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D742154EB2C00F85DB6 /* UILabel+TextAlign.m */; }; 531 08940D772154EB2C00F85DB6 /* UILabel+TextAlign.m in Sources */ = {isa = PBXBuildFile; fileRef = 08940D742154EB2C00F85DB6 /* UILabel+TextAlign.m */; };
@@ -612,9 +723,6 @@ @@ -612,9 +723,6 @@
612 08C090BF215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C090BE215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m */; }; 723 08C090BF215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C090BE215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m */; };
613 08C090C0215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C090BE215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m */; }; 724 08C090C0215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C090BE215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m */; };
614 08C090C1215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C090BE215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m */; }; 725 08C090C1215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C090BE215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m */; };
615 - 08FB875C215DBBF000DA5423 /* cnlive_zhouxin_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 08FB875B215DBBF000DA5423 /* cnlive_zhouxin_icon.png */; };  
616 - 08FB875D215DBBF000DA5423 /* cnlive_zhouxin_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 08FB875B215DBBF000DA5423 /* cnlive_zhouxin_icon.png */; };  
617 - 08FB875E215DBBF000DA5423 /* cnlive_zhouxin_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 08FB875B215DBBF000DA5423 /* cnlive_zhouxin_icon.png */; };  
618 08FB8769215DD1C200DA5423 /* VoiceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08FB8767215DD1C200DA5423 /* VoiceViewController.m */; }; 726 08FB8769215DD1C200DA5423 /* VoiceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08FB8767215DD1C200DA5423 /* VoiceViewController.m */; };
619 08FB876A215DD1C200DA5423 /* VoiceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08FB8767215DD1C200DA5423 /* VoiceViewController.m */; }; 727 08FB876A215DD1C200DA5423 /* VoiceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08FB8767215DD1C200DA5423 /* VoiceViewController.m */; };
620 08FB876B215DD1C200DA5423 /* VoiceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08FB8767215DD1C200DA5423 /* VoiceViewController.m */; }; 728 08FB876B215DD1C200DA5423 /* VoiceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08FB8767215DD1C200DA5423 /* VoiceViewController.m */; };
@@ -685,6 +793,7 @@ @@ -685,6 +793,7 @@
685 085D86B92159D3660037D480 /* GPUImage.framework in CopyFiles */, 793 085D86B92159D3660037D480 /* GPUImage.framework in CopyFiles */,
686 085D86BA2159D3660037D480 /* KSYGPUResource.bundle in CopyFiles */, 794 085D86BA2159D3660037D480 /* KSYGPUResource.bundle in CopyFiles */,
687 085D86BB2159D3660037D480 /* libksygpulive.framework in CopyFiles */, 795 085D86BB2159D3660037D480 /* libksygpulive.framework in CopyFiles */,
  796 + 0886E3BA2179AF0000C777A3 /* KJARLib.framework in CopyFiles */,
688 085D86A82159D0400037D480 /* CNLivePlayerSDK.framework in CopyFiles */, 797 085D86A82159D0400037D480 /* CNLivePlayerSDK.framework in CopyFiles */,
689 ); 798 );
690 runOnlyForDeploymentPostprocessing = 0; 799 runOnlyForDeploymentPostprocessing = 0;
@@ -932,6 +1041,43 @@ @@ -932,6 +1041,43 @@
932 085D86D0215A3BFD0037D480 /* CNLiveUserUpdateViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLiveUserUpdateViewController.m; sourceTree = "<group>"; }; 1041 085D86D0215A3BFD0037D480 /* CNLiveUserUpdateViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLiveUserUpdateViewController.m; sourceTree = "<group>"; };
933 0870DACC215F1CE6008DC811 /* VideoPlayBackViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoPlayBackViewController.h; sourceTree = "<group>"; }; 1042 0870DACC215F1CE6008DC811 /* VideoPlayBackViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoPlayBackViewController.h; sourceTree = "<group>"; };
934 0870DACD215F1CE6008DC811 /* VideoPlayBackViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VideoPlayBackViewController.m; sourceTree = "<group>"; }; 1043 0870DACD215F1CE6008DC811 /* VideoPlayBackViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VideoPlayBackViewController.m; sourceTree = "<group>"; };
  1044 + 0886E32A2179A8BD00C777A3 /* aboutEN.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = aboutEN.html; sourceTree = "<group>"; };
  1045 + 0886E3302179AE0B00C777A3 /* arscan_back@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arscan_back@3x.png"; sourceTree = "<group>"; };
  1046 + 0886E3312179AE0B00C777A3 /* Thumbs.db */ = {isa = PBXFileReference; lastKnownFileType = file; path = Thumbs.db; sourceTree = "<group>"; };
  1047 + 0886E3322179AE0B00C777A3 /* arscan_flip@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arscan_flip@2x.png"; sourceTree = "<group>"; };
  1048 + 0886E3332179AE0B00C777A3 /* arscan_lock@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arscan_lock@3x.png"; sourceTree = "<group>"; };
  1049 + 0886E3342179AE0B00C777A3 /* arscan_lock@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arscan_lock@2x.png"; sourceTree = "<group>"; };
  1050 + 0886E3352179AE0B00C777A3 /* arscan_flip@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arscan_flip@3x.png"; sourceTree = "<group>"; };
  1051 + 0886E3362179AE0B00C777A3 /* arscan_back@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arscan_back@2x.png"; sourceTree = "<group>"; };
  1052 + 0886E3372179AE0B00C777A3 /* arscan_unlock@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arscan_unlock@2x.png"; sourceTree = "<group>"; };
  1053 + 0886E3382179AE0B00C777A3 /* arscan_unlock@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arscan_unlock@3x.png"; sourceTree = "<group>"; };
  1054 + 0886E33A2179AE0B00C777A3 /* loader_spinner0013.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0013.png; sourceTree = "<group>"; };
  1055 + 0886E33B2179AE0B00C777A3 /* loader_spinner0007.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0007.png; sourceTree = "<group>"; };
  1056 + 0886E33C2179AE0B00C777A3 /* loader_spinner0006.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0006.png; sourceTree = "<group>"; };
  1057 + 0886E33D2179AE0B00C777A3 /* loader_spinner0012.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0012.png; sourceTree = "<group>"; };
  1058 + 0886E33E2179AE0B00C777A3 /* loader_spinner0004.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0004.png; sourceTree = "<group>"; };
  1059 + 0886E33F2179AE0B00C777A3 /* loader_spinner0010.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0010.png; sourceTree = "<group>"; };
  1060 + 0886E3402179AE0B00C777A3 /* loader_spinner0011.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0011.png; sourceTree = "<group>"; };
  1061 + 0886E3412179AE0B00C777A3 /* loader_spinner0005.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0005.png; sourceTree = "<group>"; };
  1062 + 0886E3422179AE0B00C777A3 /* loader_spinner0001.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0001.png; sourceTree = "<group>"; };
  1063 + 0886E3432179AE0B00C777A3 /* loader_spinner0015.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0015.png; sourceTree = "<group>"; };
  1064 + 0886E3442179AE0B00C777A3 /* loader_spinner0014.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0014.png; sourceTree = "<group>"; };
  1065 + 0886E3452179AE0B00C777A3 /* loader_spinner0000.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0000.png; sourceTree = "<group>"; };
  1066 + 0886E3462179AE0B00C777A3 /* loader_spinner0016.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0016.png; sourceTree = "<group>"; };
  1067 + 0886E3472179AE0B00C777A3 /* loader_spinner0002.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0002.png; sourceTree = "<group>"; };
  1068 + 0886E3482179AE0B00C777A3 /* loader_spinner0003.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0003.png; sourceTree = "<group>"; };
  1069 + 0886E3492179AE0B00C777A3 /* loader_spinner0017.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0017.png; sourceTree = "<group>"; };
  1070 + 0886E34A2179AE0B00C777A3 /* loader_spinner0019.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0019.png; sourceTree = "<group>"; };
  1071 + 0886E34B2179AE0B00C777A3 /* loader_spinner0018.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0018.png; sourceTree = "<group>"; };
  1072 + 0886E34C2179AE0B00C777A3 /* loader_spinner0008.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0008.png; sourceTree = "<group>"; };
  1073 + 0886E34D2179AE0B00C777A3 /* loader_spinner0020.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0020.png; sourceTree = "<group>"; };
  1074 + 0886E34E2179AE0B00C777A3 /* loader_spinner0021.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0021.png; sourceTree = "<group>"; };
  1075 + 0886E34F2179AE0B00C777A3 /* loader_spinner0009.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0009.png; sourceTree = "<group>"; };
  1076 + 0886E3502179AE0B00C777A3 /* loader_spinner0023.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0023.png; sourceTree = "<group>"; };
  1077 + 0886E3512179AE0B00C777A3 /* loader_spinner0022.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0022.png; sourceTree = "<group>"; };
  1078 + 0886E3522179AE0B00C777A3 /* KJARLib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = KJARLib.framework; sourceTree = "<group>"; };
  1079 + 0886E3BF2179D6E100C777A3 /* cnlive_zhouxin_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cnlive_zhouxin_icon.png; sourceTree = "<group>"; };
  1080 + 0886E3C32179D99900C777A3 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
935 08940D732154EB2C00F85DB6 /* UILabel+TextAlign.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UILabel+TextAlign.h"; sourceTree = "<group>"; }; 1081 08940D732154EB2C00F85DB6 /* UILabel+TextAlign.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UILabel+TextAlign.h"; sourceTree = "<group>"; };
936 08940D742154EB2C00F85DB6 /* UILabel+TextAlign.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UILabel+TextAlign.m"; sourceTree = "<group>"; }; 1082 08940D742154EB2C00F85DB6 /* UILabel+TextAlign.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UILabel+TextAlign.m"; sourceTree = "<group>"; };
937 08940D7C2154F05F00F85DB6 /* ArticleDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ArticleDetailViewController.h; sourceTree = "<group>"; }; 1083 08940D7C2154F05F00F85DB6 /* ArticleDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ArticleDetailViewController.h; sourceTree = "<group>"; };
@@ -1076,7 +1222,6 @@ @@ -1076,7 +1222,6 @@
1076 08C090B421510E4B00E23D16 /* CNLiveTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLiveTableViewCell.m; sourceTree = "<group>"; }; 1222 08C090B421510E4B00E23D16 /* CNLiveTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLiveTableViewCell.m; sourceTree = "<group>"; };
1077 08C090BD215116CB00E23D16 /* CNLiveIndicatorTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveIndicatorTableViewCell.h; sourceTree = "<group>"; }; 1223 08C090BD215116CB00E23D16 /* CNLiveIndicatorTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveIndicatorTableViewCell.h; sourceTree = "<group>"; };
1078 08C090BE215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLiveIndicatorTableViewCell.m; sourceTree = "<group>"; }; 1224 08C090BE215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLiveIndicatorTableViewCell.m; sourceTree = "<group>"; };
1079 - 08FB875B215DBBF000DA5423 /* cnlive_zhouxin_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cnlive_zhouxin_icon.png; sourceTree = "<group>"; };  
1080 08FB8767215DD1C200DA5423 /* VoiceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VoiceViewController.m; sourceTree = "<group>"; }; 1225 08FB8767215DD1C200DA5423 /* VoiceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VoiceViewController.m; sourceTree = "<group>"; };
1081 08FB8768215DD1C200DA5423 /* VoiceViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VoiceViewController.h; sourceTree = "<group>"; }; 1226 08FB8768215DD1C200DA5423 /* VoiceViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VoiceViewController.h; sourceTree = "<group>"; };
1082 08FB876C215DD3C400DA5423 /* NewVoiceTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewVoiceTableViewCell.m; sourceTree = "<group>"; }; 1227 08FB876C215DD3C400DA5423 /* NewVoiceTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewVoiceTableViewCell.m; sourceTree = "<group>"; };
@@ -1113,10 +1258,13 @@ @@ -1113,10 +1258,13 @@
1113 isa = PBXFrameworksBuildPhase; 1258 isa = PBXFrameworksBuildPhase;
1114 buildActionMask = 2147483647; 1259 buildActionMask = 2147483647;
1115 files = ( 1260 files = (
  1261 + 0886E3C42179D99900C777A3 /* WebKit.framework in Frameworks */,
  1262 + 08B5C6262153B14A00F5476E /* libicucore.tbd in Frameworks */,
1116 08384875215CBDE400186618 /* libsqlite3.0.tbd in Frameworks */, 1263 08384875215CBDE400186618 /* libsqlite3.0.tbd in Frameworks */,
1117 085D85F82159C6130037D480 /* libsqlite3.tbd in Frameworks */, 1264 085D85F82159C6130037D480 /* libsqlite3.tbd in Frameworks */,
1118 085D86AC2159D27A0037D480 /* UserNotifications.framework in Frameworks */, 1265 085D86AC2159D27A0037D480 /* UserNotifications.framework in Frameworks */,
1119 085D86AA2159D2700037D480 /* CoreTelephony.framework in Frameworks */, 1266 085D86AA2159D2700037D480 /* CoreTelephony.framework in Frameworks */,
  1267 + 0886E3B62179AE0B00C777A3 /* KJARLib.framework in Frameworks */,
1120 085D86BD2159D39A0037D480 /* CNLiveMsgTools.framework in Frameworks */, 1268 085D86BD2159D39A0037D480 /* CNLiveMsgTools.framework in Frameworks */,
1121 08384831215C633E00186618 /* ShareSDKUI.framework in Frameworks */, 1269 08384831215C633E00186618 /* ShareSDKUI.framework in Frameworks */,
1122 08384810215C633E00186618 /* libWeiboSDK.a in Frameworks */, 1270 08384810215C633E00186618 /* libWeiboSDK.a in Frameworks */,
@@ -1131,10 +1279,10 @@ @@ -1131,10 +1279,10 @@
1131 085D86AE2159D2EA0037D480 /* libksygpulive.framework in Frameworks */, 1279 085D86AE2159D2EA0037D480 /* libksygpulive.framework in Frameworks */,
1132 085D85EE2159BCB00037D480 /* UIKit.framework in Frameworks */, 1280 085D85EE2159BCB00037D480 /* UIKit.framework in Frameworks */,
1133 085D86902159C7880037D480 /* CNLivePlayerSDK.framework in Frameworks */, 1281 085D86902159C7880037D480 /* CNLivePlayerSDK.framework in Frameworks */,
  1282 + 0886E3B92179AF0000C777A3 /* KJARLib.framework in Frameworks */,
1134 085D85EC2159BCA90037D480 /* AVFoundation.framework in Frameworks */, 1283 085D85EC2159BCA90037D480 /* AVFoundation.framework in Frameworks */,
1135 08384822215C633E00186618 /* ShareSDKConnector.framework in Frameworks */, 1284 08384822215C633E00186618 /* ShareSDKConnector.framework in Frameworks */,
1136 085D86B62159D33F0037D480 /* GPUImage.framework in Frameworks */, 1285 085D86B62159D33F0037D480 /* GPUImage.framework in Frameworks */,
1137 - 08B5C6262153B14A00F5476E /* libicucore.tbd in Frameworks */,  
1138 0838482E215C633E00186618 /* ShareSDKExtension.framework in Frameworks */, 1286 0838482E215C633E00186618 /* ShareSDKExtension.framework in Frameworks */,
1139 08B5C6482153BFD100F5476E /* libMobClickLibrary.a in Frameworks */, 1287 08B5C6482153BFD100F5476E /* libMobClickLibrary.a in Frameworks */,
1140 08B5C6222153B10D00F5476E /* QuartzCore.framework in Frameworks */, 1288 08B5C6222153B10D00F5476E /* QuartzCore.framework in Frameworks */,
@@ -1158,6 +1306,7 @@ @@ -1158,6 +1306,7 @@
1158 08B5C5BC2153897100F5476E /* CNLiveUserSystemSDK.framework in Frameworks */, 1306 08B5C5BC2153897100F5476E /* CNLiveUserSystemSDK.framework in Frameworks */,
1159 08384829215C633E00186618 /* MOBFoundation.framework in Frameworks */, 1307 08384829215C633E00186618 /* MOBFoundation.framework in Frameworks */,
1160 08B5C6342153B3F100F5476E /* CNLiveStat.framework in Frameworks */, 1308 08B5C6342153B3F100F5476E /* CNLiveStat.framework in Frameworks */,
  1309 + 0886E3B72179AE0B00C777A3 /* KJARLib.framework in Frameworks */,
1161 08384835215C633E00186618 /* ShareSDK.framework in Frameworks */, 1310 08384835215C633E00186618 /* ShareSDK.framework in Frameworks */,
1162 08B5C6302153B39000F5476E /* libXG-SDK.a in Frameworks */, 1311 08B5C6302153B39000F5476E /* libXG-SDK.a in Frameworks */,
1163 085D86AF2159D2EA0037D480 /* libksygpulive.framework in Frameworks */, 1312 085D86AF2159D2EA0037D480 /* libksygpulive.framework in Frameworks */,
@@ -1181,6 +1330,7 @@ @@ -1181,6 +1330,7 @@
1181 08B5C5BD2153897100F5476E /* CNLiveUserSystemSDK.framework in Frameworks */, 1330 08B5C5BD2153897100F5476E /* CNLiveUserSystemSDK.framework in Frameworks */,
1182 0838482A215C633E00186618 /* MOBFoundation.framework in Frameworks */, 1331 0838482A215C633E00186618 /* MOBFoundation.framework in Frameworks */,
1183 08B5C6352153B3F100F5476E /* CNLiveStat.framework in Frameworks */, 1332 08B5C6352153B3F100F5476E /* CNLiveStat.framework in Frameworks */,
  1333 + 0886E3B82179AE0B00C777A3 /* KJARLib.framework in Frameworks */,
1184 08384836215C633E00186618 /* ShareSDK.framework in Frameworks */, 1334 08384836215C633E00186618 /* ShareSDK.framework in Frameworks */,
1185 08B5C6312153B39000F5476E /* libXG-SDK.a in Frameworks */, 1335 08B5C6312153B39000F5476E /* libXG-SDK.a in Frameworks */,
1186 085D86B02159D2EA0037D480 /* libksygpulive.framework in Frameworks */, 1336 085D86B02159D2EA0037D480 /* libksygpulive.framework in Frameworks */,
@@ -1621,6 +1771,63 @@ @@ -1621,6 +1771,63 @@
1621 path = View; 1771 path = View;
1622 sourceTree = "<group>"; 1772 sourceTree = "<group>";
1623 }; 1773 };
  1774 + 0886E32E2179AE0B00C777A3 /* KJARLib */ = {
  1775 + isa = PBXGroup;
  1776 + children = (
  1777 + 0886E32F2179AE0B00C777A3 /* 资源文件 */,
  1778 + 0886E3522179AE0B00C777A3 /* KJARLib.framework */,
  1779 + );
  1780 + path = KJARLib;
  1781 + sourceTree = "<group>";
  1782 + };
  1783 + 0886E32F2179AE0B00C777A3 /* 资源文件 */ = {
  1784 + isa = PBXGroup;
  1785 + children = (
  1786 + 0886E3302179AE0B00C777A3 /* arscan_back@3x.png */,
  1787 + 0886E3312179AE0B00C777A3 /* Thumbs.db */,
  1788 + 0886E3322179AE0B00C777A3 /* arscan_flip@2x.png */,
  1789 + 0886E3332179AE0B00C777A3 /* arscan_lock@3x.png */,
  1790 + 0886E3342179AE0B00C777A3 /* arscan_lock@2x.png */,
  1791 + 0886E3352179AE0B00C777A3 /* arscan_flip@3x.png */,
  1792 + 0886E3362179AE0B00C777A3 /* arscan_back@2x.png */,
  1793 + 0886E3372179AE0B00C777A3 /* arscan_unlock@2x.png */,
  1794 + 0886E3382179AE0B00C777A3 /* arscan_unlock@3x.png */,
  1795 + 0886E3392179AE0B00C777A3 /* animation1 */,
  1796 + );
  1797 + path = "资源文件";
  1798 + sourceTree = "<group>";
  1799 + };
  1800 + 0886E3392179AE0B00C777A3 /* animation1 */ = {
  1801 + isa = PBXGroup;
  1802 + children = (
  1803 + 0886E33A2179AE0B00C777A3 /* loader_spinner0013.png */,
  1804 + 0886E33B2179AE0B00C777A3 /* loader_spinner0007.png */,
  1805 + 0886E33C2179AE0B00C777A3 /* loader_spinner0006.png */,
  1806 + 0886E33D2179AE0B00C777A3 /* loader_spinner0012.png */,
  1807 + 0886E33E2179AE0B00C777A3 /* loader_spinner0004.png */,
  1808 + 0886E33F2179AE0B00C777A3 /* loader_spinner0010.png */,
  1809 + 0886E3402179AE0B00C777A3 /* loader_spinner0011.png */,
  1810 + 0886E3412179AE0B00C777A3 /* loader_spinner0005.png */,
  1811 + 0886E3422179AE0B00C777A3 /* loader_spinner0001.png */,
  1812 + 0886E3432179AE0B00C777A3 /* loader_spinner0015.png */,
  1813 + 0886E3442179AE0B00C777A3 /* loader_spinner0014.png */,
  1814 + 0886E3452179AE0B00C777A3 /* loader_spinner0000.png */,
  1815 + 0886E3462179AE0B00C777A3 /* loader_spinner0016.png */,
  1816 + 0886E3472179AE0B00C777A3 /* loader_spinner0002.png */,
  1817 + 0886E3482179AE0B00C777A3 /* loader_spinner0003.png */,
  1818 + 0886E3492179AE0B00C777A3 /* loader_spinner0017.png */,
  1819 + 0886E34A2179AE0B00C777A3 /* loader_spinner0019.png */,
  1820 + 0886E34B2179AE0B00C777A3 /* loader_spinner0018.png */,
  1821 + 0886E34C2179AE0B00C777A3 /* loader_spinner0008.png */,
  1822 + 0886E34D2179AE0B00C777A3 /* loader_spinner0020.png */,
  1823 + 0886E34E2179AE0B00C777A3 /* loader_spinner0021.png */,
  1824 + 0886E34F2179AE0B00C777A3 /* loader_spinner0009.png */,
  1825 + 0886E3502179AE0B00C777A3 /* loader_spinner0023.png */,
  1826 + 0886E3512179AE0B00C777A3 /* loader_spinner0022.png */,
  1827 + );
  1828 + path = animation1;
  1829 + sourceTree = "<group>";
  1830 + };
1624 08940D782154F04A00F85DB6 /* 新闻详情 */ = { 1831 08940D782154F04A00F85DB6 /* 新闻详情 */ = {
1625 isa = PBXGroup; 1832 isa = PBXGroup;
1626 children = ( 1833 children = (
@@ -1861,6 +2068,7 @@ @@ -1861,6 +2068,7 @@
1861 08C08FD0214FA01B00E23D16 /* SDK */ = { 2068 08C08FD0214FA01B00E23D16 /* SDK */ = {
1862 isa = PBXGroup; 2069 isa = PBXGroup;
1863 children = ( 2070 children = (
  2071 + 0886E32E2179AE0B00C777A3 /* KJARLib */,
1864 0838485A215CAB1C00186618 /* Html5Utils */, 2072 0838485A215CAB1C00186618 /* Html5Utils */,
1865 083847E9215C633D00186618 /* ShareSDK */, 2073 083847E9215C633D00186618 /* ShareSDK */,
1866 085D86BC2159D39A0037D480 /* CNLiveMsgTools.framework */, 2074 085D86BC2159D39A0037D480 /* CNLiveMsgTools.framework */,
@@ -1991,6 +2199,7 @@ @@ -1991,6 +2199,7 @@
1991 08C0900C2150852100E23D16 /* Sources */ = { 2199 08C0900C2150852100E23D16 /* Sources */ = {
1992 isa = PBXGroup; 2200 isa = PBXGroup;
1993 children = ( 2201 children = (
  2202 + 0886E32A2179A8BD00C777A3 /* aboutEN.html */,
1994 08FB875A215DBBF000DA5423 /* Images */, 2203 08FB875A215DBBF000DA5423 /* Images */,
1995 08B5C6512153C78700F5476E /* about.html */, 2204 08B5C6512153C78700F5476E /* about.html */,
1996 08C090112150855000E23D16 /* MainTabbarItem.plist */, 2205 08C090112150855000E23D16 /* MainTabbarItem.plist */,
@@ -2256,7 +2465,7 @@ @@ -2256,7 +2465,7 @@
2256 08FB875A215DBBF000DA5423 /* Images */ = { 2465 08FB875A215DBBF000DA5423 /* Images */ = {
2257 isa = PBXGroup; 2466 isa = PBXGroup;
2258 children = ( 2467 children = (
2259 - 08FB875B215DBBF000DA5423 /* cnlive_zhouxin_icon.png */, 2468 + 0886E3BF2179D6E100C777A3 /* cnlive_zhouxin_icon.png */,
2260 ); 2469 );
2261 path = Images; 2470 path = Images;
2262 sourceTree = "<group>"; 2471 sourceTree = "<group>";
@@ -2279,6 +2488,7 @@ @@ -2279,6 +2488,7 @@
2279 B1C16A24D0F151EA312E9868 /* Frameworks */ = { 2488 B1C16A24D0F151EA312E9868 /* Frameworks */ = {
2280 isa = PBXGroup; 2489 isa = PBXGroup;
2281 children = ( 2490 children = (
  2491 + 0886E3C32179D99900C777A3 /* WebKit.framework */,
2282 085D86AB2159D2790037D480 /* UserNotifications.framework */, 2492 085D86AB2159D2790037D480 /* UserNotifications.framework */,
2283 085D86A92159D2700037D480 /* CoreTelephony.framework */, 2493 085D86A92159D2700037D480 /* CoreTelephony.framework */,
2284 085D86A42159CE6E0037D480 /* libz.1.2.5.tbd */, 2494 085D86A42159CE6E0037D480 /* libz.1.2.5.tbd */,
@@ -2518,39 +2728,66 @@ @@ -2518,39 +2728,66 @@
2518 isa = PBXResourcesBuildPhase; 2728 isa = PBXResourcesBuildPhase;
2519 buildActionMask = 2147483647; 2729 buildActionMask = 2147483647;
2520 files = ( 2730 files = (
  2731 + 0886E3B32179AE0B00C777A3 /* loader_spinner0022.png in Resources */,
  2732 + 0886E37A2179AE0B00C777A3 /* loader_spinner0004.png in Resources */,
2521 085D86802159C72F0037D480 /* kr-video-player-pause@3x.png in Resources */, 2733 085D86802159C72F0037D480 /* kr-video-player-pause@3x.png in Resources */,
2522 08B5C6522153C78800F5476E /* about.html in Resources */, 2734 08B5C6522153C78800F5476E /* about.html in Resources */,
2523 085D86712159C72F0037D480 /* zx-video-player-volumeMute@2x.png in Resources */, 2735 085D86712159C72F0037D480 /* zx-video-player-volumeMute@2x.png in Resources */,
2524 08C0902421508F5500E23D16 /* Localizable.strings in Resources */, 2736 08C0902421508F5500E23D16 /* Localizable.strings in Resources */,
2525 085D86442159C72F0037D480 /* kr-video-player-play@2x.png in Resources */, 2737 085D86442159C72F0037D480 /* kr-video-player-play@2x.png in Resources */,
  2738 + 0886E3A42179AE0B00C777A3 /* loader_spinner0008.png in Resources */,
  2739 + 0886E3712179AE0B00C777A3 /* loader_spinner0007.png in Resources */,
2526 085D86532159C72F0037D480 /* zx-video-player-volume@3x.png in Resources */, 2740 085D86532159C72F0037D480 /* zx-video-player-volume@3x.png in Resources */,
2527 085D86892159C72F0037D480 /* zx-video-player-unlock@2x.png in Resources */, 2741 085D86892159C72F0037D480 /* zx-video-player-unlock@2x.png in Resources */,
2528 085D865C2159C72F0037D480 /* zx-video-player-fastForward@3x.png in Resources */, 2742 085D865C2159C72F0037D480 /* zx-video-player-fastForward@3x.png in Resources */,
  2743 + 0886E3532179AE0B00C777A3 /* arscan_back@3x.png in Resources */,
2529 0838482B215C633E00186618 /* ShareSDKUI.bundle in Resources */, 2744 0838482B215C633E00186618 /* ShareSDKUI.bundle in Resources */,
  2745 + 0886E3622179AE0B00C777A3 /* arscan_flip@3x.png in Resources */,
  2746 + 0886E36B2179AE0B00C777A3 /* arscan_unlock@3x.png in Resources */,
  2747 + 0886E32B2179A8BD00C777A3 /* aboutEN.html in Resources */,
2530 085D86B32159D33F0037D480 /* KSYGPUResource.bundle in Resources */, 2748 085D86B32159D33F0037D480 /* KSYGPUResource.bundle in Resources */,
  2749 + 0886E3982179AE0B00C777A3 /* loader_spinner0003.png in Resources */,
  2750 + 0886E3B02179AE0B00C777A3 /* loader_spinner0023.png in Resources */,
2531 085D867D2159C72F0037D480 /* zx-video-player-unlock@3x.png in Resources */, 2751 085D867D2159C72F0037D480 /* zx-video-player-unlock@3x.png in Resources */,
  2752 + 0886E3742179AE0B00C777A3 /* loader_spinner0006.png in Resources */,
2532 085D864A2159C72F0037D480 /* zx-video-player-rewind@3x.png in Resources */, 2753 085D864A2159C72F0037D480 /* zx-video-player-rewind@3x.png in Resources */,
2533 085D86472159C72F0037D480 /* kr-video-player-close@3x.png in Resources */, 2754 085D86472159C72F0037D480 /* kr-video-player-close@3x.png in Resources */,
2534 08585D7D215B4C7200FC2CA2 /* PGDatePicker.bundle in Resources */, 2755 08585D7D215B4C7200FC2CA2 /* PGDatePicker.bundle in Resources */,
  2756 + 0886E36E2179AE0B00C777A3 /* loader_spinner0013.png in Resources */,
2535 085D86832159C72F0037D480 /* kr-video-player-fullscreen@3x.png in Resources */, 2757 085D86832159C72F0037D480 /* kr-video-player-fullscreen@3x.png in Resources */,
  2758 + 0886E37D2179AE0B00C777A3 /* loader_spinner0010.png in Resources */,
2536 08384813215C633E00186618 /* README.txt in Resources */, 2759 08384813215C633E00186618 /* README.txt in Resources */,
  2760 + 0886E3652179AE0B00C777A3 /* arscan_back@2x.png in Resources */,
2537 085D867A2159C72F0037D480 /* zx-video-banner-back.png in Resources */, 2761 085D867A2159C72F0037D480 /* zx-video-banner-back.png in Resources */,
  2762 + 0886E39B2179AE0B00C777A3 /* loader_spinner0017.png in Resources */,
2538 085D86772159C72F0037D480 /* zx-video-player-lock@3x.png in Resources */, 2763 085D86772159C72F0037D480 /* zx-video-player-lock@3x.png in Resources */,
2539 085D86622159C72F0037D480 /* kr-video-player-shrinkscreen@2x.png in Resources */, 2764 085D86622159C72F0037D480 /* kr-video-player-shrinkscreen@2x.png in Resources */,
2540 0838481C215C633E00186618 /* TencentOpenApi_IOS_Bundle.bundle in Resources */, 2765 0838481C215C633E00186618 /* TencentOpenApi_IOS_Bundle.bundle in Resources */,
2541 085D868C2159C72F0037D480 /* kr-video-player-pause@2x.png in Resources */, 2766 085D868C2159C72F0037D480 /* kr-video-player-pause@2x.png in Resources */,
2542 085D86742159C72F0037D480 /* zx-video-player-volumeMute@3x.png in Resources */, 2767 085D86742159C72F0037D480 /* zx-video-player-volumeMute@3x.png in Resources */,
  2768 + 0886E3952179AE0B00C777A3 /* loader_spinner0002.png in Resources */,
  2769 + 0886E3A72179AE0B00C777A3 /* loader_spinner0020.png in Resources */,
  2770 + 0886E3AA2179AE0B00C777A3 /* loader_spinner0021.png in Resources */,
2543 085D86862159C72F0037D480 /* kr-video-player-fullscreen@2x.png in Resources */, 2771 085D86862159C72F0037D480 /* kr-video-player-fullscreen@2x.png in Resources */,
2544 08384842215C83E700186618 /* MainTabbarItemEN.plist in Resources */, 2772 08384842215C83E700186618 /* MainTabbarItemEN.plist in Resources */,
  2773 + 0886E3922179AE0B00C777A3 /* loader_spinner0016.png in Resources */,
  2774 + 0886E3C02179D6E100C777A3 /* cnlive_zhouxin_icon.png in Resources */,
  2775 + 0886E38F2179AE0B00C777A3 /* loader_spinner0000.png in Resources */,
2545 085D86412159C72F0037D480 /* kr-video-player-play@3x.png in Resources */, 2776 085D86412159C72F0037D480 /* kr-video-player-play@3x.png in Resources */,
2546 08C0907F2150C79C00E23D16 /* upIcon.png in Resources */, 2777 08C0907F2150C79C00E23D16 /* upIcon.png in Resources */,
  2778 + 0886E3892179AE0B00C777A3 /* loader_spinner0015.png in Resources */,
2547 08C08F7B214F997F00E23D16 /* Assets.xcassets in Resources */, 2779 08C08F7B214F997F00E23D16 /* Assets.xcassets in Resources */,
  2780 + 0886E38C2179AE0B00C777A3 /* loader_spinner0014.png in Resources */,
2548 085D86562159C72F0037D480 /* zx-video-player-brightness@2x.png in Resources */, 2781 085D86562159C72F0037D480 /* zx-video-player-brightness@2x.png in Resources */,
  2782 + 0886E3802179AE0B00C777A3 /* loader_spinner0011.png in Resources */,
  2783 + 0886E3862179AE0B00C777A3 /* loader_spinner0001.png in Resources */,
2549 085D864D2159C72F0037D480 /* zx-video-banner-back@2x.png in Resources */, 2784 085D864D2159C72F0037D480 /* zx-video-banner-back@2x.png in Resources */,
2550 085D86592159C72F0037D480 /* kr-video-player-shrinkscreen@3x.png in Resources */, 2785 085D86592159C72F0037D480 /* kr-video-player-shrinkscreen@3x.png in Resources */,
  2786 + 0886E3562179AE0B00C777A3 /* Thumbs.db in Resources */,
  2787 + 0886E3592179AE0B00C777A3 /* arscan_flip@2x.png in Resources */,
2551 085D86682159C72F0037D480 /* zx-video-player-volume@2x.png in Resources */, 2788 085D86682159C72F0037D480 /* zx-video-player-volume@2x.png in Resources */,
  2789 + 0886E3772179AE0B00C777A3 /* loader_spinner0012.png in Resources */,
2552 08384819215C633E00186618 /* read_me.txt in Resources */, 2790 08384819215C633E00186618 /* read_me.txt in Resources */,
2553 - 08FB875C215DBBF000DA5423 /* cnlive_zhouxin_icon.png in Resources */,  
2554 085D863E2159C72F0037D480 /* kr-video-player-close@2x.png in Resources */, 2791 085D863E2159C72F0037D480 /* kr-video-player-close@2x.png in Resources */,
2555 08C090122150855000E23D16 /* MainTabbarItem.plist in Resources */, 2792 08C090122150855000E23D16 /* MainTabbarItem.plist in Resources */,
2556 085D865F2159C72F0037D480 /* zx-video-player-fastForward@2x.png in Resources */, 2793 085D865F2159C72F0037D480 /* zx-video-player-fastForward@2x.png in Resources */,
@@ -2558,10 +2795,17 @@ @@ -2558,10 +2795,17 @@
2558 085D866B2159C72F0037D480 /* kr-video-player-point@2x.png in Resources */, 2795 085D866B2159C72F0037D480 /* kr-video-player-point@2x.png in Resources */,
2559 085D86502159C72F0037D480 /* kr-video-player-point@3x.png in Resources */, 2796 085D86502159C72F0037D480 /* kr-video-player-point@3x.png in Resources */,
2560 08384825215C633E00186618 /* ShareSDK.bundle in Resources */, 2797 08384825215C633E00186618 /* ShareSDK.bundle in Resources */,
  2798 + 0886E35C2179AE0B00C777A3 /* arscan_lock@3x.png in Resources */,
  2799 + 0886E3A12179AE0B00C777A3 /* loader_spinner0018.png in Resources */,
  2800 + 0886E35F2179AE0B00C777A3 /* arscan_lock@2x.png in Resources */,
2561 085D866E2159C72F0037D480 /* zx-video-player-lock@2x.png in Resources */, 2801 085D866E2159C72F0037D480 /* zx-video-player-lock@2x.png in Resources */,
  2802 + 0886E3682179AE0B00C777A3 /* arscan_unlock@2x.png in Resources */,
2562 0838480D215C633E00186618 /* WeiboSDK.bundle in Resources */, 2803 0838480D215C633E00186618 /* WeiboSDK.bundle in Resources */,
  2804 + 0886E3832179AE0B00C777A3 /* loader_spinner0005.png in Resources */,
2563 085D863B2159C72F0037D480 /* zx-video-player-rewind@2x.png in Resources */, 2805 085D863B2159C72F0037D480 /* zx-video-player-rewind@2x.png in Resources */,
2564 08B5C62C2153B39000F5476E /* ReleaseNotes.txt in Resources */, 2806 08B5C62C2153B39000F5476E /* ReleaseNotes.txt in Resources */,
  2807 + 0886E39E2179AE0B00C777A3 /* loader_spinner0019.png in Resources */,
  2808 + 0886E3AD2179AE0B00C777A3 /* loader_spinner0009.png in Resources */,
2565 ); 2809 );
2566 runOnlyForDeploymentPostprocessing = 0; 2810 runOnlyForDeploymentPostprocessing = 0;
2567 }; 2811 };
@@ -2569,49 +2813,83 @@ @@ -2569,49 +2813,83 @@
2569 isa = PBXResourcesBuildPhase; 2813 isa = PBXResourcesBuildPhase;
2570 buildActionMask = 2147483647; 2814 buildActionMask = 2147483647;
2571 files = ( 2815 files = (
  2816 + 0886E35D2179AE0B00C777A3 /* arscan_lock@3x.png in Resources */,
  2817 + 0886E3992179AE0B00C777A3 /* loader_spinner0003.png in Resources */,
  2818 + 0886E3572179AE0B00C777A3 /* Thumbs.db in Resources */,
  2819 + 0886E36F2179AE0B00C777A3 /* loader_spinner0013.png in Resources */,
2572 085D866F2159C72F0037D480 /* zx-video-player-lock@2x.png in Resources */, 2820 085D866F2159C72F0037D480 /* zx-video-player-lock@2x.png in Resources */,
2573 085D86482159C72F0037D480 /* kr-video-player-close@3x.png in Resources */, 2821 085D86482159C72F0037D480 /* kr-video-player-close@3x.png in Resources */,
2574 08384814215C633E00186618 /* README.txt in Resources */, 2822 08384814215C633E00186618 /* README.txt in Resources */,
  2823 + 0886E37B2179AE0B00C777A3 /* loader_spinner0004.png in Resources */,
  2824 + 0886E3842179AE0B00C777A3 /* loader_spinner0005.png in Resources */,
2575 085D86872159C72F0037D480 /* kr-video-player-fullscreen@2x.png in Resources */, 2825 085D86872159C72F0037D480 /* kr-video-player-fullscreen@2x.png in Resources */,
2576 085D868D2159C72F0037D480 /* kr-video-player-pause@2x.png in Resources */, 2826 085D868D2159C72F0037D480 /* kr-video-player-pause@2x.png in Resources */,
2577 085D868A2159C72F0037D480 /* zx-video-player-unlock@2x.png in Resources */, 2827 085D868A2159C72F0037D480 /* zx-video-player-unlock@2x.png in Resources */,
2578 085D86602159C72F0037D480 /* zx-video-player-fastForward@2x.png in Resources */, 2828 085D86602159C72F0037D480 /* zx-video-player-fastForward@2x.png in Resources */,
2579 085D86752159C72F0037D480 /* zx-video-player-volumeMute@3x.png in Resources */, 2829 085D86752159C72F0037D480 /* zx-video-player-volumeMute@3x.png in Resources */,
  2830 + 0886E3632179AE0B00C777A3 /* arscan_flip@3x.png in Resources */,
2580 0838482C215C633E00186618 /* ShareSDKUI.bundle in Resources */, 2831 0838482C215C633E00186618 /* ShareSDKUI.bundle in Resources */,
2581 085D86812159C72F0037D480 /* kr-video-player-pause@3x.png in Resources */, 2832 085D86812159C72F0037D480 /* kr-video-player-pause@3x.png in Resources */,
2582 085D86B42159D33F0037D480 /* KSYGPUResource.bundle in Resources */, 2833 085D86B42159D33F0037D480 /* KSYGPUResource.bundle in Resources */,
2583 085D863C2159C72F0037D480 /* zx-video-player-rewind@2x.png in Resources */, 2834 085D863C2159C72F0037D480 /* zx-video-player-rewind@2x.png in Resources */,
  2835 + 0886E3902179AE0B00C777A3 /* loader_spinner0000.png in Resources */,
2584 08C090132150855000E23D16 /* MainTabbarItem.plist in Resources */, 2836 08C090132150855000E23D16 /* MainTabbarItem.plist in Resources */,
  2837 + 0886E3692179AE0B00C777A3 /* arscan_unlock@2x.png in Resources */,
  2838 + 0886E3722179AE0B00C777A3 /* loader_spinner0007.png in Resources */,
  2839 + 0886E3B12179AE0B00C777A3 /* loader_spinner0023.png in Resources */,
2585 085D86632159C72F0037D480 /* kr-video-player-shrinkscreen@2x.png in Resources */, 2840 085D86632159C72F0037D480 /* kr-video-player-shrinkscreen@2x.png in Resources */,
  2841 + 0886E3752179AE0B00C777A3 /* loader_spinner0006.png in Resources */,
2586 085D866C2159C72F0037D480 /* kr-video-player-point@2x.png in Resources */, 2842 085D866C2159C72F0037D480 /* kr-video-player-point@2x.png in Resources */,
2587 085D867B2159C72F0037D480 /* zx-video-banner-back.png in Resources */, 2843 085D867B2159C72F0037D480 /* zx-video-banner-back.png in Resources */,
2588 085D86842159C72F0037D480 /* kr-video-player-fullscreen@3x.png in Resources */, 2844 085D86842159C72F0037D480 /* kr-video-player-fullscreen@3x.png in Resources */,
2589 085D864E2159C72F0037D480 /* zx-video-banner-back@2x.png in Resources */, 2845 085D864E2159C72F0037D480 /* zx-video-banner-back@2x.png in Resources */,
2590 085D86512159C72F0037D480 /* kr-video-player-point@3x.png in Resources */, 2846 085D86512159C72F0037D480 /* kr-video-player-point@3x.png in Resources */,
2591 085D86662159C72F0037D480 /* zx-video-player-brightness@3x.png in Resources */, 2847 085D86662159C72F0037D480 /* zx-video-player-brightness@3x.png in Resources */,
  2848 + 0886E3812179AE0B00C777A3 /* loader_spinner0011.png in Resources */,
  2849 + 0886E3962179AE0B00C777A3 /* loader_spinner0002.png in Resources */,
  2850 + 0886E38A2179AE0B00C777A3 /* loader_spinner0015.png in Resources */,
2592 085D86722159C72F0037D480 /* zx-video-player-volumeMute@2x.png in Resources */, 2851 085D86722159C72F0037D480 /* zx-video-player-volumeMute@2x.png in Resources */,
  2852 + 0886E3872179AE0B00C777A3 /* loader_spinner0001.png in Resources */,
  2853 + 0886E32C2179A8BD00C777A3 /* aboutEN.html in Resources */,
  2854 + 0886E37E2179AE0B00C777A3 /* loader_spinner0010.png in Resources */,
  2855 + 0886E3A52179AE0B00C777A3 /* loader_spinner0008.png in Resources */,
  2856 + 0886E38D2179AE0B00C777A3 /* loader_spinner0014.png in Resources */,
2593 08C090802150C79C00E23D16 /* upIcon.png in Resources */, 2857 08C090802150C79C00E23D16 /* upIcon.png in Resources */,
2594 0838481D215C633E00186618 /* TencentOpenApi_IOS_Bundle.bundle in Resources */, 2858 0838481D215C633E00186618 /* TencentOpenApi_IOS_Bundle.bundle in Resources */,
2595 08B5C62D2153B39000F5476E /* ReleaseNotes.txt in Resources */, 2859 08B5C62D2153B39000F5476E /* ReleaseNotes.txt in Resources */,
2596 085D865D2159C72F0037D480 /* zx-video-player-fastForward@3x.png in Resources */, 2860 085D865D2159C72F0037D480 /* zx-video-player-fastForward@3x.png in Resources */,
  2861 + 0886E3932179AE0B00C777A3 /* loader_spinner0016.png in Resources */,
2597 08585D7E215B4C7200FC2CA2 /* PGDatePicker.bundle in Resources */, 2862 08585D7E215B4C7200FC2CA2 /* PGDatePicker.bundle in Resources */,
2598 - 08FB875D215DBBF000DA5423 /* cnlive_zhouxin_icon.png in Resources */, 2863 + 0886E3B42179AE0B00C777A3 /* loader_spinner0022.png in Resources */,
  2864 + 0886E3662179AE0B00C777A3 /* arscan_back@2x.png in Resources */,
2599 0838480E215C633E00186618 /* WeiboSDK.bundle in Resources */, 2865 0838480E215C633E00186618 /* WeiboSDK.bundle in Resources */,
  2866 + 0886E3A22179AE0B00C777A3 /* loader_spinner0018.png in Resources */,
2600 085D86572159C72F0037D480 /* zx-video-player-brightness@2x.png in Resources */, 2867 085D86572159C72F0037D480 /* zx-video-player-brightness@2x.png in Resources */,
  2868 + 0886E3C12179D6E100C777A3 /* cnlive_zhouxin_icon.png in Resources */,
2601 085D865A2159C72F0037D480 /* kr-video-player-shrinkscreen@3x.png in Resources */, 2869 085D865A2159C72F0037D480 /* kr-video-player-shrinkscreen@3x.png in Resources */,
  2870 + 0886E3782179AE0B00C777A3 /* loader_spinner0012.png in Resources */,
2602 08B5C6532153C78800F5476E /* about.html in Resources */, 2871 08B5C6532153C78800F5476E /* about.html in Resources */,
2603 085D86452159C72F0037D480 /* kr-video-player-play@2x.png in Resources */, 2872 085D86452159C72F0037D480 /* kr-video-player-play@2x.png in Resources */,
  2873 + 0886E3AB2179AE0B00C777A3 /* loader_spinner0021.png in Resources */,
2604 085D863F2159C72F0037D480 /* kr-video-player-close@2x.png in Resources */, 2874 085D863F2159C72F0037D480 /* kr-video-player-close@2x.png in Resources */,
  2875 + 0886E3542179AE0B00C777A3 /* arscan_back@3x.png in Resources */,
2605 085D86542159C72F0037D480 /* zx-video-player-volume@3x.png in Resources */, 2876 085D86542159C72F0037D480 /* zx-video-player-volume@3x.png in Resources */,
2606 085D86782159C72F0037D480 /* zx-video-player-lock@3x.png in Resources */, 2877 085D86782159C72F0037D480 /* zx-video-player-lock@3x.png in Resources */,
2607 08C0902521508F5500E23D16 /* Localizable.strings in Resources */, 2878 08C0902521508F5500E23D16 /* Localizable.strings in Resources */,
  2879 + 0886E36C2179AE0B00C777A3 /* arscan_unlock@3x.png in Resources */,
2608 08384843215C83E700186618 /* MainTabbarItemEN.plist in Resources */, 2880 08384843215C83E700186618 /* MainTabbarItemEN.plist in Resources */,
2609 085D867E2159C72F0037D480 /* zx-video-player-unlock@3x.png in Resources */, 2881 085D867E2159C72F0037D480 /* zx-video-player-unlock@3x.png in Resources */,
2610 0838481A215C633E00186618 /* read_me.txt in Resources */, 2882 0838481A215C633E00186618 /* read_me.txt in Resources */,
2611 08384826215C633E00186618 /* ShareSDK.bundle in Resources */, 2883 08384826215C633E00186618 /* ShareSDK.bundle in Resources */,
2612 085D86692159C72F0037D480 /* zx-video-player-volume@2x.png in Resources */, 2884 085D86692159C72F0037D480 /* zx-video-player-volume@2x.png in Resources */,
  2885 + 0886E39C2179AE0B00C777A3 /* loader_spinner0017.png in Resources */,
  2886 + 0886E3602179AE0B00C777A3 /* arscan_lock@2x.png in Resources */,
2613 085D864B2159C72F0037D480 /* zx-video-player-rewind@3x.png in Resources */, 2887 085D864B2159C72F0037D480 /* zx-video-player-rewind@3x.png in Resources */,
2614 085D86422159C72F0037D480 /* kr-video-player-play@3x.png in Resources */, 2888 085D86422159C72F0037D480 /* kr-video-player-play@3x.png in Resources */,
  2889 + 0886E39F2179AE0B00C777A3 /* loader_spinner0019.png in Resources */,
  2890 + 0886E3A82179AE0B00C777A3 /* loader_spinner0020.png in Resources */,
  2891 + 0886E3AE2179AE0B00C777A3 /* loader_spinner0009.png in Resources */,
  2892 + 0886E35A2179AE0B00C777A3 /* arscan_flip@2x.png in Resources */,
2615 ); 2893 );
2616 runOnlyForDeploymentPostprocessing = 0; 2894 runOnlyForDeploymentPostprocessing = 0;
2617 }; 2895 };
@@ -2619,49 +2897,83 @@ @@ -2619,49 +2897,83 @@
2619 isa = PBXResourcesBuildPhase; 2897 isa = PBXResourcesBuildPhase;
2620 buildActionMask = 2147483647; 2898 buildActionMask = 2147483647;
2621 files = ( 2899 files = (
  2900 + 0886E35E2179AE0B00C777A3 /* arscan_lock@3x.png in Resources */,
  2901 + 0886E39A2179AE0B00C777A3 /* loader_spinner0003.png in Resources */,
  2902 + 0886E3582179AE0B00C777A3 /* Thumbs.db in Resources */,
  2903 + 0886E3702179AE0B00C777A3 /* loader_spinner0013.png in Resources */,
2622 085D86702159C72F0037D480 /* zx-video-player-lock@2x.png in Resources */, 2904 085D86702159C72F0037D480 /* zx-video-player-lock@2x.png in Resources */,
2623 085D86492159C72F0037D480 /* kr-video-player-close@3x.png in Resources */, 2905 085D86492159C72F0037D480 /* kr-video-player-close@3x.png in Resources */,
2624 08384815215C633E00186618 /* README.txt in Resources */, 2906 08384815215C633E00186618 /* README.txt in Resources */,
  2907 + 0886E37C2179AE0B00C777A3 /* loader_spinner0004.png in Resources */,
  2908 + 0886E3852179AE0B00C777A3 /* loader_spinner0005.png in Resources */,
2625 085D86882159C72F0037D480 /* kr-video-player-fullscreen@2x.png in Resources */, 2909 085D86882159C72F0037D480 /* kr-video-player-fullscreen@2x.png in Resources */,
2626 085D868E2159C72F0037D480 /* kr-video-player-pause@2x.png in Resources */, 2910 085D868E2159C72F0037D480 /* kr-video-player-pause@2x.png in Resources */,
2627 085D868B2159C72F0037D480 /* zx-video-player-unlock@2x.png in Resources */, 2911 085D868B2159C72F0037D480 /* zx-video-player-unlock@2x.png in Resources */,
2628 085D86612159C72F0037D480 /* zx-video-player-fastForward@2x.png in Resources */, 2912 085D86612159C72F0037D480 /* zx-video-player-fastForward@2x.png in Resources */,
2629 085D86762159C72F0037D480 /* zx-video-player-volumeMute@3x.png in Resources */, 2913 085D86762159C72F0037D480 /* zx-video-player-volumeMute@3x.png in Resources */,
  2914 + 0886E3642179AE0B00C777A3 /* arscan_flip@3x.png in Resources */,
2630 0838482D215C633E00186618 /* ShareSDKUI.bundle in Resources */, 2915 0838482D215C633E00186618 /* ShareSDKUI.bundle in Resources */,
2631 085D86822159C72F0037D480 /* kr-video-player-pause@3x.png in Resources */, 2916 085D86822159C72F0037D480 /* kr-video-player-pause@3x.png in Resources */,
2632 085D86B52159D33F0037D480 /* KSYGPUResource.bundle in Resources */, 2917 085D86B52159D33F0037D480 /* KSYGPUResource.bundle in Resources */,
2633 085D863D2159C72F0037D480 /* zx-video-player-rewind@2x.png in Resources */, 2918 085D863D2159C72F0037D480 /* zx-video-player-rewind@2x.png in Resources */,
  2919 + 0886E3912179AE0B00C777A3 /* loader_spinner0000.png in Resources */,
2634 08C090142150855000E23D16 /* MainTabbarItem.plist in Resources */, 2920 08C090142150855000E23D16 /* MainTabbarItem.plist in Resources */,
  2921 + 0886E36A2179AE0B00C777A3 /* arscan_unlock@2x.png in Resources */,
  2922 + 0886E3732179AE0B00C777A3 /* loader_spinner0007.png in Resources */,
  2923 + 0886E3B22179AE0B00C777A3 /* loader_spinner0023.png in Resources */,
2635 085D86642159C72F0037D480 /* kr-video-player-shrinkscreen@2x.png in Resources */, 2924 085D86642159C72F0037D480 /* kr-video-player-shrinkscreen@2x.png in Resources */,
  2925 + 0886E3762179AE0B00C777A3 /* loader_spinner0006.png in Resources */,
2636 085D866D2159C72F0037D480 /* kr-video-player-point@2x.png in Resources */, 2926 085D866D2159C72F0037D480 /* kr-video-player-point@2x.png in Resources */,
2637 085D867C2159C72F0037D480 /* zx-video-banner-back.png in Resources */, 2927 085D867C2159C72F0037D480 /* zx-video-banner-back.png in Resources */,
2638 085D86852159C72F0037D480 /* kr-video-player-fullscreen@3x.png in Resources */, 2928 085D86852159C72F0037D480 /* kr-video-player-fullscreen@3x.png in Resources */,
2639 085D864F2159C72F0037D480 /* zx-video-banner-back@2x.png in Resources */, 2929 085D864F2159C72F0037D480 /* zx-video-banner-back@2x.png in Resources */,
2640 085D86522159C72F0037D480 /* kr-video-player-point@3x.png in Resources */, 2930 085D86522159C72F0037D480 /* kr-video-player-point@3x.png in Resources */,
2641 085D86672159C72F0037D480 /* zx-video-player-brightness@3x.png in Resources */, 2931 085D86672159C72F0037D480 /* zx-video-player-brightness@3x.png in Resources */,
  2932 + 0886E3822179AE0B00C777A3 /* loader_spinner0011.png in Resources */,
  2933 + 0886E3972179AE0B00C777A3 /* loader_spinner0002.png in Resources */,
  2934 + 0886E38B2179AE0B00C777A3 /* loader_spinner0015.png in Resources */,
2642 085D86732159C72F0037D480 /* zx-video-player-volumeMute@2x.png in Resources */, 2935 085D86732159C72F0037D480 /* zx-video-player-volumeMute@2x.png in Resources */,
  2936 + 0886E3882179AE0B00C777A3 /* loader_spinner0001.png in Resources */,
  2937 + 0886E32D2179A8BD00C777A3 /* aboutEN.html in Resources */,
  2938 + 0886E37F2179AE0B00C777A3 /* loader_spinner0010.png in Resources */,
  2939 + 0886E3A62179AE0B00C777A3 /* loader_spinner0008.png in Resources */,
  2940 + 0886E38E2179AE0B00C777A3 /* loader_spinner0014.png in Resources */,
2643 08C090812150C79C00E23D16 /* upIcon.png in Resources */, 2941 08C090812150C79C00E23D16 /* upIcon.png in Resources */,
2644 0838481E215C633E00186618 /* TencentOpenApi_IOS_Bundle.bundle in Resources */, 2942 0838481E215C633E00186618 /* TencentOpenApi_IOS_Bundle.bundle in Resources */,
2645 08B5C62E2153B39000F5476E /* ReleaseNotes.txt in Resources */, 2943 08B5C62E2153B39000F5476E /* ReleaseNotes.txt in Resources */,
2646 085D865E2159C72F0037D480 /* zx-video-player-fastForward@3x.png in Resources */, 2944 085D865E2159C72F0037D480 /* zx-video-player-fastForward@3x.png in Resources */,
  2945 + 0886E3942179AE0B00C777A3 /* loader_spinner0016.png in Resources */,
2647 08585D7F215B4C7200FC2CA2 /* PGDatePicker.bundle in Resources */, 2946 08585D7F215B4C7200FC2CA2 /* PGDatePicker.bundle in Resources */,
2648 - 08FB875E215DBBF000DA5423 /* cnlive_zhouxin_icon.png in Resources */, 2947 + 0886E3B52179AE0B00C777A3 /* loader_spinner0022.png in Resources */,
  2948 + 0886E3672179AE0B00C777A3 /* arscan_back@2x.png in Resources */,
2649 0838480F215C633E00186618 /* WeiboSDK.bundle in Resources */, 2949 0838480F215C633E00186618 /* WeiboSDK.bundle in Resources */,
  2950 + 0886E3A32179AE0B00C777A3 /* loader_spinner0018.png in Resources */,
2650 085D86582159C72F0037D480 /* zx-video-player-brightness@2x.png in Resources */, 2951 085D86582159C72F0037D480 /* zx-video-player-brightness@2x.png in Resources */,
  2952 + 0886E3C22179D6E100C777A3 /* cnlive_zhouxin_icon.png in Resources */,
2651 085D865B2159C72F0037D480 /* kr-video-player-shrinkscreen@3x.png in Resources */, 2953 085D865B2159C72F0037D480 /* kr-video-player-shrinkscreen@3x.png in Resources */,
  2954 + 0886E3792179AE0B00C777A3 /* loader_spinner0012.png in Resources */,
2652 08B5C6542153C78800F5476E /* about.html in Resources */, 2955 08B5C6542153C78800F5476E /* about.html in Resources */,
2653 085D86462159C72F0037D480 /* kr-video-player-play@2x.png in Resources */, 2956 085D86462159C72F0037D480 /* kr-video-player-play@2x.png in Resources */,
  2957 + 0886E3AC2179AE0B00C777A3 /* loader_spinner0021.png in Resources */,
2654 085D86402159C72F0037D480 /* kr-video-player-close@2x.png in Resources */, 2958 085D86402159C72F0037D480 /* kr-video-player-close@2x.png in Resources */,
  2959 + 0886E3552179AE0B00C777A3 /* arscan_back@3x.png in Resources */,
2655 085D86552159C72F0037D480 /* zx-video-player-volume@3x.png in Resources */, 2960 085D86552159C72F0037D480 /* zx-video-player-volume@3x.png in Resources */,
2656 085D86792159C72F0037D480 /* zx-video-player-lock@3x.png in Resources */, 2961 085D86792159C72F0037D480 /* zx-video-player-lock@3x.png in Resources */,
2657 08C0902621508F5500E23D16 /* Localizable.strings in Resources */, 2962 08C0902621508F5500E23D16 /* Localizable.strings in Resources */,
  2963 + 0886E36D2179AE0B00C777A3 /* arscan_unlock@3x.png in Resources */,
2658 08384844215C83E700186618 /* MainTabbarItemEN.plist in Resources */, 2964 08384844215C83E700186618 /* MainTabbarItemEN.plist in Resources */,
2659 085D867F2159C72F0037D480 /* zx-video-player-unlock@3x.png in Resources */, 2965 085D867F2159C72F0037D480 /* zx-video-player-unlock@3x.png in Resources */,
2660 0838481B215C633E00186618 /* read_me.txt in Resources */, 2966 0838481B215C633E00186618 /* read_me.txt in Resources */,
2661 08384827215C633E00186618 /* ShareSDK.bundle in Resources */, 2967 08384827215C633E00186618 /* ShareSDK.bundle in Resources */,
2662 085D866A2159C72F0037D480 /* zx-video-player-volume@2x.png in Resources */, 2968 085D866A2159C72F0037D480 /* zx-video-player-volume@2x.png in Resources */,
  2969 + 0886E39D2179AE0B00C777A3 /* loader_spinner0017.png in Resources */,
  2970 + 0886E3612179AE0B00C777A3 /* arscan_lock@2x.png in Resources */,
2663 085D864C2159C72F0037D480 /* zx-video-player-rewind@3x.png in Resources */, 2971 085D864C2159C72F0037D480 /* zx-video-player-rewind@3x.png in Resources */,
2664 085D86432159C72F0037D480 /* kr-video-player-play@3x.png in Resources */, 2972 085D86432159C72F0037D480 /* kr-video-player-play@3x.png in Resources */,
  2973 + 0886E3A02179AE0B00C777A3 /* loader_spinner0019.png in Resources */,
  2974 + 0886E3A92179AE0B00C777A3 /* loader_spinner0020.png in Resources */,
  2975 + 0886E3AF2179AE0B00C777A3 /* loader_spinner0009.png in Resources */,
  2976 + 0886E35B2179AE0B00C777A3 /* arscan_flip@2x.png in Resources */,
2665 ); 2977 );
2666 runOnlyForDeploymentPostprocessing = 0; 2978 runOnlyForDeploymentPostprocessing = 0;
2667 }; 2979 };
@@ -3353,6 +3665,7 @@ @@ -3353,6 +3665,7 @@
3353 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements; 3665 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3354 CODE_SIGN_STYLE = Automatic; 3666 CODE_SIGN_STYLE = Automatic;
3355 DEVELOPMENT_TEAM = 94X49GG3ZW; 3667 DEVELOPMENT_TEAM = 94X49GG3ZW;
  3668 + ENABLE_BITCODE = NO;
3356 FRAMEWORK_SEARCH_PATHS = ( 3669 FRAMEWORK_SEARCH_PATHS = (
3357 "$(inherited)", 3670 "$(inherited)",
3358 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK", 3671 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK",
@@ -3360,6 +3673,7 @@ @@ -3360,6 +3673,7 @@
3360 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Required", 3673 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Required",
3361 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Optional", 3674 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Optional",
3362 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK", 3675 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK",
  3676 + "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/KJARLib",
3363 ); 3677 );
3364 GCC_PRECOMPILE_PREFIX_HEADER = YES; 3678 GCC_PRECOMPILE_PREFIX_HEADER = YES;
3365 GCC_PREFIX_HEADER = CNLiveScioLive/Pages/Header/PrefixHeader.pch; 3679 GCC_PREFIX_HEADER = CNLiveScioLive/Pages/Header/PrefixHeader.pch;
@@ -3391,6 +3705,7 @@ @@ -3391,6 +3705,7 @@
3391 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements; 3705 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3392 CODE_SIGN_STYLE = Automatic; 3706 CODE_SIGN_STYLE = Automatic;
3393 DEVELOPMENT_TEAM = 94X49GG3ZW; 3707 DEVELOPMENT_TEAM = 94X49GG3ZW;
  3708 + ENABLE_BITCODE = NO;
3394 FRAMEWORK_SEARCH_PATHS = ( 3709 FRAMEWORK_SEARCH_PATHS = (
3395 "$(inherited)", 3710 "$(inherited)",
3396 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK", 3711 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK",
@@ -3398,6 +3713,7 @@ @@ -3398,6 +3713,7 @@
3398 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Required", 3713 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Required",
3399 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Optional", 3714 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Optional",
3400 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK", 3715 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK",
  3716 + "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/KJARLib",
3401 ); 3717 );
3402 GCC_PRECOMPILE_PREFIX_HEADER = YES; 3718 GCC_PRECOMPILE_PREFIX_HEADER = YES;
3403 GCC_PREFIX_HEADER = CNLiveScioLive/Pages/Header/PrefixHeader.pch; 3719 GCC_PREFIX_HEADER = CNLiveScioLive/Pages/Header/PrefixHeader.pch;
@@ -3433,6 +3749,7 @@ @@ -3433,6 +3749,7 @@
3433 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Required", 3749 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Required",
3434 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Optional", 3750 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Optional",
3435 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK", 3751 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK",
  3752 + "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/KJARLib",
3436 ); 3753 );
3437 INFOPLIST_FILE = CNLiveScioLiveTests/Info.plist; 3754 INFOPLIST_FILE = CNLiveScioLiveTests/Info.plist;
3438 LD_RUNPATH_SEARCH_PATHS = ( 3755 LD_RUNPATH_SEARCH_PATHS = (
@@ -3467,6 +3784,7 @@ @@ -3467,6 +3784,7 @@
3467 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Required", 3784 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Required",
3468 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Optional", 3785 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Optional",
3469 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK", 3786 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK",
  3787 + "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/KJARLib",
3470 ); 3788 );
3471 INFOPLIST_FILE = CNLiveScioLiveTests/Info.plist; 3789 INFOPLIST_FILE = CNLiveScioLiveTests/Info.plist;
3472 LD_RUNPATH_SEARCH_PATHS = ( 3790 LD_RUNPATH_SEARCH_PATHS = (
@@ -3500,6 +3818,7 @@ @@ -3500,6 +3818,7 @@
3500 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Required", 3818 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Required",
3501 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Optional", 3819 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Optional",
3502 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK", 3820 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK",
  3821 + "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/KJARLib",
3503 ); 3822 );
3504 INFOPLIST_FILE = CNLiveScioLiveUITests/Info.plist; 3823 INFOPLIST_FILE = CNLiveScioLiveUITests/Info.plist;
3505 LD_RUNPATH_SEARCH_PATHS = ( 3824 LD_RUNPATH_SEARCH_PATHS = (
@@ -3533,6 +3852,7 @@ @@ -3533,6 +3852,7 @@
3533 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Required", 3852 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Required",
3534 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Optional", 3853 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/Support/Optional",
3535 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK", 3854 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK",
  3855 + "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/KJARLib",
3536 ); 3856 );
3537 INFOPLIST_FILE = CNLiveScioLiveUITests/Info.plist; 3857 INFOPLIST_FILE = CNLiveScioLiveUITests/Info.plist;
3538 LD_RUNPATH_SEARCH_PATHS = ( 3858 LD_RUNPATH_SEARCH_PATHS = (
CNLiveScioLive/AppDelegate.m
  View file @956334a
@@ -8,6 +8,8 @@ @@ -8,6 +8,8 @@
8 8
9 #import "AppDelegate.h" 9 #import "AppDelegate.h"
10 #import "AvoidCrash.h" 10 #import "AvoidCrash.h"
  11 +#import "BaiduMobStat.h"//百度统计
  12 +
11 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 13 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
12 #import <UserNotifications/UserNotifications.h> 14 #import <UserNotifications/UserNotifications.h>
13 #endif 15 #endif
@@ -33,6 +35,8 @@ @@ -33,6 +35,8 @@
33 [self registerRemoteNotification]; 35 [self registerRemoteNotification];
34 [self registerNotification:launchOptions]; 36 [self registerNotification:launchOptions];
35 37
  38 + [[BaiduMobStat defaultStat] startWithAppId:uBaiduMobStat];
  39 +
36 //收藏 40 //收藏
37 [[DBAction sharedDBAction] createTable]; 41 [[DBAction sharedDBAction] createTable];
38 42
@@ -190,9 +194,9 @@ @@ -190,9 +194,9 @@
190 #pragma mark - ShareSDK 注册SDK 194 #pragma mark - ShareSDK 注册SDK
191 - (void)regiestShareSDK { 195 - (void)regiestShareSDK {
192 [ShareSDK registerApp:@"134f952a9e004" activePlatforms:@[@(SSDKPlatformTypeSinaWeibo), 196 [ShareSDK registerApp:@"134f952a9e004" activePlatforms:@[@(SSDKPlatformTypeSinaWeibo),
193 - @(SSDKPlatformSubTypeWechatSession),  
194 - @(SSDKPlatformSubTypeWechatTimeline),  
195 - @(SSDKPlatformTypeQQ)] 197 + @(SSDKPlatformSubTypeWechatSession),
  198 + @(SSDKPlatformSubTypeWechatTimeline),
  199 + @(SSDKPlatformTypeQQ)]
196 onImport:^(SSDKPlatformType platformType) 200 onImport:^(SSDKPlatformType platformType)
197 { 201 {
198 switch (platformType) 202 switch (platformType)
CNLiveScioLive/Assets.xcassets/Home/cnlive_blue_search.imageset/Contents.json 0 → 100644
  View file @956334a
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "cnlive_blue_search@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "filename" : "cnlive_blue_search@3x.png",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "version" : 1,
  20 + "author" : "xcode"
  21 + }
  22 +}
0 \ No newline at end of file 23 \ No newline at end of file
CNLiveScioLive/Assets.xcassets/Home/cnlive_blue_search.imageset/cnlive_blue_search@2x.png 0 → 100644
View file @956334a

1.38 KB
CNLiveScioLive/Assets.xcassets/Home/cnlive_blue_search.imageset/cnlive_blue_search@3x.png 0 → 100644
View file @956334a

2.04 KB
CNLiveScioLive/Assets.xcassets/Home/cnlive_scan.imageset/Contents.json 0 → 100644
  View file @956334a
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "cnlive_scan@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "filename" : "cnlive_scan@3x.png",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "version" : 1,
  20 + "author" : "xcode"
  21 + }
  22 +}
0 \ No newline at end of file 23 \ No newline at end of file
CNLiveScioLive/Assets.xcassets/Home/cnlive_scan.imageset/cnlive_scan@2x.png 0 → 100644
View file @956334a

304 Bytes
CNLiveScioLive/Assets.xcassets/Home/cnlive_scan.imageset/cnlive_scan@3x.png 0 → 100644
View file @956334a

421 Bytes
CNLiveScioLive/Assets.xcassets/login/cnlive_email.imageset/Contents.json 100755 → 100644
  View file @956334a
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 }, 11 },
12 { 12 {
13 "idiom" : "universal", 13 "idiom" : "universal",
  14 + "filename" : "cnlive_email@3x.png",
14 "scale" : "3x" 15 "scale" : "3x"
15 } 16 }
16 ], 17 ],
CNLiveScioLive/Assets.xcassets/login/cnlive_email.imageset/cnlive_email@2x.png 100755 → 100644
View file @956334a

1.6 KB | W: | H:

477 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
CNLiveScioLive/Assets.xcassets/login/cnlive_email.imageset/cnlive_email@3x.png 0 → 100644
View file @956334a

726 Bytes
CNLiveScioLive/Assets.xcassets/login/cnlive_hide.imageset/Contents.json 0 → 100644
  View file @956334a
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "cnlive_hide@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "filename" : "cnlive_hide@3x.png",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "version" : 1,
  20 + "author" : "xcode"
  21 + }
  22 +}
0 \ No newline at end of file 23 \ No newline at end of file
CNLiveScioLive/Assets.xcassets/login/cnlive_hide.imageset/cnlive_hide@2x.png 0 → 100644
View file @956334a

704 Bytes
CNLiveScioLive/Assets.xcassets/login/cnlive_hide.imageset/cnlive_hide@3x.png 0 → 100644
View file @956334a

1.04 KB
CNLiveScioLive/Assets.xcassets/login/cnlive_password.imageset/Contents.json 100755 → 100644
  View file @956334a
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 }, 11 },
12 { 12 {
13 "idiom" : "universal", 13 "idiom" : "universal",
  14 + "filename" : "cnlive_password@3x.png",
14 "scale" : "3x" 15 "scale" : "3x"
15 } 16 }
16 ], 17 ],
CNLiveScioLive/Assets.xcassets/login/cnlive_password.imageset/cnlive_password@2x.png 100755 → 100644
View file @956334a

1.5 KB | W: | H:

540 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
CNLiveScioLive/Assets.xcassets/login/cnlive_password.imageset/cnlive_password@3x.png 0 → 100644
View file @956334a

822 Bytes
CNLiveScioLive/Assets.xcassets/login/cnlive_phone.imageset/Contents.json 100755 → 100644
  View file @956334a
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 }, 11 },
12 { 12 {
13 "idiom" : "universal", 13 "idiom" : "universal",
  14 + "filename" : "cnlive_phone@3x.png",
14 "scale" : "3x" 15 "scale" : "3x"
15 } 16 }
16 ], 17 ],
CNLiveScioLive/Assets.xcassets/login/cnlive_phone.imageset/cnlive_phone@2x.png 100755 → 100644
View file @956334a

1.12 KB | W: | H:

308 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
CNLiveScioLive/Assets.xcassets/login/cnlive_phone.imageset/cnlive_phone@3x.png 0 → 100644
View file @956334a

436 Bytes
CNLiveScioLive/Assets.xcassets/login/cnlive_phone_email.imageset/Contents.json 100755 → 100644
  View file @956334a
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 }, 11 },
12 { 12 {
13 "idiom" : "universal", 13 "idiom" : "universal",
  14 + "filename" : "cnlive_phone_email@3x.png",
14 "scale" : "3x" 15 "scale" : "3x"
15 } 16 }
16 ], 17 ],
CNLiveScioLive/Assets.xcassets/login/cnlive_phone_email.imageset/cnlive_phone_email@2x.png 100755 → 100644
View file @956334a

1.77 KB | W: | H:

634 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
CNLiveScioLive/Assets.xcassets/login/cnlive_phone_email.imageset/cnlive_phone_email@3x.png 0 → 100644
View file @956334a

925 Bytes
CNLiveScioLive/Assets.xcassets/login/cnlive_phone_message.imageset/Contents.json 100755 → 100644
  View file @956334a
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 }, 11 },
12 { 12 {
13 "idiom" : "universal", 13 "idiom" : "universal",
  14 + "filename" : "cnlive_phone_message@3x.png",
14 "scale" : "3x" 15 "scale" : "3x"
15 } 16 }
16 ], 17 ],
CNLiveScioLive/Assets.xcassets/login/cnlive_phone_message.imageset/cnlive_phone_message@2x.png 100755 → 100644
View file @956334a

1.2 KB | W: | H:

432 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
CNLiveScioLive/Assets.xcassets/login/cnlive_phone_message.imageset/cnlive_phone_message@3x.png 0 → 100644
View file @956334a

644 Bytes
CNLiveScioLive/Assets.xcassets/login/cnlive_show.imageset/Contents.json 0 → 100644
  View file @956334a
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "cnlive_show@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "filename" : "cnlive_show@3x.png",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "version" : 1,
  20 + "author" : "xcode"
  21 + }
  22 +}
0 \ No newline at end of file 23 \ No newline at end of file
CNLiveScioLive/Assets.xcassets/login/cnlive_show.imageset/cnlive_show@2x.png 0 → 100644
View file @956334a

617 Bytes
CNLiveScioLive/Assets.xcassets/login/cnlive_show.imageset/cnlive_show@3x.png 0 → 100644
View file @956334a

916 Bytes
CNLiveScioLive/Pages/Header/ConstantMacro.h
  View file @956334a
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
19 #define uMengKey @"568b65b0e0f55ad063001bfb" 19 #define uMengKey @"568b65b0e0f55ad063001bfb"
20 #define uAppId @"963024530" 20 #define uAppId @"963024530"
21 21
  22 +#define uBaiduMobStat @"bcbc32c4b9"
22 23
23 24
24 #endif /* ConstantMacro_h */ 25 #endif /* ConstantMacro_h */
CNLiveScioLive/Pages/Header/PrefixHeader.pch
  View file @956334a
@@ -72,8 +72,9 @@ @@ -72,8 +72,9 @@
72 #import <ShareSDK/ShareSDK.h> 72 #import <ShareSDK/ShareSDK.h>
73 #import <ShareSDKConnector/ShareSDKConnector.h> 73 #import <ShareSDKConnector/ShareSDKConnector.h>
74 #import <ShareSDKUI/ShareSDK+SSUI.h> 74 #import <ShareSDKUI/ShareSDK+SSUI.h>
75 -#import <TencentOpenAPI/QQApiInterface.h> 75 +//腾讯开放平台（对应QQ和QQ空间）SDK头文件
76 #import <TencentOpenAPI/TencentOAuth.h> 76 #import <TencentOpenAPI/TencentOAuth.h>
  77 +#import <TencentOpenAPI/QQApiInterface.h>
77 #import "WeiboSDK.h" 78 #import "WeiboSDK.h"
78 #import "WXApi.h" 79 #import "WXApi.h"
79 #import "MobClick.h" 80 #import "MobClick.h"
CNLiveScioLive/Pages/Header/UrlMacro.h
  View file @956334a
@@ -41,7 +41,10 @@ @@ -41,7 +41,10 @@
41 #define zhibo @"http://app.scio.gov.cn/live/liveinfo" 41 #define zhibo @"http://app.scio.gov.cn/live/liveinfo"
42 42
43 #define tuwenzhibo @"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx?type=ZhiBo" 43 #define tuwenzhibo @"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx?type=ZhiBo"
44 -#define tuwen(id) [NSString stringWithFormat:@"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx/JsonDataFromGXW.aspx?type=Doc&DocID=%d",id] 44 +
  45 +//#define tuwen(id) [NSString stringWithFormat:@"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx/JsonDataFromGXW.aspx?type=Doc&DocID=%d",id]
  46 +#define tuwen(id) [NSString stringWithFormat:@"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx?type=Doc&DocID=%d",id]
  47 +
45 #define yugao @"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx?type=DocList&Top=1&ChannelID=20490" 48 #define yugao @"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx?type=DocList&Top=1&ChannelID=20490"
46 #define yugaoliebiao @"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx?type=DocList&ChannelID=20490" 49 #define yugaoliebiao @"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx?type=DocList&ChannelID=20490"
47 //#define newsdetail(id) [NSString stringWithFormat:@"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx/JsonDataFromGXW.aspx?type=Doc&DocID=%d",id] 50 //#define newsdetail(id) [NSString stringWithFormat:@"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx/JsonDataFromGXW.aspx?type=Doc&DocID=%d",id]
CNLiveScioLive/Pages/Home/抽屉效果/Controller/CNHomeRightViewController.m
  View file @956334a
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 #import "CNHomeRightHeaderFooterView.h" 11 #import "CNHomeRightHeaderFooterView.h"
12 #import "XLSlideMenu.h" 12 #import "XLSlideMenu.h"
13 #import "CNLiveSearchViewController.h"//搜索 13 #import "CNLiveSearchViewController.h"//搜索
  14 +#import <KJARLib/KJARSCanViewController.h>
14 15
15 @interface CNHomeRightViewController ()<UITableViewDelegate,UITableViewDataSource> 16 @interface CNHomeRightViewController ()<UITableViewDelegate,UITableViewDataSource>
16 @property (nonatomic, strong) UITableView *tableView; 17 @property (nonatomic, strong) UITableView *tableView;
@@ -44,6 +45,7 @@ static NSString *homeRightHeaderFooterView = @&quot;CNHomeRightHeaderFooterView&quot;; @@ -44,6 +45,7 @@ static NSString *homeRightHeaderFooterView = @&quot;CNHomeRightHeaderFooterView&quot;;
44 [super didReceiveMemoryWarning]; 45 [super didReceiveMemoryWarning];
45 // Dispose of any resources that can be recreated. 46 // Dispose of any resources that can be recreated.
46 } 47 }
  48 +
47 #pragma mark - UITableViewDelegate 49 #pragma mark - UITableViewDelegate
48 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{ 50 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
49 return 40.f; 51 return 40.f;
@@ -60,7 +62,7 @@ static NSString *homeRightHeaderFooterView = @&quot;CNHomeRightHeaderFooterView&quot;; @@ -60,7 +62,7 @@ static NSString *homeRightHeaderFooterView = @&quot;CNHomeRightHeaderFooterView&quot;;
60 62
61 #pragma mark - UITableViewDataSource 63 #pragma mark - UITableViewDataSource
62 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{ 64 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
63 - return 2; 65 + return 3;
64 66
65 } 67 }
66 68
@@ -97,7 +99,7 @@ static NSString *homeRightHeaderFooterView = @&quot;CNHomeRightHeaderFooterView&quot;; @@ -97,7 +99,7 @@ static NSString *homeRightHeaderFooterView = @&quot;CNHomeRightHeaderFooterView&quot;;
97 99
98 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{ 100 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
99 101
100 - NSArray *array = @[@"搜索", @"栏目"]; 102 + NSArray *array = @[@"搜索内容", @"栏目列表", @"AR扫描"];
101 103
102 CNHomeRightHeaderFooterView *sectionHeadView = [tableView dequeueReusableHeaderFooterViewWithIdentifier:homeRightHeaderFooterView]; 104 CNHomeRightHeaderFooterView *sectionHeadView = [tableView dequeueReusableHeaderFooterViewWithIdentifier:homeRightHeaderFooterView];
103 if(!sectionHeadView){ 105 if(!sectionHeadView){
@@ -107,11 +109,15 @@ static NSString *homeRightHeaderFooterView = @&quot;CNHomeRightHeaderFooterView&quot;; @@ -107,11 +109,15 @@ static NSString *homeRightHeaderFooterView = @&quot;CNHomeRightHeaderFooterView&quot;;
107 if(section == 0){ 109 if(section == 0){
108 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickedSearch)]; 110 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickedSearch)];
109 [sectionHeadView addGestureRecognizer:tap]; 111 [sectionHeadView addGestureRecognizer:tap];
  112 + }else if (section == 2){
  113 + UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickedKJARSCan)];
  114 + [sectionHeadView addGestureRecognizer:tap];
110 } 115 }
111 116
112 return sectionHeadView; 117 return sectionHeadView;
113 118
114 } 119 }
  120 +
115 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { 121 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
116 XLSlideMenu *menu = (XLSlideMenu *)self.parentViewController; 122 XLSlideMenu *menu = (XLSlideMenu *)self.parentViewController;
117 CNLiveTabBarController *liveTab = (CNLiveTabBarController *)menu.rootViewController; 123 CNLiveTabBarController *liveTab = (CNLiveTabBarController *)menu.rootViewController;
@@ -153,6 +159,28 @@ static NSString *homeRightHeaderFooterView = @&quot;CNHomeRightHeaderFooterView&quot;; @@ -153,6 +159,28 @@ static NSString *homeRightHeaderFooterView = @&quot;CNHomeRightHeaderFooterView&quot;;
153 [vc showRootViewControllerAnimated:true]; 159 [vc showRootViewControllerAnimated:true];
154 160
155 } 161 }
  162 +
  163 +- (void)clickedKJARSCan{
  164 + // 判断网络状态
  165 + if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
  166 + [AlertViewTool showHUDViewText:@"您未连接网络，请联网后重试！"];
  167 + return;
  168 + }
  169 +// KJARSCanViewController *scanView = [[KJARSCanViewController alloc] init];
  170 +// [scanView SetAccountKey:@"AP6caf76bc2c5f45698c74ef7e126703e1" :@"3f57c704ff9f4c8d82a575db5c7abe12"];
  171 +// scanView.hidesBottomBarWhenPushed = YES;
  172 +// [self.navigationController pushViewController:scanView animated:YES];
  173 +
  174 +
  175 + XLSlideMenu *vc = (XLSlideMenu *)self.parentViewController;
  176 + CNLiveTabBarController *liveTab = (CNLiveTabBarController *)vc.rootViewController;
  177 + CNLiveBaseNavigationController *controllers = liveTab.viewControllers[0];
  178 + KJARSCanViewController *scanView = [[KJARSCanViewController alloc]init];
  179 + [scanView SetAccountKey:@"AP6caf76bc2c5f45698c74ef7e126703e1" :@"3f57c704ff9f4c8d82a575db5c7abe12"];
  180 + scanView.hidesBottomBarWhenPushed = YES;
  181 + [controllers pushViewController:scanView animated:YES];
  182 + [vc showRootViewControllerAnimated:true];
  183 +}
156 #pragma mark - Lazy Laoding 184 #pragma mark - Lazy Laoding
157 - (UITableView *)tableView{ 185 - (UITableView *)tableView{
158 if(!_tableView){ 186 if(!_tableView){
CNLiveScioLive/Pages/Home/抽屉效果/View/CNHomeRightHeaderFooterView.m
  View file @956334a
@@ -49,11 +49,16 @@ @@ -49,11 +49,16 @@
49 _title = title; 49 _title = title;
50 _titleLabel.text = title; 50 _titleLabel.text = title;
51 51
52 - if([title isEqualToString:@"栏目"]){ 52 + if([title isEqualToString:@"搜索内容"]){
  53 + _picImage.image = [UIImage imageNamed:@"cnlive_search"];
  54 +
  55 + }
  56 + else if([title isEqualToString:@"栏目列表"]){
53 _picImage.image = [UIImage imageNamed:@"cnlive_column"]; 57 _picImage.image = [UIImage imageNamed:@"cnlive_column"];
54 58
55 - }else{  
56 - _picImage.image = [UIImage imageNamed:@"cnlive_search"]; 59 + }
  60 + else{
  61 + _picImage.image = [UIImage imageNamed:@"cnlive_scan"];
57 62
58 } 63 }
59 64
CNLiveScioLive/Pages/Live/Controller/CNLiveViewController.m
  View file @956334a
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 #import "TopNoticeViewController.h" 15 #import "TopNoticeViewController.h"
16 #import "VideoPlayBackViewController.h" 16 #import "VideoPlayBackViewController.h"
17 #import "GraphicLiveViewController.h" 17 #import "GraphicLiveViewController.h"
  18 +#import "CNLiveSearchViewController.h"//搜索
18 19
19 @interface CNLiveViewController ()<UITableViewDelegate,UITableViewDataSource>{ 20 @interface CNLiveViewController ()<UITableViewDelegate,UITableViewDataSource>{
20 NSArray *_newsArray; 21 NSArray *_newsArray;
@@ -170,11 +171,13 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;; @@ -170,11 +171,13 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
170 [CNLiveStat statLivePlayerWithChannelId:@"zbsc"]; 171 [CNLiveStat statLivePlayerWithChannelId:@"zbsc"];
171 [CNLiveStat beginEvent:@"zbsc"]; 172 [CNLiveStat beginEvent:@"zbsc"];
172 173
  174 + self.navigationController.navigationBar.barTintColor = [UIColor whiteColor];
  175 + self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName:[UIColor whiteColor], NSFontAttributeName:[UIFont systemFontOfSize:18]};
173 } 176 }
174 177
175 - (void)viewDidLoad { 178 - (void)viewDidLoad {
176 [super viewDidLoad]; 179 [super viewDidLoad];
177 - self.name = @"直播"; 180 + [self setUpNavigationBar];
178 [self getData]; 181 [self getData];
179 182
180 _pageNo = 1; 183 _pageNo = 1;
@@ -206,6 +209,47 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;; @@ -206,6 +209,47 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
206 //时长统计结束 209 //时长统计结束
207 [CNLiveStat endEvent:@"zbsc"]; 210 [CNLiveStat endEvent:@"zbsc"];
208 } 211 }
  212 +#pragma mark - UI
  213 +- (void)setUpNavigationBar{
  214 +
  215 + //左
  216 + UIButton *headerButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 200, 44)];
  217 + headerButton.userInteractionEnabled = NO;
  218 + headerButton.layer.cornerRadius = 2.0;
  219 + headerButton.layer.masksToBounds = true;
  220 + [headerButton setImage:[UIImage imageNamed:@"cnlive_icon"] forState:UIControlStateNormal];
  221 + [headerButton setTitle:@"直播" forState:UIControlStateNormal];
  222 + [headerButton setTitleColor:Color_Blue forState:UIControlStateNormal];
  223 + headerButton.titleLabel.font = [UIFont systemFontOfSize:15];
  224 +
  225 + headerButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;//居左显示
  226 + headerButton.titleEdgeInsets = UIEdgeInsetsMake(0, 8, 0, 0);
  227 + self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:headerButton];
  228 +
  229 + //右
  230 + UIButton *searchButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 23, 44)];
  231 + [searchButton setImage:[UIImage imageNamed:@"cnlive_blue_search"] forState:UIControlStateNormal];
  232 +// [searchButton setBackgroundImage:[UIImage imageNamed:@"cnlive_search"] forState:UIControlStateNormal];
  233 + [searchButton addTarget:self action:@selector(clickedSearchBtn:) forControlEvents:UIControlEventTouchUpInside];
  234 + UIBarButtonItem *item1 = [[UIBarButtonItem alloc] initWithCustomView:searchButton];
  235 +
  236 + UIBarButtonItem *space = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
  237 + space.width = 15;
  238 +
  239 + UIButton *languageButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 23, 44)];
  240 + if(IS_CHINESE){
  241 + [languageButton setImage:[UIImage imageNamed:@"cnlive_EN"] forState:UIControlStateNormal];
  242 + [languageButton setImage:[UIImage imageNamed:@"cnlive_CN"] forState:UIControlStateSelected];
  243 + }else{
  244 + [languageButton setImage:[UIImage imageNamed:@"cnlive_CN"] forState:UIControlStateNormal];
  245 + [languageButton setImage:[UIImage imageNamed:@"cnlive_EN"] forState:UIControlStateSelected];
  246 + }
  247 +
  248 + [languageButton addTarget:self action:@selector(chinaENLanguageSwitch:) forControlEvents:UIControlEventTouchUpInside];
  249 + UIBarButtonItem *item2 = [[UIBarButtonItem alloc] initWithCustomView:languageButton];
  250 + self.navigationItem.rightBarButtonItems = @[item2, space, item1];
  251 +}
  252 +
209 - (void)didReceiveMemoryWarning { 253 - (void)didReceiveMemoryWarning {
210 [super didReceiveMemoryWarning]; 254 [super didReceiveMemoryWarning];
211 // Dispose of any resources that can be recreated. 255 // Dispose of any resources that can be recreated.
@@ -219,7 +263,7 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;; @@ -219,7 +263,7 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
219 return 40; 263 return 40;
220 264
221 } 265 }
222 - return 100; 266 + return 80*MainScale+10;
223 } 267 }
224 268
225 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{ 269 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
@@ -343,8 +387,9 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;; @@ -343,8 +387,9 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
343 */ 387 */
344 #pragma mark - Action 388 #pragma mark - Action
345 - (void)clickedSearchBtn:(UIButton *)btn{ 389 - (void)clickedSearchBtn:(UIButton *)btn{
346 -  
347 - 390 + CNLiveSearchViewController *search = [[CNLiveSearchViewController alloc] init];
  391 + search.hidesBottomBarWhenPushed = YES;
  392 + [self.navigationController pushViewController:search animated:YES];
348 } 393 }
349 394
350 #pragma mark - Lazy Laoding 395 #pragma mark - Lazy Laoding
CNLiveScioLive/Pages/Live/View/CNLiveTableViewCell.m
  View file @956334a
@@ -81,13 +81,13 @@ @@ -81,13 +81,13 @@
81 [_picImage mas_makeConstraints:^(MASConstraintMaker *make) { 81 [_picImage mas_makeConstraints:^(MASConstraintMaker *make) {
82 make.left.equalTo(self->_backgroundImage.mas_left).with.offset(10); 82 make.left.equalTo(self->_backgroundImage.mas_left).with.offset(10);
83 make.top.equalTo(self->_backgroundImage.mas_top).with.offset(5); 83 make.top.equalTo(self->_backgroundImage.mas_top).with.offset(5);
84 - make.width.offset(120); 84 + make.width.offset(80*MainScale*16/9.0);
85 make.bottom.equalTo(self->_backgroundImage.mas_bottom).with.offset(-5); 85 make.bottom.equalTo(self->_backgroundImage.mas_bottom).with.offset(-5);
86 86
87 }]; 87 }];
88 88
89 [_playImage mas_makeConstraints:^(MASConstraintMaker *make) { 89 [_playImage mas_makeConstraints:^(MASConstraintMaker *make) {
90 - make.centerX.equalTo(self->_backgroundImage.mas_left).with.offset(70); 90 + make.left.equalTo(self->_picImage.mas_left).with.offset((80*MainScale*16/9.0-30)/2.0);
91 make.centerY.offset(self->_picImage.centerY); 91 make.centerY.offset(self->_picImage.centerY);
92 make.width.offset(30); 92 make.width.offset(30);
93 make.height.offset(30); 93 make.height.offset(30);
CNLiveScioLive/Pages/Login/View/CNLiveLoginInputView.m
  View file @956334a
@@ -36,8 +36,10 @@ @@ -36,8 +36,10 @@
36 { 36 {
37 _show.hidden = NO; 37 _show.hidden = NO;
38 _textField.secureTextEntry = YES; 38 _textField.secureTextEntry = YES;
39 - [_show setTitle:CustomStr(@"Show") forState:UIControlStateNormal];  
40 - [_show setTitle:CustomStr(@"Hide") forState:UIControlStateSelected]; 39 +// [_show setTitle:CustomStr(@"Show") forState:UIControlStateNormal];
  40 +// [_show setTitle:CustomStr(@"Hide") forState:UIControlStateSelected];
  41 + [_show setImage:[UIImage imageNamed:@"cnlive_show"] forState:UIControlStateNormal];
  42 + [_show setImage:[UIImage imageNamed:@"cnlive_hide"] forState:UIControlStateSelected];
41 [_show addTarget:self action:@selector(clickedShowBtn:) forControlEvents:UIControlEventTouchUpInside]; 43 [_show addTarget:self action:@selector(clickedShowBtn:) forControlEvents:UIControlEventTouchUpInside];
42 } 44 }
43 break; 45 break;
@@ -72,8 +74,7 @@ @@ -72,8 +74,7 @@
72 - (void)setUpUI{ 74 - (void)setUpUI{
73 75
74 _picImage = [[UIImageView alloc] init]; 76 _picImage = [[UIImageView alloc] init];
75 - _picImage.contentMode = UIViewContentModeScaleToFill;  
76 -// _picImage.contentMode = UIViewContentModeCenter; 77 + _picImage.contentMode = UIViewContentModeCenter;
77 _picImage.layer.masksToBounds = YES; 78 _picImage.layer.masksToBounds = YES;
78 [self addSubview:_picImage]; 79 [self addSubview:_picImage];
79 80
@@ -86,13 +87,13 @@ @@ -86,13 +87,13 @@
86 87
87 _show = [UIButton buttonWithType:UIButtonTypeCustom]; 88 _show = [UIButton buttonWithType:UIButtonTypeCustom];
88 _show.backgroundColor = [UIColor whiteColor]; 89 _show.backgroundColor = [UIColor whiteColor];
89 - _show.layer.masksToBounds = YES;  
90 - _show.layer.cornerRadius = 4.0f;  
91 - _show.layer.borderColor = HEXCOLOR(0x333333).CGColor;  
92 - [_show setTitleColor:HEXCOLOR(0x333333) forState:UIControlStateNormal];  
93 - _show.layer.borderWidth = 1.0f;  
94 - _show.highlighted = NO;  
95 - _show.titleLabel.font = [UIFont systemFontOfSize:12]; 90 +// _show.layer.masksToBounds = YES;
  91 +// _show.layer.cornerRadius = 4.0f;
  92 +// _show.layer.borderColor = HEXCOLOR(0x333333).CGColor;
  93 +// [_show setTitleColor:HEXCOLOR(0x333333) forState:UIControlStateNormal];
  94 +// _show.layer.borderWidth = 1.0f;
  95 +// _show.highlighted = NO;
  96 +// _show.titleLabel.font = [UIFont systemFontOfSize:12];
96 [self addSubview:_show]; 97 [self addSubview:_show];
97 98
98 _line = [[UIImageView alloc] init]; 99 _line = [[UIImageView alloc] init];
@@ -106,7 +107,7 @@ @@ -106,7 +107,7 @@
106 [_picImage mas_makeConstraints:^(MASConstraintMaker *make) { 107 [_picImage mas_makeConstraints:^(MASConstraintMaker *make) {
107 make.top.equalTo(self.mas_top).with.offset(10); 108 make.top.equalTo(self.mas_top).with.offset(10);
108 make.left.equalTo(self.mas_left).with.offset(10); 109 make.left.equalTo(self.mas_left).with.offset(10);
109 - make.width.offset(15); 110 + make.width.offset(20);
110 make.height.offset(20); 111 make.height.offset(20);
111 112
112 }]; 113 }];
@@ -138,6 +139,13 @@ @@ -138,6 +139,13 @@
138 break; 139 break;
139 case CNLiveButtonTypeCode: 140 case CNLiveButtonTypeCode:
140 { 141 {
  142 + _show.layer.masksToBounds = YES;
  143 + _show.layer.cornerRadius = 4.0f;
  144 + _show.layer.borderColor = HEXCOLOR(0x333333).CGColor;
  145 + [_show setTitleColor:HEXCOLOR(0x333333) forState:UIControlStateNormal];
  146 + _show.layer.borderWidth = 1.0f;
  147 + _show.highlighted = NO;
  148 + _show.titleLabel.font = [UIFont systemFontOfSize:12];
141 [_show mas_makeConstraints:^(MASConstraintMaker *make) { 149 [_show mas_makeConstraints:^(MASConstraintMaker *make) {
142 make.top.equalTo(self.mas_top).with.offset(8); 150 make.top.equalTo(self.mas_top).with.offset(8);
143 make.bottom.equalTo(self.mas_bottom).with.offset(-8); 151 make.bottom.equalTo(self.mas_bottom).with.offset(-8);
CNLiveScioLive/Pages/My/CNMyTableViewHeaderView.m
  View file @956334a
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 } 25 }
26 26
27 - (void)setUpUI{ 27 - (void)setUpUI{
28 - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeLanguageVersion:) name:@"changeLanguageVersion" object:nil]; 28 +// [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeLanguageVersion:) name:@"changeLanguageVersion" object:nil];
29 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginSuccessful:) name:LoginSuccessful object:nil]; 29 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginSuccessful:) name:LoginSuccessful object:nil];
30 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(exitSuccessful:) name:ExitSuccessful object:nil]; 30 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(exitSuccessful:) name:ExitSuccessful object:nil];
31 31
@@ -74,16 +74,19 @@ @@ -74,16 +74,19 @@
74 74
75 NSString *name = [userDefaults valueForKey:@"user_name"]; 75 NSString *name = [userDefaults valueForKey:@"user_name"];
76 [_clickedBtn setTitle:name forState:UIControlStateNormal]; 76 [_clickedBtn setTitle:name forState:UIControlStateNormal];
77 - 77 + [self layoutSubviews];
  78 +
78 } 79 }
79 - (void)exitSuccessful:(NSNotification *)noti{ 80 - (void)exitSuccessful:(NSNotification *)noti{
80 _headerImage.image = [UIImage imageNamed:@"cnlive_my_header"]; 81 _headerImage.image = [UIImage imageNamed:@"cnlive_my_header"];
81 [_clickedBtn setTitle:CustomStr(@"ClickLogin") forState:UIControlStateNormal]; 82 [_clickedBtn setTitle:CustomStr(@"ClickLogin") forState:UIControlStateNormal];
82 -  
83 -}  
84 -- (void)changeLanguageVersion:(NSNotification *)notification {  
85 - [_clickedBtn setTitle:CustomStr(@"ClickLogin") forState:UIControlStateNormal]; 83 + [self layoutSubviews];
  84 +
86 } 85 }
  86 +//- (void)changeLanguageVersion:(NSNotification *)notification {
  87 +// [_clickedBtn setTitle:CustomStr(@"ClickLogin") forState:UIControlStateNormal];
  88 +// [self layoutSubviews];
  89 +//}
87 90
88 - (void)dealloc{ 91 - (void)dealloc{
89 [[NSNotificationCenter defaultCenter] removeObserver:self]; 92 [[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -99,12 +102,23 @@ @@ -99,12 +102,23 @@
99 102
100 }]; 103 }];
101 104
102 - [_clickedBtn mas_makeConstraints:^(MASConstraintMaker *make) {  
103 - make.left.equalTo(self->_headerImage.mas_right).with.offset(20); 105 + NSString *content = _clickedBtn.titleLabel.text;
  106 + UIFont *font = [UIFont systemFontOfSize:13];
  107 + CGSize size = CGSizeMake(MAXFLOAT, 30.0f);
  108 + CGFloat buttonWidth = [content boundingRectWithSize:size options:NSStringDrawingTruncatesLastVisibleLine | NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{ NSFontAttributeName:font } context:nil].size.width+10;
  109 +
  110 +// _clickedBtn.frame = CGRectMake(_headerImage.right+10, (self.height-30)/2.0, buttonWidth, 30);
  111 + [_clickedBtn mas_updateConstraints:^(MASConstraintMaker *make) {
  112 + make.left.equalTo(self->_headerImage.mas_right).with.offset(10);
104 make.centerY.equalTo(self.mas_centerY); 113 make.centerY.equalTo(self.mas_centerY);
105 -// make.width.offset(60);  
106 - 114 + make.width.offset(buttonWidth);
107 }]; 115 }];
  116 +// [_clickedBtn mas_makeConstraints:^(MASConstraintMaker *make) {
  117 +// make.left.equalTo(self->_headerImage.mas_right).with.offset(20);
  118 +// make.centerY.equalTo(self.mas_centerY);
  119 +// make.width.offset(buttonWidth);
  120 +//
  121 +// }];
108 122
109 } 123 }
110 - (void)clickedLoginBtn{ 124 - (void)clickedLoginBtn{
CNLiveScioLive/Pages/My/联系我们/Controller/CNLiveContactUsViewController.m
  View file @956334a
@@ -79,9 +79,10 @@ static const NSInteger margin = 10; @@ -79,9 +79,10 @@ static const NSInteger margin = 10;
79 titleLabel.backgroundColor = [UIColor clearColor]; 79 titleLabel.backgroundColor = [UIColor clearColor];
80 titleLabel.textColor = HEXCOLOR(0x333333); 80 titleLabel.textColor = HEXCOLOR(0x333333);
81 // titleLabel.text = @" 其他联系方式\n\n 电话：010-65592311\n\n 地址：中国北京东城区朝阳门内大街225号\n\n 邮编：100010"; 81 // titleLabel.text = @" 其他联系方式\n\n 电话：010-65592311\n\n 地址：中国北京东城区朝阳门内大街225号\n\n 邮编：100010";
82 - titleLabel.text = [NSString stringWithFormat:@" %@\n\n %@：010-65592311\n\n %@\n\n %@：100010",CustomStr(@"OthercContacts"), CustomStr(@"Tel"), CustomStr(@"Address"), CustomStr(@"Postcode")]; 82 +// titleLabel.text = [NSString stringWithFormat:@" %@\n\n %@：010-65592311\n\n %@\n\n %@：100010",CustomStr(@"OthercContacts"), CustomStr(@"Tel"), CustomStr(@"Address"), CustomStr(@"Postcode")];
  83 +
  84 + titleLabel.text = [NSString stringWithFormat:@" %@\n\n %@：010-88824268\n\n %@：guoxinfabu_taolm@scio.gov.cn \n\n QQ：110016699\n\n",CustomStr(@"OthercContacts"), CustomStr(@"Tel"), CustomStr(@"Email")];
83 85
84 -  
85 titleLabel.font = [UIFont systemFontOfSize:14]; 86 titleLabel.font = [UIFont systemFontOfSize:14];
86 [self.view addSubview:titleLabel]; 87 [self.view addSubview:titleLabel];
87 88
CNLiveScioLive/Pages/My/设置/Controller/CNLiveAboutUsViewController.m
  View file @956334a
@@ -25,7 +25,8 @@ @@ -25,7 +25,8 @@
25 [self setUpNavigationBar]; 25 [self setUpNavigationBar];
26 [self.view addSubview:self.webView]; 26 [self.view addSubview:self.webView];
27 27
28 - NSString *filePath = [[NSBundle mainBundle] pathForResource:@"about" ofType:@"html"]; 28 + NSString *html = IS_CHINESE?@"about":@"aboutEN";
  29 + NSString *filePath = [[NSBundle mainBundle] pathForResource:html ofType:@"html"];
29 NSURL *url = [NSURL fileURLWithPath:filePath]; 30 NSURL *url = [NSURL fileURLWithPath:filePath];
30 NSURLRequest *request = [NSURLRequest requestWithURL:url]; 31 NSURLRequest *request = [NSURLRequest requestWithURL:url];
31 [self.webView loadRequest:request]; 32 [self.webView loadRequest:request];
CNLiveScioLive/Pages/Newsound/OldController/VoiceViewController.m
  View file @956334a
@@ -465,11 +465,13 @@ static const NSInteger margin = 34; @@ -465,11 +465,13 @@ static const NSInteger margin = 34;
465 //顶部按钮UI 465 //顶部按钮UI
466 - (void)setButtonView { 466 - (void)setButtonView {
467 UIView *btnBackView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, 45)]; 467 UIView *btnBackView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, 45)];
468 - btnBackView.backgroundColor = [UIColor whiteColor];  
469 - 468 +// btnBackView.backgroundColor = [UIColor whiteColor];
  469 + btnBackView.backgroundColor = HEXCOLOR(0x1959C9);
  470 +
470 listenBtn = [UIButton buttonWithType:UIButtonTypeCustom]; 471 listenBtn = [UIButton buttonWithType:UIButtonTypeCustom];
471 [listenBtn addTarget:self action:@selector(changeType:) forControlEvents:UIControlEventTouchUpInside]; 472 [listenBtn addTarget:self action:@selector(changeType:) forControlEvents:UIControlEventTouchUpInside];
472 - [listenBtn setTitleColor:HEXCOLOR(0x1959C9) forState:UIControlStateNormal]; 473 +// [listenBtn setTitleColor:HEXCOLOR(0x1959C9) forState:UIControlStateNormal];
  474 + [listenBtn setTitleColor:HEXCOLOR(0xffffff) forState:UIControlStateNormal];
473 [listenBtn setFrame:CGRectMake(0, 0, MainScreenWidth/2.0, 45)]; 475 [listenBtn setFrame:CGRectMake(0, 0, MainScreenWidth/2.0, 45)];
474 [listenBtn setTitle:CustomStr(@"Play") forState:UIControlStateNormal]; 476 [listenBtn setTitle:CustomStr(@"Play") forState:UIControlStateNormal];
475 listenBtn.titleLabel.font = [UIFont systemFontOfSize:16]; 477 listenBtn.titleLabel.font = [UIFont systemFontOfSize:16];
@@ -480,7 +482,7 @@ static const NSInteger margin = 34; @@ -480,7 +482,7 @@ static const NSInteger margin = 34;
480 if(IS_CHINESE){ 482 if(IS_CHINESE){
481 sVoiceBtn = [UIButton buttonWithType:UIButtonTypeCustom]; 483 sVoiceBtn = [UIButton buttonWithType:UIButtonTypeCustom];
482 [sVoiceBtn addTarget:self action:@selector(changeType:) forControlEvents:UIControlEventTouchUpInside]; 484 [sVoiceBtn addTarget:self action:@selector(changeType:) forControlEvents:UIControlEventTouchUpInside];
483 - [sVoiceBtn setTitleColor:HEXCOLOR(0x333333) forState:UIControlStateNormal]; 485 + [sVoiceBtn setTitleColor:HEXCOLOR(0x979ba3) forState:UIControlStateNormal];
484 [sVoiceBtn setFrame:CGRectMake(MainScreenWidth/2.0, 0, MainScreenWidth/2.0, 45)]; 486 [sVoiceBtn setFrame:CGRectMake(MainScreenWidth/2.0, 0, MainScreenWidth/2.0, 45)];
485 [sVoiceBtn setTitle:@"国新之声" forState:UIControlStateNormal]; 487 [sVoiceBtn setTitle:@"国新之声" forState:UIControlStateNormal];
486 sVoiceBtn.titleLabel.font = [UIFont systemFontOfSize:16]; 488 sVoiceBtn.titleLabel.font = [UIFont systemFontOfSize:16];
@@ -489,7 +491,7 @@ static const NSInteger margin = 34; @@ -489,7 +491,7 @@ static const NSInteger margin = 34;
489 }else{ 491 }else{
490 engVOSBtn = [UIButton buttonWithType:UIButtonTypeCustom]; 492 engVOSBtn = [UIButton buttonWithType:UIButtonTypeCustom];
491 [engVOSBtn addTarget:self action:@selector(changeType:) forControlEvents:UIControlEventTouchUpInside]; 493 [engVOSBtn addTarget:self action:@selector(changeType:) forControlEvents:UIControlEventTouchUpInside];
492 - [engVOSBtn setTitleColor:HEXCOLOR(0x333333) forState:UIControlStateNormal]; 494 + [engVOSBtn setTitleColor:HEXCOLOR(0x979ba3) forState:UIControlStateNormal];
493 [engVOSBtn setFrame:CGRectMake(MainScreenWidth/2.0, 0, MainScreenWidth/2.0, 45)]; 495 [engVOSBtn setFrame:CGRectMake(MainScreenWidth/2.0, 0, MainScreenWidth/2.0, 45)];
494 [engVOSBtn setTitle:@"VOICE OF SCIO" forState:UIControlStateNormal]; 496 [engVOSBtn setTitle:@"VOICE OF SCIO" forState:UIControlStateNormal];
495 engVOSBtn.titleLabel.font = [UIFont systemFontOfSize:16]; 497 engVOSBtn.titleLabel.font = [UIFont systemFontOfSize:16];
@@ -499,8 +501,9 @@ static const NSInteger margin = 34; @@ -499,8 +501,9 @@ static const NSInteger margin = 34;
499 501
500 CGFloat selectViewWidth = 90; 502 CGFloat selectViewWidth = 90;
501 CGFloat margin = (MainScreenWidth/2.0-selectViewWidth)/2.0; 503 CGFloat margin = (MainScreenWidth/2.0-selectViewWidth)/2.0;
502 - selectView = [[UIView alloc] initWithFrame:CGRectMake(margin, 43, selectViewWidth, 2)];  
503 - selectView.backgroundColor = HEXCOLOR(0x1959C9); 504 + selectView = [[UIView alloc] initWithFrame:CGRectMake(margin, 42, selectViewWidth, 2)];
  505 +// selectView.backgroundColor = HEXCOLOR(0x1959C9);
  506 + selectView.backgroundColor = [UIColor whiteColor];
504 [btnBackView addSubview:selectView]; 507 [btnBackView addSubview:selectView];
505 508
506 [self.view addSubview:btnBackView]; 509 [self.view addSubview:btnBackView];
@@ -792,12 +795,13 @@ static const NSInteger margin = 34; @@ -792,12 +795,13 @@ static const NSInteger margin = 34;
792 #pragma mark - 点击切换顶部按钮 795 #pragma mark - 点击切换顶部按钮
793 - (void)ToShouTing { 796 - (void)ToShouTing {
794 selectType = 1000; 797 selectType = 1000;
795 - [listenBtn setTitleColor:HEXCOLOR(0x1959C9) forState:UIControlStateNormal];  
796 - [sVoiceBtn setTitleColor:HEXCOLOR(0x333333) forState:UIControlStateNormal];  
797 - [engVOSBtn setTitleColor:HEXCOLOR(0x333333) forState:UIControlStateNormal]; 798 +// [listenBtn setTitleColor:HEXCOLOR(0x1959C9) forState:UIControlStateNormal];
  799 + [listenBtn setTitleColor:HEXCOLOR(0xffffff) forState:UIControlStateNormal];
  800 + [sVoiceBtn setTitleColor:HEXCOLOR(0x979ba3) forState:UIControlStateNormal];
  801 + [engVOSBtn setTitleColor:HEXCOLOR(0x979ba3) forState:UIControlStateNormal];
798 802
799 CGFloat margin = (MainScreenWidth/2.0-90)/2.0; 803 CGFloat margin = (MainScreenWidth/2.0-90)/2.0;
800 - [selectView setFrame:CGRectMake(margin, 43, 90, 2)]; 804 + [selectView setFrame:CGRectMake(margin, 42, 90, 2)];
801 805
802 _tableView.hidden = YES; 806 _tableView.hidden = YES;
803 _enTableView.hidden = YES; 807 _enTableView.hidden = YES;
@@ -806,12 +810,13 @@ static const NSInteger margin = 34; @@ -806,12 +810,13 @@ static const NSInteger margin = 34;
806 810
807 - (void)ToGXZSList { 811 - (void)ToGXZSList {
808 selectType = 1001; 812 selectType = 1001;
809 - [listenBtn setTitleColor:HEXCOLOR(0x333333) forState:UIControlStateNormal];  
810 - [sVoiceBtn setTitleColor:HEXCOLOR(0x1959C9) forState:UIControlStateNormal];  
811 - [engVOSBtn setTitleColor:HEXCOLOR(0x333333) forState:UIControlStateNormal]; 813 + [listenBtn setTitleColor:HEXCOLOR(0x979ba3) forState:UIControlStateNormal];
  814 +// [sVoiceBtn setTitleColor:HEXCOLOR(0x1959C9) forState:UIControlStateNormal];
  815 + [sVoiceBtn setTitleColor:HEXCOLOR(0xffffff) forState:UIControlStateNormal];
  816 + [engVOSBtn setTitleColor:HEXCOLOR(0x979ba3) forState:UIControlStateNormal];
812 817
813 CGFloat margin = (MainScreenWidth/2.0-90)/2.0; 818 CGFloat margin = (MainScreenWidth/2.0-90)/2.0;
814 - [selectView setFrame:CGRectMake(MainScreenWidth/2.0+margin, 43, 90, 2)]; 819 + [selectView setFrame:CGRectMake(MainScreenWidth/2.0+margin, 42, 90, 2)];
815 _tableView.hidden = NO; 820 _tableView.hidden = NO;
816 _enTableView.hidden = YES; 821 _enTableView.hidden = YES;
817 822
@@ -819,12 +824,13 @@ static const NSInteger margin = 34; @@ -819,12 +824,13 @@ static const NSInteger margin = 34;
819 824
820 - (void)ToVOSList { 825 - (void)ToVOSList {
821 selectType = 1002; 826 selectType = 1002;
822 - [listenBtn setTitleColor:HEXCOLOR(0x333333) forState:UIControlStateNormal];  
823 - [sVoiceBtn setTitleColor:HEXCOLOR(0x333333) forState:UIControlStateNormal];  
824 - [engVOSBtn setTitleColor:HEXCOLOR(0x1959C9) forState:UIControlStateNormal];  
825 - 827 + [listenBtn setTitleColor:HEXCOLOR(0x979ba3) forState:UIControlStateNormal];
  828 + [sVoiceBtn setTitleColor:HEXCOLOR(0x979ba3) forState:UIControlStateNormal];
  829 +// [engVOSBtn setTitleColor:HEXCOLOR(0x1959C9) forState:UIControlStateNormal];
  830 + [engVOSBtn setTitleColor:HEXCOLOR(0xffffff) forState:UIControlStateNormal];
  831 +
826 CGFloat margin = (MainScreenWidth/2.0-90)/2.0; 832 CGFloat margin = (MainScreenWidth/2.0-90)/2.0;
827 - [selectView setFrame:CGRectMake(MainScreenWidth/2.0+margin, 43, 90, 2)]; 833 + [selectView setFrame:CGRectMake(MainScreenWidth/2.0+margin, 42, 90, 2)];
828 _enTableView.hidden = NO; 834 _enTableView.hidden = NO;
829 _tableView.hidden = YES; 835 _tableView.hidden = YES;
830 836
CNLiveScioLive/Pages/Sources/Images/cnlive_zhouxin_icon.png 100644 → 100755
View file @956334a

4.97 KB | W: | H:

6.81 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
CNLiveScioLive/Pages/Sources/MainTabbarItemEN.plist
  View file @956334a
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <key>title</key> 12 <key>title</key>
13 <string>首页</string> 13 <string>首页</string>
14 <key>enTitle</key> 14 <key>enTitle</key>
15 - <string>Home</string> 15 + <string>HOME</string>
16 </dict> 16 </dict>
17 <dict> 17 <dict>
18 <key>controller</key> 18 <key>controller</key>
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <key>title</key> 24 <key>title</key>
25 <string>新声</string> 25 <string>新声</string>
26 <key>enTitle</key> 26 <key>enTitle</key>
27 - <string>Voice of scio</string> 27 + <string>VOICE OF SICO</string>
28 </dict> 28 </dict>
29 <dict> 29 <dict>
30 <key>controller</key> 30 <key>controller</key>
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 <key>title</key> 36 <key>title</key>
37 <string>我的</string> 37 <string>我的</string>
38 <key>enTitle</key> 38 <key>enTitle</key>
39 - <string>My</string> 39 + <string>MY</string>
40 </dict> 40 </dict>
41 </array> 41 </array>
42 </plist> 42 </plist>
CNLiveScioLive/Pages/Sources/about.html
  View file @956334a
@@ -7,8 +7,8 @@ @@ -7,8 +7,8 @@
7 </head> 7 </head>
8 <body> 8 <body>
9 <br> 9 <br>
10 - <div align="center"><img src="cnlive_zhouxin_icon.png"/></div>  
11 - <h3><center>本办介绍</center></h3> 10 + <div align="center"><img src="cnlive_zhouxin_icon.png"/></div>
  11 +<!-- <h3><center>本办介绍</center></h3>-->
12 <div class="logo" style="text-indent:2em">中华人民共和国国务院新闻办公室(简称国务院新闻办)组建于1991年1月。</div> 12 <div class="logo" style="text-indent:2em">中华人民共和国国务院新闻办公室(简称国务院新闻办)组建于1991年1月。</div>
13 <div class="logo" style="text-indent:2em">国务院新闻办主要职责是推动中国媒体向世界说明中国，包括介绍中国的内外方针政策、经济社会发展情况，及中国的历史和中国科技、教育、文化等发展情况。通过指导协调媒体对外报道，召开新闻发布会，提供书籍资料及影视制品等方式对外介绍中国。协助外国记者在中国的采访，推动海外媒体客观、准确地报道中国。广泛开展与各国政府和新闻媒体的交流、合作。与有关部门合作开展对外交流活动。</div> 13 <div class="logo" style="text-indent:2em">国务院新闻办主要职责是推动中国媒体向世界说明中国，包括介绍中国的内外方针政策、经济社会发展情况，及中国的历史和中国科技、教育、文化等发展情况。通过指导协调媒体对外报道，召开新闻发布会，提供书籍资料及影视制品等方式对外介绍中国。协助外国记者在中国的采访，推动海外媒体客观、准确地报道中国。广泛开展与各国政府和新闻媒体的交流、合作。与有关部门合作开展对外交流活动。</div>
14 <div class="logo" style="text-indent:2em">国务院新闻办在推动中国媒体向世界报道中国的同时，还积极推动中国媒体对各国情况和国际问题的报道，促进中国公众及时了解世界经济、科技、文化的发展进步情况。</div> 14 <div class="logo" style="text-indent:2em">国务院新闻办在推动中国媒体向世界报道中国的同时，还积极推动中国媒体对各国情况和国际问题的报道，促进中国公众及时了解世界经济、科技、文化的发展进步情况。</div>
CNLiveScioLive/Pages/Tools/Category/UIView+Extension.h
  View file @956334a
@@ -19,5 +19,7 @@ @@ -19,5 +19,7 @@
19 @property (nonatomic, assign) CGPoint origin; 19 @property (nonatomic, assign) CGPoint origin;
20 @property (nonatomic, assign) CGFloat top; 20 @property (nonatomic, assign) CGFloat top;
21 @property (nonatomic, assign) CGFloat bottom; 21 @property (nonatomic, assign) CGFloat bottom;
  22 +@property (nonatomic, assign) CGFloat right;
  23 +@property (nonatomic, assign) CGFloat left;
22 24
23 @end 25 @end
CNLiveScioLive/Pages/Tools/Category/UIView+Extension.m
  View file @956334a
@@ -129,5 +129,25 @@ @@ -129,5 +129,25 @@
129 return self.frame.origin.y + self.frame.size.height; 129 return self.frame.origin.y + self.frame.size.height;
130 } 130 }
131 131
  132 +- (CGFloat)right {
  133 + return self.frame.origin.x + self.frame.size.width;
  134 +}
  135 +
  136 +- (void)setRight:(CGFloat)right {
  137 + CGRect frame = self.frame;
  138 + frame.origin.x = right - frame.size.width;
  139 + self.frame = frame;
  140 +}
  141 +
  142 +- (CGFloat)left {
  143 + return self.frame.origin.x;
  144 +}
  145 +
  146 +- (void)setLeft:(CGFloat)left {
  147 + CGRect frame = self.frame;
  148 + frame.origin.x = left;
  149 + self.frame = frame;
  150 +}
  151 +
132 152
133 @end 153 @end
@@ -27,5 +27,6 @@ target &#39;CNLiveScioLive&#39; do @@ -27,5 +27,6 @@ target &#39;CNLiveScioLive&#39; do
27 pod 'FMDB' 27 pod 'FMDB'
28 pod 'NJKWebViewProgress' 28 pod 'NJKWebViewProgress'
29 pod 'AvoidCrash', '~> 2.5.2' 29 pod 'AvoidCrash', '~> 2.5.2'
  30 + pod 'BaiduMobStatCodeless'
30 end 31 end
31 32