iOS Team / ScioLive · Commits

Commit 62b547b18f9191e200ba889ccb42aa680766127d

Authored by yanglingyu
1 parent a6317c41

国新之声锁屏bug解决，无用类库删除

Inline Side-by-side
Showing 55 changed files with 107 additions and 707 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
  View file @62b547b
... ... @@ -357,110 +357,6 @@
357 357 0886E32B2179A8BD00C777A3 /* aboutEN.html in Resources */ = {isa = PBXBuildFile; fileRef = 0886E32A2179A8BD00C777A3 /* aboutEN.html */; };
358 358 0886E32C2179A8BD00C777A3 /* aboutEN.html in Resources */ = {isa = PBXBuildFile; fileRef = 0886E32A2179A8BD00C777A3 /* aboutEN.html */; };
359 359 0886E32D2179A8BD00C777A3 /* aboutEN.html in Resources */ = {isa = PBXBuildFile; fileRef = 0886E32A2179A8BD00C777A3 /* aboutEN.html */; };
360   - 0886E3532179AE0B00C777A3 /* arscan_back@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3302179AE0B00C777A3 /* arscan_back@3x.png */; };
361   - 0886E3542179AE0B00C777A3 /* arscan_back@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3302179AE0B00C777A3 /* arscan_back@3x.png */; };
362   - 0886E3552179AE0B00C777A3 /* arscan_back@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3302179AE0B00C777A3 /* arscan_back@3x.png */; };
363   - 0886E3562179AE0B00C777A3 /* Thumbs.db in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3312179AE0B00C777A3 /* Thumbs.db */; };
364   - 0886E3572179AE0B00C777A3 /* Thumbs.db in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3312179AE0B00C777A3 /* Thumbs.db */; };
365   - 0886E3582179AE0B00C777A3 /* Thumbs.db in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3312179AE0B00C777A3 /* Thumbs.db */; };
366   - 0886E3592179AE0B00C777A3 /* arscan_flip@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3322179AE0B00C777A3 /* arscan_flip@2x.png */; };
367   - 0886E35A2179AE0B00C777A3 /* arscan_flip@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3322179AE0B00C777A3 /* arscan_flip@2x.png */; };
368   - 0886E35B2179AE0B00C777A3 /* arscan_flip@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3322179AE0B00C777A3 /* arscan_flip@2x.png */; };
369   - 0886E35C2179AE0B00C777A3 /* arscan_lock@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3332179AE0B00C777A3 /* arscan_lock@3x.png */; };
370   - 0886E35D2179AE0B00C777A3 /* arscan_lock@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3332179AE0B00C777A3 /* arscan_lock@3x.png */; };
371   - 0886E35E2179AE0B00C777A3 /* arscan_lock@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3332179AE0B00C777A3 /* arscan_lock@3x.png */; };
372   - 0886E35F2179AE0B00C777A3 /* arscan_lock@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3342179AE0B00C777A3 /* arscan_lock@2x.png */; };
373   - 0886E3602179AE0B00C777A3 /* arscan_lock@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3342179AE0B00C777A3 /* arscan_lock@2x.png */; };
374   - 0886E3612179AE0B00C777A3 /* arscan_lock@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3342179AE0B00C777A3 /* arscan_lock@2x.png */; };
375   - 0886E3622179AE0B00C777A3 /* arscan_flip@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3352179AE0B00C777A3 /* arscan_flip@3x.png */; };
376   - 0886E3632179AE0B00C777A3 /* arscan_flip@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3352179AE0B00C777A3 /* arscan_flip@3x.png */; };
377   - 0886E3642179AE0B00C777A3 /* arscan_flip@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3352179AE0B00C777A3 /* arscan_flip@3x.png */; };
378   - 0886E3652179AE0B00C777A3 /* arscan_back@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3362179AE0B00C777A3 /* arscan_back@2x.png */; };
379   - 0886E3662179AE0B00C777A3 /* arscan_back@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3362179AE0B00C777A3 /* arscan_back@2x.png */; };
380   - 0886E3672179AE0B00C777A3 /* arscan_back@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3362179AE0B00C777A3 /* arscan_back@2x.png */; };
381   - 0886E3682179AE0B00C777A3 /* arscan_unlock@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3372179AE0B00C777A3 /* arscan_unlock@2x.png */; };
382   - 0886E3692179AE0B00C777A3 /* arscan_unlock@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3372179AE0B00C777A3 /* arscan_unlock@2x.png */; };
383   - 0886E36A2179AE0B00C777A3 /* arscan_unlock@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3372179AE0B00C777A3 /* arscan_unlock@2x.png */; };
384   - 0886E36B2179AE0B00C777A3 /* arscan_unlock@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3382179AE0B00C777A3 /* arscan_unlock@3x.png */; };
385   - 0886E36C2179AE0B00C777A3 /* arscan_unlock@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3382179AE0B00C777A3 /* arscan_unlock@3x.png */; };
386   - 0886E36D2179AE0B00C777A3 /* arscan_unlock@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3382179AE0B00C777A3 /* arscan_unlock@3x.png */; };
387   - 0886E36E2179AE0B00C777A3 /* loader_spinner0013.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33A2179AE0B00C777A3 /* loader_spinner0013.png */; };
388   - 0886E36F2179AE0B00C777A3 /* loader_spinner0013.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33A2179AE0B00C777A3 /* loader_spinner0013.png */; };
389   - 0886E3702179AE0B00C777A3 /* loader_spinner0013.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33A2179AE0B00C777A3 /* loader_spinner0013.png */; };
390   - 0886E3712179AE0B00C777A3 /* loader_spinner0007.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33B2179AE0B00C777A3 /* loader_spinner0007.png */; };
391   - 0886E3722179AE0B00C777A3 /* loader_spinner0007.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33B2179AE0B00C777A3 /* loader_spinner0007.png */; };
392   - 0886E3732179AE0B00C777A3 /* loader_spinner0007.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33B2179AE0B00C777A3 /* loader_spinner0007.png */; };
393   - 0886E3742179AE0B00C777A3 /* loader_spinner0006.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33C2179AE0B00C777A3 /* loader_spinner0006.png */; };
394   - 0886E3752179AE0B00C777A3 /* loader_spinner0006.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33C2179AE0B00C777A3 /* loader_spinner0006.png */; };
395   - 0886E3762179AE0B00C777A3 /* loader_spinner0006.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33C2179AE0B00C777A3 /* loader_spinner0006.png */; };
396   - 0886E3772179AE0B00C777A3 /* loader_spinner0012.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33D2179AE0B00C777A3 /* loader_spinner0012.png */; };
397   - 0886E3782179AE0B00C777A3 /* loader_spinner0012.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33D2179AE0B00C777A3 /* loader_spinner0012.png */; };
398   - 0886E3792179AE0B00C777A3 /* loader_spinner0012.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33D2179AE0B00C777A3 /* loader_spinner0012.png */; };
399   - 0886E37A2179AE0B00C777A3 /* loader_spinner0004.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33E2179AE0B00C777A3 /* loader_spinner0004.png */; };
400   - 0886E37B2179AE0B00C777A3 /* loader_spinner0004.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33E2179AE0B00C777A3 /* loader_spinner0004.png */; };
401   - 0886E37C2179AE0B00C777A3 /* loader_spinner0004.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33E2179AE0B00C777A3 /* loader_spinner0004.png */; };
402   - 0886E37D2179AE0B00C777A3 /* loader_spinner0010.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33F2179AE0B00C777A3 /* loader_spinner0010.png */; };
403   - 0886E37E2179AE0B00C777A3 /* loader_spinner0010.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33F2179AE0B00C777A3 /* loader_spinner0010.png */; };
404   - 0886E37F2179AE0B00C777A3 /* loader_spinner0010.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E33F2179AE0B00C777A3 /* loader_spinner0010.png */; };
405   - 0886E3802179AE0B00C777A3 /* loader_spinner0011.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3402179AE0B00C777A3 /* loader_spinner0011.png */; };
406   - 0886E3812179AE0B00C777A3 /* loader_spinner0011.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3402179AE0B00C777A3 /* loader_spinner0011.png */; };
407   - 0886E3822179AE0B00C777A3 /* loader_spinner0011.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3402179AE0B00C777A3 /* loader_spinner0011.png */; };
408   - 0886E3832179AE0B00C777A3 /* loader_spinner0005.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3412179AE0B00C777A3 /* loader_spinner0005.png */; };
409   - 0886E3842179AE0B00C777A3 /* loader_spinner0005.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3412179AE0B00C777A3 /* loader_spinner0005.png */; };
410   - 0886E3852179AE0B00C777A3 /* loader_spinner0005.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3412179AE0B00C777A3 /* loader_spinner0005.png */; };
411   - 0886E3862179AE0B00C777A3 /* loader_spinner0001.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3422179AE0B00C777A3 /* loader_spinner0001.png */; };
412   - 0886E3872179AE0B00C777A3 /* loader_spinner0001.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3422179AE0B00C777A3 /* loader_spinner0001.png */; };
413   - 0886E3882179AE0B00C777A3 /* loader_spinner0001.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3422179AE0B00C777A3 /* loader_spinner0001.png */; };
414   - 0886E3892179AE0B00C777A3 /* loader_spinner0015.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3432179AE0B00C777A3 /* loader_spinner0015.png */; };
415   - 0886E38A2179AE0B00C777A3 /* loader_spinner0015.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3432179AE0B00C777A3 /* loader_spinner0015.png */; };
416   - 0886E38B2179AE0B00C777A3 /* loader_spinner0015.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3432179AE0B00C777A3 /* loader_spinner0015.png */; };
417   - 0886E38C2179AE0B00C777A3 /* loader_spinner0014.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3442179AE0B00C777A3 /* loader_spinner0014.png */; };
418   - 0886E38D2179AE0B00C777A3 /* loader_spinner0014.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3442179AE0B00C777A3 /* loader_spinner0014.png */; };
419   - 0886E38E2179AE0B00C777A3 /* loader_spinner0014.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3442179AE0B00C777A3 /* loader_spinner0014.png */; };
420   - 0886E38F2179AE0B00C777A3 /* loader_spinner0000.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3452179AE0B00C777A3 /* loader_spinner0000.png */; };
421   - 0886E3902179AE0B00C777A3 /* loader_spinner0000.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3452179AE0B00C777A3 /* loader_spinner0000.png */; };
422   - 0886E3912179AE0B00C777A3 /* loader_spinner0000.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3452179AE0B00C777A3 /* loader_spinner0000.png */; };
423   - 0886E3922179AE0B00C777A3 /* loader_spinner0016.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3462179AE0B00C777A3 /* loader_spinner0016.png */; };
424   - 0886E3932179AE0B00C777A3 /* loader_spinner0016.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3462179AE0B00C777A3 /* loader_spinner0016.png */; };
425   - 0886E3942179AE0B00C777A3 /* loader_spinner0016.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3462179AE0B00C777A3 /* loader_spinner0016.png */; };
426   - 0886E3952179AE0B00C777A3 /* loader_spinner0002.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3472179AE0B00C777A3 /* loader_spinner0002.png */; };
427   - 0886E3962179AE0B00C777A3 /* loader_spinner0002.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3472179AE0B00C777A3 /* loader_spinner0002.png */; };
428   - 0886E3972179AE0B00C777A3 /* loader_spinner0002.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3472179AE0B00C777A3 /* loader_spinner0002.png */; };
429   - 0886E3982179AE0B00C777A3 /* loader_spinner0003.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3482179AE0B00C777A3 /* loader_spinner0003.png */; };
430   - 0886E3992179AE0B00C777A3 /* loader_spinner0003.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3482179AE0B00C777A3 /* loader_spinner0003.png */; };
431   - 0886E39A2179AE0B00C777A3 /* loader_spinner0003.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3482179AE0B00C777A3 /* loader_spinner0003.png */; };
432   - 0886E39B2179AE0B00C777A3 /* loader_spinner0017.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3492179AE0B00C777A3 /* loader_spinner0017.png */; };
433   - 0886E39C2179AE0B00C777A3 /* loader_spinner0017.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3492179AE0B00C777A3 /* loader_spinner0017.png */; };
434   - 0886E39D2179AE0B00C777A3 /* loader_spinner0017.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3492179AE0B00C777A3 /* loader_spinner0017.png */; };
435   - 0886E39E2179AE0B00C777A3 /* loader_spinner0019.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34A2179AE0B00C777A3 /* loader_spinner0019.png */; };
436   - 0886E39F2179AE0B00C777A3 /* loader_spinner0019.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34A2179AE0B00C777A3 /* loader_spinner0019.png */; };
437   - 0886E3A02179AE0B00C777A3 /* loader_spinner0019.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34A2179AE0B00C777A3 /* loader_spinner0019.png */; };
438   - 0886E3A12179AE0B00C777A3 /* loader_spinner0018.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34B2179AE0B00C777A3 /* loader_spinner0018.png */; };
439   - 0886E3A22179AE0B00C777A3 /* loader_spinner0018.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34B2179AE0B00C777A3 /* loader_spinner0018.png */; };
440   - 0886E3A32179AE0B00C777A3 /* loader_spinner0018.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34B2179AE0B00C777A3 /* loader_spinner0018.png */; };
441   - 0886E3A42179AE0B00C777A3 /* loader_spinner0008.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34C2179AE0B00C777A3 /* loader_spinner0008.png */; };
442   - 0886E3A52179AE0B00C777A3 /* loader_spinner0008.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34C2179AE0B00C777A3 /* loader_spinner0008.png */; };
443   - 0886E3A62179AE0B00C777A3 /* loader_spinner0008.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34C2179AE0B00C777A3 /* loader_spinner0008.png */; };
444   - 0886E3A72179AE0B00C777A3 /* loader_spinner0020.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34D2179AE0B00C777A3 /* loader_spinner0020.png */; };
445   - 0886E3A82179AE0B00C777A3 /* loader_spinner0020.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34D2179AE0B00C777A3 /* loader_spinner0020.png */; };
446   - 0886E3A92179AE0B00C777A3 /* loader_spinner0020.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34D2179AE0B00C777A3 /* loader_spinner0020.png */; };
447   - 0886E3AA2179AE0B00C777A3 /* loader_spinner0021.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34E2179AE0B00C777A3 /* loader_spinner0021.png */; };
448   - 0886E3AB2179AE0B00C777A3 /* loader_spinner0021.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34E2179AE0B00C777A3 /* loader_spinner0021.png */; };
449   - 0886E3AC2179AE0B00C777A3 /* loader_spinner0021.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34E2179AE0B00C777A3 /* loader_spinner0021.png */; };
450   - 0886E3AD2179AE0B00C777A3 /* loader_spinner0009.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34F2179AE0B00C777A3 /* loader_spinner0009.png */; };
451   - 0886E3AE2179AE0B00C777A3 /* loader_spinner0009.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34F2179AE0B00C777A3 /* loader_spinner0009.png */; };
452   - 0886E3AF2179AE0B00C777A3 /* loader_spinner0009.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E34F2179AE0B00C777A3 /* loader_spinner0009.png */; };
453   - 0886E3B02179AE0B00C777A3 /* loader_spinner0023.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3502179AE0B00C777A3 /* loader_spinner0023.png */; };
454   - 0886E3B12179AE0B00C777A3 /* loader_spinner0023.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3502179AE0B00C777A3 /* loader_spinner0023.png */; };
455   - 0886E3B22179AE0B00C777A3 /* loader_spinner0023.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3502179AE0B00C777A3 /* loader_spinner0023.png */; };
456   - 0886E3B32179AE0B00C777A3 /* loader_spinner0022.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3512179AE0B00C777A3 /* loader_spinner0022.png */; };
457   - 0886E3B42179AE0B00C777A3 /* loader_spinner0022.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3512179AE0B00C777A3 /* loader_spinner0022.png */; };
458   - 0886E3B52179AE0B00C777A3 /* loader_spinner0022.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3512179AE0B00C777A3 /* loader_spinner0022.png */; };
459   - 0886E3B62179AE0B00C777A3 /* KJARLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0886E3522179AE0B00C777A3 /* KJARLib.framework */; };
460   - 0886E3B72179AE0B00C777A3 /* KJARLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0886E3522179AE0B00C777A3 /* KJARLib.framework */; };
461   - 0886E3B82179AE0B00C777A3 /* KJARLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0886E3522179AE0B00C777A3 /* KJARLib.framework */; };
462   - 0886E3B92179AF0000C777A3 /* KJARLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0886E3522179AE0B00C777A3 /* KJARLib.framework */; };
463   - 0886E3BA2179AF0000C777A3 /* KJARLib.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0886E3522179AE0B00C777A3 /* KJARLib.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
464 360 0886E3C02179D6E100C777A3 /* cnlive_zhouxin_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3BF2179D6E100C777A3 /* cnlive_zhouxin_icon.png */; };
465 361 0886E3C12179D6E100C777A3 /* cnlive_zhouxin_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3BF2179D6E100C777A3 /* cnlive_zhouxin_icon.png */; };
466 362 0886E3C22179D6E100C777A3 /* cnlive_zhouxin_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 0886E3BF2179D6E100C777A3 /* cnlive_zhouxin_icon.png */; };
... ... @@ -648,6 +544,7 @@
648 544 08C090C1215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C090BE215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m */; };
649 545 08C28A30263932960065B372 /* UIImageView+CNGrayImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C28A2D263932960065B372 /* UIImageView+CNGrayImage.m */; };
650 546 08C28A31263932960065B372 /* UIImage+CNGray.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C28A2F263932960065B372 /* UIImage+CNGray.m */; };
  547 + 08C4B06D26AFE9C800B69C2D /* CNLiveNetWorkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C4B06C26AFE9C800B69C2D /* CNLiveNetWorkManager.m */; };
651 548 08C721B924CAC9B700970100 /* SDCycleScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C721AD24CAC9B700970100 /* SDCycleScrollView.m */; };
652 549 08C721BA24CAC9B700970100 /* UIView+SDExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C721AE24CAC9B700970100 /* UIView+SDExtension.m */; };
653 550 08C721BB24CAC9B700970100 /* SDCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C721AF24CAC9B700970100 /* SDCollectionViewCell.m */; };
... ... @@ -722,7 +619,6 @@
722 619 dstPath = "";
723 620 dstSubfolderSpec = 10;
724 621 files = (
725   - 0886E3BA2179AF0000C777A3 /* KJARLib.framework in CopyFiles */,
726 622 );
727 623 runOnlyForDeploymentPostprocessing = 0;
728 624 };
... ... @@ -943,40 +839,6 @@
943 839 0870DACC215F1CE6008DC811 /* VideoPlayBackViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoPlayBackViewController.h; sourceTree = "<group>"; };
944 840 0870DACD215F1CE6008DC811 /* VideoPlayBackViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VideoPlayBackViewController.m; sourceTree = "<group>"; };
945 841 0886E32A2179A8BD00C777A3 /* aboutEN.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = aboutEN.html; sourceTree = "<group>"; };
946   - 0886E3302179AE0B00C777A3 /* arscan_back@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arscan_back@3x.png"; sourceTree = "<group>"; };
947   - 0886E3312179AE0B00C777A3 /* Thumbs.db */ = {isa = PBXFileReference; lastKnownFileType = file; path = Thumbs.db; sourceTree = "<group>"; };
948   - 0886E3322179AE0B00C777A3 /* arscan_flip@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arscan_flip@2x.png"; sourceTree = "<group>"; };
949   - 0886E3332179AE0B00C777A3 /* arscan_lock@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arscan_lock@3x.png"; sourceTree = "<group>"; };
950   - 0886E3342179AE0B00C777A3 /* arscan_lock@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arscan_lock@2x.png"; sourceTree = "<group>"; };
951   - 0886E3352179AE0B00C777A3 /* arscan_flip@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arscan_flip@3x.png"; sourceTree = "<group>"; };
952   - 0886E3362179AE0B00C777A3 /* arscan_back@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arscan_back@2x.png"; sourceTree = "<group>"; };
953   - 0886E3372179AE0B00C777A3 /* arscan_unlock@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arscan_unlock@2x.png"; sourceTree = "<group>"; };
954   - 0886E3382179AE0B00C777A3 /* arscan_unlock@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arscan_unlock@3x.png"; sourceTree = "<group>"; };
955   - 0886E33A2179AE0B00C777A3 /* loader_spinner0013.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0013.png; sourceTree = "<group>"; };
956   - 0886E33B2179AE0B00C777A3 /* loader_spinner0007.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0007.png; sourceTree = "<group>"; };
957   - 0886E33C2179AE0B00C777A3 /* loader_spinner0006.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0006.png; sourceTree = "<group>"; };
958   - 0886E33D2179AE0B00C777A3 /* loader_spinner0012.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0012.png; sourceTree = "<group>"; };
959   - 0886E33E2179AE0B00C777A3 /* loader_spinner0004.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0004.png; sourceTree = "<group>"; };
960   - 0886E33F2179AE0B00C777A3 /* loader_spinner0010.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0010.png; sourceTree = "<group>"; };
961   - 0886E3402179AE0B00C777A3 /* loader_spinner0011.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0011.png; sourceTree = "<group>"; };
962   - 0886E3412179AE0B00C777A3 /* loader_spinner0005.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0005.png; sourceTree = "<group>"; };
963   - 0886E3422179AE0B00C777A3 /* loader_spinner0001.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0001.png; sourceTree = "<group>"; };
964   - 0886E3432179AE0B00C777A3 /* loader_spinner0015.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0015.png; sourceTree = "<group>"; };
965   - 0886E3442179AE0B00C777A3 /* loader_spinner0014.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0014.png; sourceTree = "<group>"; };
966   - 0886E3452179AE0B00C777A3 /* loader_spinner0000.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0000.png; sourceTree = "<group>"; };
967   - 0886E3462179AE0B00C777A3 /* loader_spinner0016.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0016.png; sourceTree = "<group>"; };
968   - 0886E3472179AE0B00C777A3 /* loader_spinner0002.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0002.png; sourceTree = "<group>"; };
969   - 0886E3482179AE0B00C777A3 /* loader_spinner0003.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0003.png; sourceTree = "<group>"; };
970   - 0886E3492179AE0B00C777A3 /* loader_spinner0017.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0017.png; sourceTree = "<group>"; };
971   - 0886E34A2179AE0B00C777A3 /* loader_spinner0019.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0019.png; sourceTree = "<group>"; };
972   - 0886E34B2179AE0B00C777A3 /* loader_spinner0018.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0018.png; sourceTree = "<group>"; };
973   - 0886E34C2179AE0B00C777A3 /* loader_spinner0008.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0008.png; sourceTree = "<group>"; };
974   - 0886E34D2179AE0B00C777A3 /* loader_spinner0020.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0020.png; sourceTree = "<group>"; };
975   - 0886E34E2179AE0B00C777A3 /* loader_spinner0021.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0021.png; sourceTree = "<group>"; };
976   - 0886E34F2179AE0B00C777A3 /* loader_spinner0009.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0009.png; sourceTree = "<group>"; };
977   - 0886E3502179AE0B00C777A3 /* loader_spinner0023.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0023.png; sourceTree = "<group>"; };
978   - 0886E3512179AE0B00C777A3 /* loader_spinner0022.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loader_spinner0022.png; sourceTree = "<group>"; };
979   - 0886E3522179AE0B00C777A3 /* KJARLib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = KJARLib.framework; sourceTree = "<group>"; };
980 842 0886E3BF2179D6E100C777A3 /* cnlive_zhouxin_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cnlive_zhouxin_icon.png; sourceTree = "<group>"; };
981 843 0886E3C32179D99900C777A3 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
982 844 08940D732154EB2C00F85DB6 /* UILabel+TextAlign.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UILabel+TextAlign.h"; sourceTree = "<group>"; };
... ... @@ -1118,6 +980,8 @@
1118 980 08C28A2D263932960065B372 /* UIImageView+CNGrayImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImageView+CNGrayImage.m"; sourceTree = "<group>"; };
1119 981 08C28A2E263932960065B372 /* UIImageView+CNGrayImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImageView+CNGrayImage.h"; sourceTree = "<group>"; };
1120 982 08C28A2F263932960065B372 /* UIImage+CNGray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+CNGray.m"; sourceTree = "<group>"; };
  983 + 08C4B06B26AFE9C800B69C2D /* CNLiveNetWorkManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveNetWorkManager.h; sourceTree = "<group>"; };
  984 + 08C4B06C26AFE9C800B69C2D /* CNLiveNetWorkManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLiveNetWorkManager.m; sourceTree = "<group>"; };
1121 985 08C721AA24CAC9B700970100 /* UIView+SDExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+SDExtension.h"; sourceTree = "<group>"; };
1122 986 08C721AB24CAC9B700970100 /* SDCycleScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDCycleScrollView.h; sourceTree = "<group>"; };
1123 987 08C721AC24CAC9B700970100 /* SDCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDCollectionViewCell.h; sourceTree = "<group>"; };
... ... @@ -1176,14 +1040,12 @@
1176 1040 085D85F82159C6130037D480 /* libsqlite3.tbd in Frameworks */,
1177 1041 085D86AC2159D27A0037D480 /* UserNotifications.framework in Frameworks */,
1178 1042 085D86AA2159D2700037D480 /* CoreTelephony.framework in Frameworks */,
1179   - 0886E3B62179AE0B00C777A3 /* KJARLib.framework in Frameworks */,
1180 1043 085D86A52159CE6E0037D480 /* libz.1.2.5.tbd in Frameworks */,
1181 1044 085D86A32159CE500037D480 /* ImageIO.framework in Frameworks */,
1182 1045 085D86A12159CE3A0037D480 /* MobileCoreServices.framework in Frameworks */,
1183 1046 085D869F2159CE210037D480 /* MediaPlayer.framework in Frameworks */,
1184 1047 08B5C6242153B13200F5476E /* CoreMedia.framework in Frameworks */,
1185 1048 085D85EE2159BCB00037D480 /* UIKit.framework in Frameworks */,
1186   - 0886E3B92179AF0000C777A3 /* KJARLib.framework in Frameworks */,
1187 1049 085D85EC2159BCA90037D480 /* AVFoundation.framework in Frameworks */,
1188 1050 08B5C6222153B10D00F5476E /* QuartzCore.framework in Frameworks */,
1189 1051 08B5C6202153B0C800F5476E /* libiconv.tbd in Frameworks */,
... ... @@ -1199,7 +1061,6 @@
1199 1061 isa = PBXFrameworksBuildPhase;
1200 1062 buildActionMask = 2147483647;
1201 1063 files = (
1202   - 0886E3B72179AE0B00C777A3 /* KJARLib.framework in Frameworks */,
1203 1064 );
1204 1065 runOnlyForDeploymentPostprocessing = 0;
1205 1066 };
... ... @@ -1207,7 +1068,6 @@
1207 1068 isa = PBXFrameworksBuildPhase;
1208 1069 buildActionMask = 2147483647;
1209 1070 files = (
1210   - 0886E3B82179AE0B00C777A3 /* KJARLib.framework in Frameworks */,
1211 1071 );
1212 1072 runOnlyForDeploymentPostprocessing = 0;
1213 1073 };
... ... @@ -1572,63 +1432,6 @@
1572 1432 path = View;
1573 1433 sourceTree = "<group>";
1574 1434 };
1575   - 0886E32E2179AE0B00C777A3 /* KJARLib */ = {
1576   - isa = PBXGroup;
1577   - children = (
1578   - 0886E32F2179AE0B00C777A3 /* 资源文件 */,
1579   - 0886E3522179AE0B00C777A3 /* KJARLib.framework */,
1580   - );
1581   - path = KJARLib;
1582   - sourceTree = "<group>";
1583   - };
1584   - 0886E32F2179AE0B00C777A3 /* 资源文件 */ = {
1585   - isa = PBXGroup;
1586   - children = (
1587   - 0886E3302179AE0B00C777A3 /* arscan_back@3x.png */,
1588   - 0886E3312179AE0B00C777A3 /* Thumbs.db */,
1589   - 0886E3322179AE0B00C777A3 /* arscan_flip@2x.png */,
1590   - 0886E3332179AE0B00C777A3 /* arscan_lock@3x.png */,
1591   - 0886E3342179AE0B00C777A3 /* arscan_lock@2x.png */,
1592   - 0886E3352179AE0B00C777A3 /* arscan_flip@3x.png */,
1593   - 0886E3362179AE0B00C777A3 /* arscan_back@2x.png */,
1594   - 0886E3372179AE0B00C777A3 /* arscan_unlock@2x.png */,
1595   - 0886E3382179AE0B00C777A3 /* arscan_unlock@3x.png */,
1596   - 0886E3392179AE0B00C777A3 /* animation1 */,
1597   - );
1598   - path = "资源文件";
1599   - sourceTree = "<group>";
1600   - };
1601   - 0886E3392179AE0B00C777A3 /* animation1 */ = {
1602   - isa = PBXGroup;
1603   - children = (
1604   - 0886E33A2179AE0B00C777A3 /* loader_spinner0013.png */,
1605   - 0886E33B2179AE0B00C777A3 /* loader_spinner0007.png */,
1606   - 0886E33C2179AE0B00C777A3 /* loader_spinner0006.png */,
1607   - 0886E33D2179AE0B00C777A3 /* loader_spinner0012.png */,
1608   - 0886E33E2179AE0B00C777A3 /* loader_spinner0004.png */,
1609   - 0886E33F2179AE0B00C777A3 /* loader_spinner0010.png */,
1610   - 0886E3402179AE0B00C777A3 /* loader_spinner0011.png */,
1611   - 0886E3412179AE0B00C777A3 /* loader_spinner0005.png */,
1612   - 0886E3422179AE0B00C777A3 /* loader_spinner0001.png */,
1613   - 0886E3432179AE0B00C777A3 /* loader_spinner0015.png */,
1614   - 0886E3442179AE0B00C777A3 /* loader_spinner0014.png */,
1615   - 0886E3452179AE0B00C777A3 /* loader_spinner0000.png */,
1616   - 0886E3462179AE0B00C777A3 /* loader_spinner0016.png */,
1617   - 0886E3472179AE0B00C777A3 /* loader_spinner0002.png */,
1618   - 0886E3482179AE0B00C777A3 /* loader_spinner0003.png */,
1619   - 0886E3492179AE0B00C777A3 /* loader_spinner0017.png */,
1620   - 0886E34A2179AE0B00C777A3 /* loader_spinner0019.png */,
1621   - 0886E34B2179AE0B00C777A3 /* loader_spinner0018.png */,
1622   - 0886E34C2179AE0B00C777A3 /* loader_spinner0008.png */,
1623   - 0886E34D2179AE0B00C777A3 /* loader_spinner0020.png */,
1624   - 0886E34E2179AE0B00C777A3 /* loader_spinner0021.png */,
1625   - 0886E34F2179AE0B00C777A3 /* loader_spinner0009.png */,
1626   - 0886E3502179AE0B00C777A3 /* loader_spinner0023.png */,
1627   - 0886E3512179AE0B00C777A3 /* loader_spinner0022.png */,
1628   - );
1629   - path = animation1;
1630   - sourceTree = "<group>";
1631   - };
1632 1435 08940D782154F04A00F85DB6 /* 新闻详情 */ = {
1633 1436 isa = PBXGroup;
1634 1437 children = (
... ... @@ -1827,6 +1630,7 @@
1827 1630 08C08FCF214FA01B00E23D16 /* Tools */ = {
1828 1631 isa = PBXGroup;
1829 1632 children = (
  1633 + 08C4B06A26AFE98A00B69C2D /* LoadImageRequest */,
1830 1634 08C28A2B263932650065B372 /* ImageGray */,
1831 1635 0802446A262425DB00BD68E8 /* DeviceUUID */,
1832 1636 08C721A924CAC9B700970100 /* SDCycleScrollView */,
... ... @@ -1850,7 +1654,6 @@
1850 1654 08C08FD0214FA01B00E23D16 /* SDK */ = {
1851 1655 isa = PBXGroup;
1852 1656 children = (
1853   - 0886E32E2179AE0B00C777A3 /* KJARLib */,
1854 1657 0838485A215CAB1C00186618 /* Html5Utils */,
1855 1658 085D85EF2159C0790037D480 /* Reachability */,
1856 1659 08C08FF5214FAFD400E23D16 /* XLSlideMenu */,
... ... @@ -2249,6 +2052,15 @@
2249 2052 path = ImageGray;
2250 2053 sourceTree = "<group>";
2251 2054 };
  2055 + 08C4B06A26AFE98A00B69C2D /* LoadImageRequest */ = {
  2056 + isa = PBXGroup;
  2057 + children = (
  2058 + 08C4B06B26AFE9C800B69C2D /* CNLiveNetWorkManager.h */,
  2059 + 08C4B06C26AFE9C800B69C2D /* CNLiveNetWorkManager.m */,
  2060 + );
  2061 + path = LoadImageRequest;
  2062 + sourceTree = "<group>";
  2063 + };
2252 2064 08C721A924CAC9B700970100 /* SDCycleScrollView */ = {
2253 2065 isa = PBXGroup;
2254 2066 children = (
... ... @@ -2546,76 +2358,43 @@
2546 2358 isa = PBXResourcesBuildPhase;
2547 2359 buildActionMask = 2147483647;
2548 2360 files = (
2549   - 0886E3B32179AE0B00C777A3 /* loader_spinner0022.png in Resources */,
2550   - 0886E37A2179AE0B00C777A3 /* loader_spinner0004.png in Resources */,
2551 2361 085D86802159C72F0037D480 /* kr-video-player-pause@3x.png in Resources */,
2552 2362 08B5C6522153C78800F5476E /* about.html in Resources */,
2553 2363 085D86712159C72F0037D480 /* zx-video-player-volumeMute@2x.png in Resources */,
2554 2364 08C0902421508F5500E23D16 /* Localizable.strings in Resources */,
2555 2365 085D86442159C72F0037D480 /* kr-video-player-play@2x.png in Resources */,
2556   - 0886E3A42179AE0B00C777A3 /* loader_spinner0008.png in Resources */,
2557   - 0886E3712179AE0B00C777A3 /* loader_spinner0007.png in Resources */,
2558 2366 085D86532159C72F0037D480 /* zx-video-player-volume@3x.png in Resources */,
2559 2367 085D86892159C72F0037D480 /* zx-video-player-unlock@2x.png in Resources */,
2560 2368 085D865C2159C72F0037D480 /* zx-video-player-fastForward@3x.png in Resources */,
2561   - 0886E3532179AE0B00C777A3 /* arscan_back@3x.png in Resources */,
2562   - 0886E3622179AE0B00C777A3 /* arscan_flip@3x.png in Resources */,
2563   - 0886E36B2179AE0B00C777A3 /* arscan_unlock@3x.png in Resources */,
2564 2369 0886E32B2179A8BD00C777A3 /* aboutEN.html in Resources */,
2565   - 0886E3982179AE0B00C777A3 /* loader_spinner0003.png in Resources */,
2566   - 0886E3B02179AE0B00C777A3 /* loader_spinner0023.png in Resources */,
2567 2370 085D867D2159C72F0037D480 /* zx-video-player-unlock@3x.png in Resources */,
2568   - 0886E3742179AE0B00C777A3 /* loader_spinner0006.png in Resources */,
2569 2371 085D864A2159C72F0037D480 /* zx-video-player-rewind@3x.png in Resources */,
2570 2372 085D86472159C72F0037D480 /* kr-video-player-close@3x.png in Resources */,
2571 2373 08585D7D215B4C7200FC2CA2 /* PGDatePicker.bundle in Resources */,
2572   - 0886E36E2179AE0B00C777A3 /* loader_spinner0013.png in Resources */,
2573 2374 085D86832159C72F0037D480 /* kr-video-player-fullscreen@3x.png in Resources */,
2574   - 0886E37D2179AE0B00C777A3 /* loader_spinner0010.png in Resources */,
2575   - 0886E3652179AE0B00C777A3 /* arscan_back@2x.png in Resources */,
2576 2375 085D867A2159C72F0037D480 /* zx-video-banner-back.png in Resources */,
2577   - 0886E39B2179AE0B00C777A3 /* loader_spinner0017.png in Resources */,
2578 2376 085D86772159C72F0037D480 /* zx-video-player-lock@3x.png in Resources */,
2579 2377 085D86622159C72F0037D480 /* kr-video-player-shrinkscreen@2x.png in Resources */,
2580 2378 085D868C2159C72F0037D480 /* kr-video-player-pause@2x.png in Resources */,
2581 2379 085D86742159C72F0037D480 /* zx-video-player-volumeMute@3x.png in Resources */,
2582   - 0886E3952179AE0B00C777A3 /* loader_spinner0002.png in Resources */,
2583   - 0886E3A72179AE0B00C777A3 /* loader_spinner0020.png in Resources */,
2584   - 0886E3AA2179AE0B00C777A3 /* loader_spinner0021.png in Resources */,
2585 2380 085D86862159C72F0037D480 /* kr-video-player-fullscreen@2x.png in Resources */,
2586 2381 08384842215C83E700186618 /* MainTabbarItemEN.plist in Resources */,
2587   - 0886E3922179AE0B00C777A3 /* loader_spinner0016.png in Resources */,
2588 2382 0886E3C02179D6E100C777A3 /* cnlive_zhouxin_icon.png in Resources */,
2589   - 0886E38F2179AE0B00C777A3 /* loader_spinner0000.png in Resources */,
2590 2383 085D86412159C72F0037D480 /* kr-video-player-play@3x.png in Resources */,
2591 2384 08C0907F2150C79C00E23D16 /* upIcon.png in Resources */,
2592   - 0886E3892179AE0B00C777A3 /* loader_spinner0015.png in Resources */,
2593 2385 08C08F7B214F997F00E23D16 /* Assets.xcassets in Resources */,
2594   - 0886E38C2179AE0B00C777A3 /* loader_spinner0014.png in Resources */,
2595 2386 085D86562159C72F0037D480 /* zx-video-player-brightness@2x.png in Resources */,
2596   - 0886E3802179AE0B00C777A3 /* loader_spinner0011.png in Resources */,
2597   - 0886E3862179AE0B00C777A3 /* loader_spinner0001.png in Resources */,
2598 2387 085D864D2159C72F0037D480 /* zx-video-banner-back@2x.png in Resources */,
2599 2388 085D86592159C72F0037D480 /* kr-video-player-shrinkscreen@3x.png in Resources */,
2600   - 0886E3562179AE0B00C777A3 /* Thumbs.db in Resources */,
2601   - 0886E3592179AE0B00C777A3 /* arscan_flip@2x.png in Resources */,
2602 2389 085D86682159C72F0037D480 /* zx-video-player-volume@2x.png in Resources */,
2603   - 0886E3772179AE0B00C777A3 /* loader_spinner0012.png in Resources */,
2604 2390 085D863E2159C72F0037D480 /* kr-video-player-close@2x.png in Resources */,
2605 2391 08C090122150855000E23D16 /* MainTabbarItem.plist in Resources */,
2606 2392 085D865F2159C72F0037D480 /* zx-video-player-fastForward@2x.png in Resources */,
2607 2393 085D86652159C72F0037D480 /* zx-video-player-brightness@3x.png in Resources */,
2608 2394 085D866B2159C72F0037D480 /* kr-video-player-point@2x.png in Resources */,
2609 2395 085D86502159C72F0037D480 /* kr-video-player-point@3x.png in Resources */,
2610   - 0886E35C2179AE0B00C777A3 /* arscan_lock@3x.png in Resources */,
2611   - 0886E3A12179AE0B00C777A3 /* loader_spinner0018.png in Resources */,
2612   - 0886E35F2179AE0B00C777A3 /* arscan_lock@2x.png in Resources */,
2613 2396 085D866E2159C72F0037D480 /* zx-video-player-lock@2x.png in Resources */,
2614   - 0886E3682179AE0B00C777A3 /* arscan_unlock@2x.png in Resources */,
2615   - 0886E3832179AE0B00C777A3 /* loader_spinner0005.png in Resources */,
2616 2397 085D863B2159C72F0037D480 /* zx-video-player-rewind@2x.png in Resources */,
2617   - 0886E39E2179AE0B00C777A3 /* loader_spinner0019.png in Resources */,
2618   - 0886E3AD2179AE0B00C777A3 /* loader_spinner0009.png in Resources */,
2619 2398 );
2620 2399 runOnlyForDeploymentPostprocessing = 0;
2621 2400 };
... ... @@ -2623,75 +2402,42 @@
2623 2402 isa = PBXResourcesBuildPhase;
2624 2403 buildActionMask = 2147483647;
2625 2404 files = (
2626   - 0886E35D2179AE0B00C777A3 /* arscan_lock@3x.png in Resources */,
2627   - 0886E3992179AE0B00C777A3 /* loader_spinner0003.png in Resources */,
2628   - 0886E3572179AE0B00C777A3 /* Thumbs.db in Resources */,
2629   - 0886E36F2179AE0B00C777A3 /* loader_spinner0013.png in Resources */,
2630 2405 085D866F2159C72F0037D480 /* zx-video-player-lock@2x.png in Resources */,
2631 2406 085D86482159C72F0037D480 /* kr-video-player-close@3x.png in Resources */,
2632   - 0886E37B2179AE0B00C777A3 /* loader_spinner0004.png in Resources */,
2633   - 0886E3842179AE0B00C777A3 /* loader_spinner0005.png in Resources */,
2634 2407 085D86872159C72F0037D480 /* kr-video-player-fullscreen@2x.png in Resources */,
2635 2408 085D868D2159C72F0037D480 /* kr-video-player-pause@2x.png in Resources */,
2636 2409 085D868A2159C72F0037D480 /* zx-video-player-unlock@2x.png in Resources */,
2637 2410 085D86602159C72F0037D480 /* zx-video-player-fastForward@2x.png in Resources */,
2638 2411 085D86752159C72F0037D480 /* zx-video-player-volumeMute@3x.png in Resources */,
2639   - 0886E3632179AE0B00C777A3 /* arscan_flip@3x.png in Resources */,
2640 2412 085D86812159C72F0037D480 /* kr-video-player-pause@3x.png in Resources */,
2641 2413 085D863C2159C72F0037D480 /* zx-video-player-rewind@2x.png in Resources */,
2642   - 0886E3902179AE0B00C777A3 /* loader_spinner0000.png in Resources */,
2643 2414 08C090132150855000E23D16 /* MainTabbarItem.plist in Resources */,
2644   - 0886E3692179AE0B00C777A3 /* arscan_unlock@2x.png in Resources */,
2645   - 0886E3722179AE0B00C777A3 /* loader_spinner0007.png in Resources */,
2646   - 0886E3B12179AE0B00C777A3 /* loader_spinner0023.png in Resources */,
2647 2415 085D86632159C72F0037D480 /* kr-video-player-shrinkscreen@2x.png in Resources */,
2648   - 0886E3752179AE0B00C777A3 /* loader_spinner0006.png in Resources */,
2649 2416 085D866C2159C72F0037D480 /* kr-video-player-point@2x.png in Resources */,
2650 2417 085D867B2159C72F0037D480 /* zx-video-banner-back.png in Resources */,
2651 2418 085D86842159C72F0037D480 /* kr-video-player-fullscreen@3x.png in Resources */,
2652 2419 085D864E2159C72F0037D480 /* zx-video-banner-back@2x.png in Resources */,
2653 2420 085D86512159C72F0037D480 /* kr-video-player-point@3x.png in Resources */,
2654 2421 085D86662159C72F0037D480 /* zx-video-player-brightness@3x.png in Resources */,
2655   - 0886E3812179AE0B00C777A3 /* loader_spinner0011.png in Resources */,
2656   - 0886E3962179AE0B00C777A3 /* loader_spinner0002.png in Resources */,
2657   - 0886E38A2179AE0B00C777A3 /* loader_spinner0015.png in Resources */,
2658 2422 085D86722159C72F0037D480 /* zx-video-player-volumeMute@2x.png in Resources */,
2659   - 0886E3872179AE0B00C777A3 /* loader_spinner0001.png in Resources */,
2660 2423 0886E32C2179A8BD00C777A3 /* aboutEN.html in Resources */,
2661   - 0886E37E2179AE0B00C777A3 /* loader_spinner0010.png in Resources */,
2662   - 0886E3A52179AE0B00C777A3 /* loader_spinner0008.png in Resources */,
2663   - 0886E38D2179AE0B00C777A3 /* loader_spinner0014.png in Resources */,
2664 2424 08C090802150C79C00E23D16 /* upIcon.png in Resources */,
2665 2425 085D865D2159C72F0037D480 /* zx-video-player-fastForward@3x.png in Resources */,
2666   - 0886E3932179AE0B00C777A3 /* loader_spinner0016.png in Resources */,
2667 2426 08585D7E215B4C7200FC2CA2 /* PGDatePicker.bundle in Resources */,
2668   - 0886E3B42179AE0B00C777A3 /* loader_spinner0022.png in Resources */,
2669   - 0886E3662179AE0B00C777A3 /* arscan_back@2x.png in Resources */,
2670   - 0886E3A22179AE0B00C777A3 /* loader_spinner0018.png in Resources */,
2671 2427 085D86572159C72F0037D480 /* zx-video-player-brightness@2x.png in Resources */,
2672 2428 0886E3C12179D6E100C777A3 /* cnlive_zhouxin_icon.png in Resources */,
2673 2429 085D865A2159C72F0037D480 /* kr-video-player-shrinkscreen@3x.png in Resources */,
2674   - 0886E3782179AE0B00C777A3 /* loader_spinner0012.png in Resources */,
2675 2430 08B5C6532153C78800F5476E /* about.html in Resources */,
2676 2431 085D86452159C72F0037D480 /* kr-video-player-play@2x.png in Resources */,
2677   - 0886E3AB2179AE0B00C777A3 /* loader_spinner0021.png in Resources */,
2678 2432 085D863F2159C72F0037D480 /* kr-video-player-close@2x.png in Resources */,
2679   - 0886E3542179AE0B00C777A3 /* arscan_back@3x.png in Resources */,
2680 2433 085D86542159C72F0037D480 /* zx-video-player-volume@3x.png in Resources */,
2681 2434 085D86782159C72F0037D480 /* zx-video-player-lock@3x.png in Resources */,
2682 2435 08C0902521508F5500E23D16 /* Localizable.strings in Resources */,
2683   - 0886E36C2179AE0B00C777A3 /* arscan_unlock@3x.png in Resources */,
2684 2436 08384843215C83E700186618 /* MainTabbarItemEN.plist in Resources */,
2685 2437 085D867E2159C72F0037D480 /* zx-video-player-unlock@3x.png in Resources */,
2686 2438 085D86692159C72F0037D480 /* zx-video-player-volume@2x.png in Resources */,
2687   - 0886E39C2179AE0B00C777A3 /* loader_spinner0017.png in Resources */,
2688   - 0886E3602179AE0B00C777A3 /* arscan_lock@2x.png in Resources */,
2689 2439 085D864B2159C72F0037D480 /* zx-video-player-rewind@3x.png in Resources */,
2690 2440 085D86422159C72F0037D480 /* kr-video-player-play@3x.png in Resources */,
2691   - 0886E39F2179AE0B00C777A3 /* loader_spinner0019.png in Resources */,
2692   - 0886E3A82179AE0B00C777A3 /* loader_spinner0020.png in Resources */,
2693   - 0886E3AE2179AE0B00C777A3 /* loader_spinner0009.png in Resources */,
2694   - 0886E35A2179AE0B00C777A3 /* arscan_flip@2x.png in Resources */,
2695 2441 );
2696 2442 runOnlyForDeploymentPostprocessing = 0;
2697 2443 };
... ... @@ -2699,75 +2445,42 @@
2699 2445 isa = PBXResourcesBuildPhase;
2700 2446 buildActionMask = 2147483647;
2701 2447 files = (
2702   - 0886E35E2179AE0B00C777A3 /* arscan_lock@3x.png in Resources */,
2703   - 0886E39A2179AE0B00C777A3 /* loader_spinner0003.png in Resources */,
2704   - 0886E3582179AE0B00C777A3 /* Thumbs.db in Resources */,
2705   - 0886E3702179AE0B00C777A3 /* loader_spinner0013.png in Resources */,
2706 2448 085D86702159C72F0037D480 /* zx-video-player-lock@2x.png in Resources */,
2707 2449 085D86492159C72F0037D480 /* kr-video-player-close@3x.png in Resources */,
2708   - 0886E37C2179AE0B00C777A3 /* loader_spinner0004.png in Resources */,
2709   - 0886E3852179AE0B00C777A3 /* loader_spinner0005.png in Resources */,
2710 2450 085D86882159C72F0037D480 /* kr-video-player-fullscreen@2x.png in Resources */,
2711 2451 085D868E2159C72F0037D480 /* kr-video-player-pause@2x.png in Resources */,
2712 2452 085D868B2159C72F0037D480 /* zx-video-player-unlock@2x.png in Resources */,
2713 2453 085D86612159C72F0037D480 /* zx-video-player-fastForward@2x.png in Resources */,
2714 2454 085D86762159C72F0037D480 /* zx-video-player-volumeMute@3x.png in Resources */,
2715   - 0886E3642179AE0B00C777A3 /* arscan_flip@3x.png in Resources */,
2716 2455 085D86822159C72F0037D480 /* kr-video-player-pause@3x.png in Resources */,
2717 2456 085D863D2159C72F0037D480 /* zx-video-player-rewind@2x.png in Resources */,
2718   - 0886E3912179AE0B00C777A3 /* loader_spinner0000.png in Resources */,
2719 2457 08C090142150855000E23D16 /* MainTabbarItem.plist in Resources */,
2720   - 0886E36A2179AE0B00C777A3 /* arscan_unlock@2x.png in Resources */,
2721   - 0886E3732179AE0B00C777A3 /* loader_spinner0007.png in Resources */,
2722   - 0886E3B22179AE0B00C777A3 /* loader_spinner0023.png in Resources */,
2723 2458 085D86642159C72F0037D480 /* kr-video-player-shrinkscreen@2x.png in Resources */,
2724   - 0886E3762179AE0B00C777A3 /* loader_spinner0006.png in Resources */,
2725 2459 085D866D2159C72F0037D480 /* kr-video-player-point@2x.png in Resources */,
2726 2460 085D867C2159C72F0037D480 /* zx-video-banner-back.png in Resources */,
2727 2461 085D86852159C72F0037D480 /* kr-video-player-fullscreen@3x.png in Resources */,
2728 2462 085D864F2159C72F0037D480 /* zx-video-banner-back@2x.png in Resources */,
2729 2463 085D86522159C72F0037D480 /* kr-video-player-point@3x.png in Resources */,
2730 2464 085D86672159C72F0037D480 /* zx-video-player-brightness@3x.png in Resources */,
2731   - 0886E3822179AE0B00C777A3 /* loader_spinner0011.png in Resources */,
2732   - 0886E3972179AE0B00C777A3 /* loader_spinner0002.png in Resources */,
2733   - 0886E38B2179AE0B00C777A3 /* loader_spinner0015.png in Resources */,
2734 2465 085D86732159C72F0037D480 /* zx-video-player-volumeMute@2x.png in Resources */,
2735   - 0886E3882179AE0B00C777A3 /* loader_spinner0001.png in Resources */,
2736 2466 0886E32D2179A8BD00C777A3 /* aboutEN.html in Resources */,
2737   - 0886E37F2179AE0B00C777A3 /* loader_spinner0010.png in Resources */,
2738   - 0886E3A62179AE0B00C777A3 /* loader_spinner0008.png in Resources */,
2739   - 0886E38E2179AE0B00C777A3 /* loader_spinner0014.png in Resources */,
2740 2467 08C090812150C79C00E23D16 /* upIcon.png in Resources */,
2741 2468 085D865E2159C72F0037D480 /* zx-video-player-fastForward@3x.png in Resources */,
2742   - 0886E3942179AE0B00C777A3 /* loader_spinner0016.png in Resources */,
2743 2469 08585D7F215B4C7200FC2CA2 /* PGDatePicker.bundle in Resources */,
2744   - 0886E3B52179AE0B00C777A3 /* loader_spinner0022.png in Resources */,
2745   - 0886E3672179AE0B00C777A3 /* arscan_back@2x.png in Resources */,
2746   - 0886E3A32179AE0B00C777A3 /* loader_spinner0018.png in Resources */,
2747 2470 085D86582159C72F0037D480 /* zx-video-player-brightness@2x.png in Resources */,
2748 2471 0886E3C22179D6E100C777A3 /* cnlive_zhouxin_icon.png in Resources */,
2749 2472 085D865B2159C72F0037D480 /* kr-video-player-shrinkscreen@3x.png in Resources */,
2750   - 0886E3792179AE0B00C777A3 /* loader_spinner0012.png in Resources */,
2751 2473 08B5C6542153C78800F5476E /* about.html in Resources */,
2752 2474 085D86462159C72F0037D480 /* kr-video-player-play@2x.png in Resources */,
2753   - 0886E3AC2179AE0B00C777A3 /* loader_spinner0021.png in Resources */,
2754 2475 085D86402159C72F0037D480 /* kr-video-player-close@2x.png in Resources */,
2755   - 0886E3552179AE0B00C777A3 /* arscan_back@3x.png in Resources */,
2756 2476 085D86552159C72F0037D480 /* zx-video-player-volume@3x.png in Resources */,
2757 2477 085D86792159C72F0037D480 /* zx-video-player-lock@3x.png in Resources */,
2758 2478 08C0902621508F5500E23D16 /* Localizable.strings in Resources */,
2759   - 0886E36D2179AE0B00C777A3 /* arscan_unlock@3x.png in Resources */,
2760 2479 08384844215C83E700186618 /* MainTabbarItemEN.plist in Resources */,
2761 2480 085D867F2159C72F0037D480 /* zx-video-player-unlock@3x.png in Resources */,
2762 2481 085D866A2159C72F0037D480 /* zx-video-player-volume@2x.png in Resources */,
2763   - 0886E39D2179AE0B00C777A3 /* loader_spinner0017.png in Resources */,
2764   - 0886E3612179AE0B00C777A3 /* arscan_lock@2x.png in Resources */,
2765 2482 085D864C2159C72F0037D480 /* zx-video-player-rewind@3x.png in Resources */,
2766 2483 085D86432159C72F0037D480 /* kr-video-player-play@3x.png in Resources */,
2767   - 0886E3A02179AE0B00C777A3 /* loader_spinner0019.png in Resources */,
2768   - 0886E3A92179AE0B00C777A3 /* loader_spinner0020.png in Resources */,
2769   - 0886E3AF2179AE0B00C777A3 /* loader_spinner0009.png in Resources */,
2770   - 0886E35B2179AE0B00C777A3 /* arscan_flip@2x.png in Resources */,
2771 2484 );
2772 2485 runOnlyForDeploymentPostprocessing = 0;
2773 2486 };
... ... @@ -2979,6 +2692,7 @@
2979 2692 08585D6E215B4C7200FC2CA2 /* PGPickerView.m in Sources */,
2980 2693 08FB8771215DD3C600DA5423 /* NewVoiceTableViewCell.m in Sources */,
2981 2694 08C0908C2150CBA200E23D16 /* CNLiveHeraldedNewsViewController.m in Sources */,
  2695 + 08C4B06D26AFE9C800B69C2D /* CNLiveNetWorkManager.m in Sources */,
2982 2696 084ACDFD21547AE80089E035 /* CNLiveContactUsViewController.m in Sources */,
2983 2697 08C090602150C3B200E23D16 /* CNLiveReporterAskedViewController.m in Sources */,
2984 2698 08C721BF24CAC9B700970100 /* TAAbstractDotView.m in Sources */,
... ...
CNLiveScioLive/AppDelegate.m
  View file @62b547b
... ... @@ -9,6 +9,7 @@
9 9 #import "AppDelegate.h"
10 10 #import "AvoidCrash.h"
11 11 #import "BaiduMobStat.h"//百度统计
  12 +#import "CNLiveNetWorkManager.h"
12 13  
13 14 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
14 15 #import <UserNotifications/UserNotifications.h>
... ... @@ -123,21 +124,12 @@
123 124 [self performSelector:@selector(removeImage) withObject:nil afterDelay:3];
124 125 self->done = YES;
125 126 }
126   - NSURLSessionConfiguration *configuration = [ NSURLSessionConfiguration defaultSessionConfiguration ];
127   - AFURLSessionManager *manager = [[ AFURLSessionManager alloc ] initWithSessionConfiguration :configuration];
128   - NSURLRequest *request = [ NSURLRequest requestWithURL :url];
129   - NSURLSessionDownloadTask *downloadTask = [manager downloadTaskWithRequest :request progress : nil destination :^ NSURL *( NSURL *targetPath, NSURLResponse *response) {
130   -
131   - NSURL *documentsDirectoryURL = [[ NSFileManager defaultManager ] URLForDirectory : NSDocumentDirectory inDomain : NSUserDomainMask appropriateForURL : nil create : NO error : nil ];
132   - return [documentsDirectoryURL URLByAppendingPathComponent :[response suggestedFilename ]];
133   - } completionHandler :^( NSURLResponse *response, NSURL *filePath, NSError *error) {
134   - NSLog ( @"File downloaded to: %@" , filePath);
135   -
136   - NSData * image = [NSData dataWithContentsOfURL :filePath];
137   - [[ NSUserDefaults standardUserDefaults ] setObject :image forKey : @"lanchImage"];
138   -
139   - }];
140   - [downloadTask resume ];
  127 + [CNLiveNetWorkManager loadImageWithUrl:url succeed:^(NSData * _Nonnull data) {
  128 + [[ NSUserDefaults standardUserDefaults ] setObject :data forKey : @"lanchImage"];
  129 + } error:^{
  130 +
  131 + }];
  132 +
141 133 }
142 134 } failure:^(NSError *error) {
143 135 [self addRootViewController];
... ...
CNLiveScioLive/Pages/Home/抽屉效果/Controller/CNHomeRightViewController.m
  View file @62b547b
... ... @@ -11,7 +11,6 @@
11 11 #import "CNHomeRightHeaderFooterView.h"
12 12 #import "XLSlideMenu.h"
13 13 #import "CNLiveSearchViewController.h"//搜索
14   -#import <KJARLib/KJARSCanViewController.h>
15 14  
16 15 @interface CNHomeRightViewController ()<UITableViewDelegate,UITableViewDataSource>
17 16 @property (nonatomic, strong) UITableView *tableView;
... ... @@ -111,9 +110,6 @@ static NSString *homeRightHeaderFooterView = @&quot;CNHomeRightHeaderFooterView&quot;;
111 110 if(section == 0){
112 111 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickedSearch)];
113 112 [sectionHeadView addGestureRecognizer:tap];
114   - }else if (section == 2){
115   - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickedKJARSCan)];
116   - [sectionHeadView addGestureRecognizer:tap];
117 113 }
118 114  
119 115 return sectionHeadView;
... ... @@ -152,24 +148,6 @@ static NSString *homeRightHeaderFooterView = @&quot;CNHomeRightHeaderFooterView&quot;;
152 148 [vc showRootViewControllerAnimated:true];
153 149  
154 150 }
155   -
156   -- (void)clickedKJARSCan{
157   - // 判断网络状态
158   - if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
159   - [AlertViewTool showHUDViewText:@"您未连接网络，请联网后重试！"];
160   - return;
161   - }
162   -
163   - XLSlideMenu *vc = (XLSlideMenu *)self.parentViewController;
164   - CNLiveTabBarController *liveTab = (CNLiveTabBarController *)vc.rootViewController;
165   - CNLiveBaseNavigationController *controllers = liveTab.viewControllers[0];
166   - KJARSCanViewController *scanView = [[KJARSCanViewController alloc]init];
167   - [scanView SetAccountKey:@"AP6caf76bc2c5f45698c74ef7e126703e1" :@"3f57c704ff9f4c8d82a575db5c7abe12"];
168   - scanView.hidesBottomBarWhenPushed = YES;
169   - [controllers pushViewController:scanView animated:YES];
170   - [vc showRootViewControllerAnimated:true];
171   -
172   -}
173 151 #pragma mark - Lazy Laoding
174 152 - (UITableView *)tableView{
175 153 if(!_tableView){
... ...
CNLiveScioLive/Pages/Newsound/OldController/VoiceViewController.m
  View file @62b547b
... ... @@ -430,7 +430,7 @@ static const NSInteger margin = 34;
430 430 _dictionary = [[NSDictionary alloc] init];
431 431 music = [JGMusicManager shareMusicManager];
432 432 music.delegate = self;
433   -
  433 + [music remoteControlEventHandler];
434 434 //数据
435 435 [self getData];
436 436 //顶部切换菜单
... ... @@ -442,6 +442,7 @@ static const NSInteger margin = 34;
442 442 //滑动手势
443 443 [self createSwipeGestureRecognizer];
444 444  
  445 +
445 446 self.timer = [NSTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(timerAct) userInfo:nil repeats:YES];
446 447 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(reSetPlayer) name:@"pauseVocieNotification" object:nil];
447 448 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeLanguageVersion:) name:@"changeLanguageVersion" object:nil];
... ... @@ -877,6 +878,7 @@ static const NSInteger margin = 34;
877 878  
878 879 #pragma mark - JGMusicManagerDelegate
879 880 - (void)lastMusic {
  881 + [AlertViewTool hideHUDView];
880 882 [self reSetPlayer];
881 883 music.index--;
882 884 if (music.index == -1) {
... ... @@ -1116,6 +1118,7 @@ static const NSInteger margin = 34;
1116 1118 }
1117 1119  
1118 1120 - (void)playBackBtnClicked:(id)sender {
  1121 + [AlertViewTool hideHUDView];
1119 1122 long long int currentTime = music.player.currentTime.value / music.player.currentTime.timescale;
1120 1123 [music playerProgressWithProgressFloat:(currentTime - 15)];
1121 1124 }
... ... @@ -1131,6 +1134,7 @@ static const NSInteger margin = 34;
1131 1134 }
1132 1135  
1133 1136 - (void)playNextBtnClicked:(id)sender {
  1137 + [AlertViewTool hideHUDView];
1134 1138 [self reSetPlayer];
1135 1139 music.index++;
1136 1140 if (music.index == music.musicArray.count) {
... ...
CNLiveScioLive/Pages/SDK/KJARLib/KJARLib.framework/Headers/HttpCallbackHandler.h deleted 100644 → 0
  View file @a6317c4
1   -/*===============================================================================
2   - Copyright (c) 2012-2015 Qualcomm Connected Experiences, Inc. All Rights Reserved.
3   -
4   - Vuforia is a trademark of PTC Inc., registered in the United States and other
5   - countries.
6   - ===============================================================================*/
7   -
8   -@protocol HttpCallbackHandler
9   -
10   -@required
11   -- (void) TaskComplete : (NSObject*)result : (BOOL) success : (int)eventKey;
12   -
13   -@end
14 0 \ No newline at end of file
CNLiveScioLive/Pages/SDK/KJARLib/KJARLib.framework/Headers/KJARCtrlViewController.h deleted 100644 → 0
  View file @a6317c4
1   -
2   -
3   -#import <UIKit/UIKit.h>
4   -#import "VuforiaWindow.h"
5   -#import "HttpCallbackHandler.h"
6   -
7   -@interface KJARCtrlViewController : VuforiaWindow<HttpCallbackHandler>
8   -
9   -- (void)QuitWindow;
10   -
11   -@end
CNLiveScioLive/Pages/SDK/KJARLib/KJARLib.framework/Headers/KJARLib.h deleted 100644 → 0
  View file @a6317c4
1   -//
2   -// KJARLib.h
3   -// KJARLib
4   -//
5   -// Created by liu on 16/12/13.
6   -// Copyright © 2016年 liu. All rights reserved.
7   -//
8   -
9   -#import <UIKit/UIKit.h>
10   -
11   -//! Project version number for KJARLib.
12   -FOUNDATION_EXPORT double KJARLibVersionNumber;
13   -
14   -//! Project version string for KJARLib.
15   -FOUNDATION_EXPORT const unsigned char KJARLibVersionString[];
16   -
17   -// In this header, you should import all the public headers of your framework using statements like #import <KJARLib/PublicHeader.h>
18   -
19   -
CNLiveScioLive/Pages/SDK/KJARLib/KJARLib.framework/Headers/KJARSCanViewController.h deleted 100644 → 0
  View file @a6317c4
1   -
2   -
3   -#import <UIKit/UIKit.h>
4   -#import "KJARCtrlViewController.h"
5   -
6   -@interface KJARSCanViewController : KJARCtrlViewController
7   -
8   -- (void)SetAccountKey : (NSString*)accountKey : (NSString*)bucketID;
9   -
10   -@end
CNLiveScioLive/Pages/SDK/KJARLib/KJARLib.framework/Headers/VuforiaWindow.h deleted 100644 → 0
  View file @a6317c4
1   -//
2   -// VuforiaWindow.h
3   -// Youlinyi
4   -//
5   -// Created by imac on 15-11-6.
6   -// Copyright (c) 2015ƒÍ KJTeam. All rights reserved.
7   -//
8   -
9   -#import <UIKit/UIKit.h>
10   -
11   -
12   -@class PlayRenderController;
13   -
14   -@interface VuforiaWindow : UIViewController
15   -
16   -
17   -- (void)StartInitialize;
18   -
19   -- (void)onInitARDone;
20   -- (void)rootViewControllerPresentViewController:(UIViewController*)viewController inContext:(BOOL)currentContext;
21   -- (void)rootViewControllerDismissPresentedViewController;
22   -
23   -// 获得AR窗口绘制区域
24   -- (CGRect)GetARViewFrame;
25   -- (void)FlipCamera;
26   -- (void)SetLockVideo : (BOOL)isLock;
27   -// 显示等待动画
28   -- (void)ShowWaitingAnimation : (BOOL)isShow;
29   -// 将要退出
30   -- (void)WillQuit;
31   -
32   -@property PlayRenderController * RenderController;
33   -
34   -@end
CNLiveScioLive/Pages/SDK/KJARLib/KJARLib.framework/Info.plist deleted 100644 → 0
View file @a6317c4
No preview for this file type
CNLiveScioLive/Pages/SDK/KJARLib/KJARLib.framework/KJARLib deleted 100644 → 0
View file @a6317c4
No preview for this file type
CNLiveScioLive/Pages/SDK/KJARLib/KJARLib.framework/Line.fragsh deleted 100644 → 0
  View file @a6317c4
1   -/*==============================================================================
2   - Copyright
3   - All Rights Reserved.
4   - ==============================================================================*/
5   -
6   -precision mediump float;
7   -
8   -uniform float opacity;
9   -uniform vec3 color;
10   -
11   -void main()
12   -{
13   - gl_FragColor = vec4(color.r, color.g, color.b, opacity);
14   -}
CNLiveScioLive/Pages/SDK/KJARLib/KJARLib.framework/Line.vertsh deleted 100644 → 0
  View file @a6317c4
1   -/*==============================================================================
2   - Copyright
3   - All Rights Reserved.
4   - ==============================================================================*/
5   -
6   -attribute vec4 vertexPosition;
7   -
8   -uniform mat4 modelViewProjectionMatrix;
9   -
10   -void main()
11   -{
12   - gl_Position = modelViewProjectionMatrix * vertexPosition;
13   -}
CNLiveScioLive/Pages/SDK/KJARLib/KJARLib.framework/Modules/module.modulemap deleted 100644 → 0
  View file @a6317c4
1   -framework module KJARLib {
2   - umbrella header "KJARLib.h"
3   -
4   - export *
5   - module * { export * }
6   -}
CNLiveScioLive/Pages/SDK/KJARLib/KJARLib.framework/Simple.fragsh deleted 100644 → 0
  View file @a6317c4
1   -/*==============================================================================
2   - Copyright (c) 2012-2015 Qualcomm Connected Experiences, Inc.
3   - All Rights Reserved.
4   - ==============================================================================*/
5   -
6   -precision mediump float;
7   -varying vec2 texCoord;
8   -
9   -uniform sampler2D texSampler2D;
10   -
11   -void main()
12   -{
13   - gl_FragColor = texture2D(texSampler2D, texCoord);
14   -}
CNLiveScioLive/Pages/SDK/KJARLib/KJARLib.framework/Simple.vertsh deleted 100644 → 0
  View file @a6317c4
1   -/*==============================================================================
2   - Copyright (c) 2012-2015 Qualcomm Connected Experiences, Inc.
3   - All Rights Reserved.
4   - ==============================================================================*/
5   -
6   -attribute vec4 vertexPosition;
7   -attribute vec4 vertexNormal;
8   -attribute vec2 vertexTexCoord;
9   -
10   -varying vec2 texCoord;
11   -varying vec4 normal;
12   -
13   -uniform mat4 modelViewProjectionMatrix;
14   -
15   -void main()
16   -{
17   - gl_Position = modelViewProjectionMatrix * vertexPosition;
18   - normal = vertexNormal;
19   - texCoord = vertexTexCoord;
20   -}
CNLiveScioLive/Pages/SDK/KJARLib/KJARLib.framework/Simple2.fragsh deleted 100644 → 0
  View file @a6317c4
1   -/*==============================================================================
2   - Copyright (c) 2012-2015 Qualcomm Connected Experiences, Inc.
3   - All Rights Reserved.
4   - ==============================================================================*/
5   -
6   -precision mediump float;
7   -varying vec2 texCoord;
8   -
9   -uniform sampler2D texSampler2D;
10   -
11   -void main()
12   -{
13   - vec3 keying_color = vec3(0,1,0);
14   - float thresh = 0.8;
15   - float slope = 0.2;
16   - vec3 input_color = texture2D(texSampler2D, texCoord).rgb;
17   - float d = abs(length(abs(keying_color.rgb - input_color.rgb)));
18   - float edge0 = thresh * (1.0 - slope);
19   - float alpha = smoothstep(edge0, thresh, d);
20   -
21   - gl_FragColor = vec4(input_color, alpha);
22   -}
CNLiveScioLive/Pages/SDK/KJARLib/KJARLib.framework/_CodeSignature/CodeResources deleted 100644 → 0
  View file @a6317c4
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3   -<plist version="1.0">
4   -<dict>
5   - <key>files</key>
6   - <dict>
7   - <key>Headers/HttpCallbackHandler.h</key>
8   - <data>
9   - 2EPVTTNHu+WnbmGMKy7hSiIDhwk=
10   - </data>
11   - <key>Headers/KJARCtrlViewController.h</key>
12   - <data>
13   - IZN1D5F9nzpaI7Refm9D2+8t6CY=
14   - </data>
15   - <key>Headers/KJARLib.h</key>
16   - <data>
17   - k301TVBih7JEEhmKR/WYckWs1LI=
18   - </data>
19   - <key>Headers/KJARSCanViewController.h</key>
20   - <data>
21   - M0pyqd6vR5SDleht0zvPyCU25YQ=
22   - </data>
23   - <key>Headers/VuforiaWindow.h</key>
24   - <data>
25   - kfUIobTktKGxx9fI131uzwOj5D0=
26   - </data>
27   - <key>Info.plist</key>
28   - <data>
29   - g3LnVCm2k+RNptyE43cJkw65wR8=
30   - </data>
31   - <key>Line.fragsh</key>
32   - <data>
33   - 07Qqqk77wFjdJ3Feg4jn/YMzKXk=
34   - </data>
35   - <key>Line.vertsh</key>
36   - <data>
37   - LrrYqGs6Xdt5JRSyKcxmkryqxPA=
38   - </data>
39   - <key>Modules/module.modulemap</key>
40   - <data>
41   - kBwARCS/axT2bA6wdOjeMWYBa+Y=
42   - </data>
43   - </dict>
44   - <key>files2</key>
45   - <dict>
46   - <key>Headers/HttpCallbackHandler.h</key>
47   - <data>
48   - 2EPVTTNHu+WnbmGMKy7hSiIDhwk=
49   - </data>
50   - <key>Headers/KJARCtrlViewController.h</key>
51   - <data>
52   - IZN1D5F9nzpaI7Refm9D2+8t6CY=
53   - </data>
54   - <key>Headers/KJARLib.h</key>
55   - <data>
56   - k301TVBih7JEEhmKR/WYckWs1LI=
57   - </data>
58   - <key>Headers/KJARSCanViewController.h</key>
59   - <data>
60   - M0pyqd6vR5SDleht0zvPyCU25YQ=
61   - </data>
62   - <key>Headers/VuforiaWindow.h</key>
63   - <data>
64   - kfUIobTktKGxx9fI131uzwOj5D0=
65   - </data>
66   - <key>Line.fragsh</key>
67   - <data>
68   - 07Qqqk77wFjdJ3Feg4jn/YMzKXk=
69   - </data>
70   - <key>Line.vertsh</key>
71   - <data>
72   - LrrYqGs6Xdt5JRSyKcxmkryqxPA=
73   - </data>
74   - <key>Modules/module.modulemap</key>
75   - <data>
76   - kBwARCS/axT2bA6wdOjeMWYBa+Y=
77   - </data>
78   - </dict>
79   - <key>rules</key>
80   - <dict>
81   - <key>^</key>
82   - <true/>
83   - <key>^.*\.lproj/</key>
84   - <dict>
85   - <key>optional</key>
86   - <true/>
87   - <key>weight</key>
88   - <real>1000</real>
89   - </dict>
90   - <key>^.*\.lproj/locversion.plist$</key>
91   - <dict>
92   - <key>omit</key>
93   - <true/>
94   - <key>weight</key>
95   - <real>1100</real>
96   - </dict>
97   - <key>^version.plist$</key>
98   - <true/>
99   - </dict>
100   - <key>rules2</key>
101   - <dict>
102   - <key>.*\.dSYM($|/)</key>
103   - <dict>
104   - <key>weight</key>
105   - <real>11</real>
106   - </dict>
107   - <key>^</key>
108   - <dict>
109   - <key>weight</key>
110   - <real>20</real>
111   - </dict>
112   - <key>^(.*/)?\.DS_Store$</key>
113   - <dict>
114   - <key>omit</key>
115   - <true/>
116   - <key>weight</key>
117   - <real>2000</real>
118   - </dict>
119   - <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
120   - <dict>
121   - <key>nested</key>
122   - <true/>
123   - <key>weight</key>
124   - <real>10</real>
125   - </dict>
126   - <key>^.*</key>
127   - <true/>
128   - <key>^.*\.lproj/</key>
129   - <dict>
130   - <key>optional</key>
131   - <true/>
132   - <key>weight</key>
133   - <real>1000</real>
134   - </dict>
135   - <key>^.*\.lproj/locversion.plist$</key>
136   - <dict>
137   - <key>omit</key>
138   - <true/>
139   - <key>weight</key>
140   - <real>1100</real>
141   - </dict>
142   - <key>^Info\.plist$</key>
143   - <dict>
144   - <key>omit</key>
145   - <true/>
146   - <key>weight</key>
147   - <real>20</real>
148   - </dict>
149   - <key>^PkgInfo$</key>
150   - <dict>
151   - <key>omit</key>
152   - <true/>
153   - <key>weight</key>
154   - <real>20</real>
155   - </dict>
156   - <key>^[^/]+$</key>
157   - <dict>
158   - <key>nested</key>
159   - <true/>
160   - <key>weight</key>
161   - <real>10</real>
162   - </dict>
163   - <key>^embedded\.provisionprofile$</key>
164   - <dict>
165   - <key>weight</key>
166   - <real>20</real>
167   - </dict>
168   - <key>^version\.plist$</key>
169   - <dict>
170   - <key>weight</key>
171   - <real>20</real>
172   - </dict>
173   - </dict>
174   -</dict>
175   -</plist>
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/Thumbs.db deleted 100644 → 0
View file @a6317c4
No preview for this file type
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0000.png deleted 100644 → 0
View file @a6317c4

7.91 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0001.png deleted 100644 → 0
View file @a6317c4

7.91 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0002.png deleted 100644 → 0
View file @a6317c4

7.91 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0003.png deleted 100644 → 0
View file @a6317c4

7.87 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0004.png deleted 100644 → 0
View file @a6317c4

7.87 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0005.png deleted 100644 → 0
View file @a6317c4

7.87 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0006.png deleted 100644 → 0
View file @a6317c4

7.88 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0007.png deleted 100644 → 0
View file @a6317c4

7.88 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0008.png deleted 100644 → 0
View file @a6317c4

7.88 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0009.png deleted 100644 → 0
View file @a6317c4

7.71 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0010.png deleted 100644 → 0
View file @a6317c4

7.71 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0011.png deleted 100644 → 0
View file @a6317c4

7.71 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0012.png deleted 100644 → 0
View file @a6317c4

7.88 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0013.png deleted 100644 → 0
View file @a6317c4

7.88 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0014.png deleted 100644 → 0
View file @a6317c4

7.88 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0015.png deleted 100644 → 0
View file @a6317c4

7.87 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0016.png deleted 100644 → 0
View file @a6317c4

7.87 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0017.png deleted 100644 → 0
View file @a6317c4

7.87 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0018.png deleted 100644 → 0
View file @a6317c4

7.88 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0019.png deleted 100644 → 0
View file @a6317c4

7.88 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0020.png deleted 100644 → 0
View file @a6317c4

7.88 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0021.png deleted 100644 → 0
View file @a6317c4

7.74 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0022.png deleted 100644 → 0
View file @a6317c4

7.74 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/animation1/loader_spinner0023.png deleted 100644 → 0
View file @a6317c4

7.74 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/arscan_back@2x.png deleted 100644 → 0
View file @a6317c4

2.81 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/arscan_back@3x.png deleted 100644 → 0
View file @a6317c4

4.31 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/arscan_flip@2x.png deleted 100644 → 0
View file @a6317c4

3.03 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/arscan_flip@3x.png deleted 100644 → 0
View file @a6317c4

4.2 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/arscan_lock@2x.png deleted 100644 → 0
View file @a6317c4

3.53 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/arscan_lock@3x.png deleted 100644 → 0
View file @a6317c4

5.32 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/arscan_unlock@2x.png deleted 100644 → 0
View file @a6317c4

3.46 KB
CNLiveScioLive/Pages/SDK/KJARLib/资源文件/arscan_unlock@3x.png deleted 100644 → 0
View file @a6317c4

5.28 KB
CNLiveScioLive/Pages/Tools/LoadImageRequest/CNLiveNetWorkManager.h 0 → 100644
  View file @62b547b
  1 +//
  2 +// CNLiveNetWorkManager.h
  3 +// CNLiveScioLive
  4 +//
  5 +// Created by CNLive on 2021/7/27.
  6 +// Copyright © 2021 CNLive. All rights reserved.
  7 +//
  8 +
  9 +#import <Foundation/Foundation.h>
  10 +
  11 +NS_ASSUME_NONNULL_BEGIN
  12 +
  13 +@interface CNLiveNetWorkManager : NSObject
  14 +/*网络图片下载*/
  15 ++(void)loadImageWithUrl:(NSURL *)url
  16 + succeed:(void(^)(NSData *data))succeedBlock
  17 + error:(void(^)(void))errorBlock;
  18 +@end
  19 +
  20 +NS_ASSUME_NONNULL_END
... ...
CNLiveScioLive/Pages/Tools/LoadImageRequest/CNLiveNetWorkManager.m 0 → 100644
  View file @62b547b
  1 +//
  2 +// CNLiveNetWorkManager.m
  3 +// CNLiveScioLive
  4 +//
  5 +// Created by CNLive on 2021/7/27.
  6 +// Copyright © 2021 CNLive. All rights reserved.
  7 +//
  8 +
  9 +#import "CNLiveNetWorkManager.h"
  10 +
  11 +@implementation CNLiveNetWorkManager
  12 ++(void)loadImageWithUrl:(NSURL *)url
  13 + succeed:(void(^)(NSData *data))succeedBlock
  14 + error:(void(^)(void))errorBlock{
  15 + NSURLSessionConfiguration *configuration = [ NSURLSessionConfiguration defaultSessionConfiguration ];
  16 + AFURLSessionManager *manager = [[ AFURLSessionManager alloc ] initWithSessionConfiguration :configuration];
  17 + NSURLRequest *request = [ NSURLRequest requestWithURL :url];
  18 + NSURLSessionDownloadTask *downloadTask = [manager downloadTaskWithRequest :request progress : nil destination :^ NSURL *( NSURL *targetPath, NSURLResponse *response) {
  19 +
  20 + NSURL *documentsDirectoryURL = [[ NSFileManager defaultManager ] URLForDirectory : NSDocumentDirectory inDomain : NSUserDomainMask appropriateForURL : nil create : NO error : nil ];
  21 + return [documentsDirectoryURL URLByAppendingPathComponent :[response suggestedFilename ]];
  22 + } completionHandler :^( NSURLResponse *response, NSURL *filePath, NSError *error) {
  23 + NSLog ( @"File downloaded to: %@" , filePath);
  24 +
  25 + NSData * image = [NSData dataWithContentsOfURL :filePath];
  26 + succeedBlock(image);
  27 + }];
  28 + [downloadTask resume ];
  29 +}
  30 +@end
... ...
CNLiveScioLive/Pages/Tools/ZXVideoPlayer/Classes/JGMusicManager.h
  View file @62b547b
... ... @@ -36,6 +36,7 @@
36 36 - (void)playAndPause;
37 37 - (void)playPrevious;
38 38 - (void)playNext;
  39 +- (void)remoteControlEventHandler;
39 40 - (void)replaceItemWithDictionary:(NSDictionary *)dictionary;
40 41 - (void)playerVolumeWithVolumeFloat:(CGFloat)volumeFloat;
41 42 - (void)playerProgressWithProgressFloat:(CGFloat)progressFloat;
... ...
CNLiveScioLive/Pages/Tools/ZXVideoPlayer/Classes/JGMusicManager.m
  View file @62b547b
... ... @@ -7,6 +7,12 @@
7 7 //
8 8  
9 9 #import "JGMusicManager.h"
  10 +#import "CNLiveNetWorkManager.h"
  11 +@interface JGMusicManager()
  12 +{
  13 + NSDictionary *_dictionary;
  14 +}
  15 +@end
10 16  
11 17 @implementation JGMusicManager
12 18  
... ... @@ -16,7 +22,6 @@
16 22 static dispatch_once_t onceToken;
17 23 dispatch_once(&onceToken, ^{
18 24 musicManager = [[JGMusicManager alloc] init];
19   - [musicManager remoteControlEventHandler];
20 25 });
21 26 return musicManager;
22 27 }
... ... @@ -96,18 +101,20 @@
96 101 if (playingInfoCenter) {
97 102 //数据信息
98 103 NSMutableDictionary *songInfo = [[NSMutableDictionary alloc] init];
99   -
100   - // //图片
101   - // MPMediaItemArtwork *albumArt = [[MPMediaItemArtwork alloc] initWithImage:[UIImage imageWithUrlString:model.icon]];
102   - // [songInfo setObject:albumArt forKey:MPMediaItemPropertyArtwork];
103   - //
104   - // //当前播放时间
105   - // [songInfo setObject:[NSNumber numberWithDouble:[[[HWMusicTool shareMusicTool] Player] currentPlaybackTime]] forKey:MPNowPlayingInfoPropertyElapsedPlaybackTime];
106   - // //速率
107   - // [songInfo setObject:[NSNumber numberWithFloat:1.0f] forKey:MPNowPlayingInfoPropertyPlaybackRate];
108   - // //剩余时长
109   - // [songInfo setObject:[NSNumber numberWithDouble:[[[HWMusicTool shareMusicTool] Player] duration]] forKey:MPMediaItemPropertyPlaybackDuration];
110   -
  104 +// NSNumber*playbackDuration =@(CMTimeGetSeconds(self.player.currentItem.duration));
  105 +//
  106 +// NSNumber*elapsedPlaybackTime =@(CMTimeGetSeconds(self.player.currentItem.currentTime));
  107 +// //图片
  108 +// MPMediaItemArtwork *albumArt = [[MPMediaItemArtwork alloc] initWithImage:image];
  109 +// [songInfo setObject:albumArt forKey:MPMediaItemPropertyArtwork];
  110 +//
  111 +// //当前播放时间
  112 +// [songInfo setObject:elapsedPlaybackTime forKey:MPNowPlayingInfoPropertyElapsedPlaybackTime];
  113 +// //速率
  114 +// [songInfo setObject:[NSNumber numberWithFloat:1.0f] forKey:MPNowPlayingInfoPropertyPlaybackRate];
  115 +// //剩余时长
  116 +// [songInfo setObject:playbackDuration forKey:MPMediaItemPropertyPlaybackDuration];
  117 +//
111 118 //设置标题
112 119 [songInfo setObject:dictionary[@"cmsColumnName"] ? dictionary[@"cmsColumnName"] : @"" forKey:MPMediaItemPropertyTitle];
113 120  
... ... @@ -156,28 +163,33 @@
156 163  
157 164 }
158 165  
159   -- (void)playAction:(MPRemoteCommandCenter *)sender {
  166 +- (MPRemoteCommandHandlerStatus)playAction:(MPRemoteCommandCenter *)sender {
160 167 [self playerPlay];
  168 + return MPRemoteCommandHandlerStatusSuccess;
161 169 }
162 170  
163   -- (void)pauseAction:(MPRemoteCommandCenter *)sender {
  171 +- (MPRemoteCommandHandlerStatus)pauseAction:(MPRemoteCommandCenter *)sender {
164 172 [self playerPause];
  173 + return MPRemoteCommandHandlerStatusSuccess;
165 174 }
166 175  
167   -- (void)previousTrackAction:(MPRemoteCommandCenter *)sender {
  176 +- (MPRemoteCommandHandlerStatus)previousTrackAction:(MPRemoteCommandCenter *)sender {
168 177 if (self.delegate && [self.delegate respondsToSelector:@selector(lastMusic)]) {
169 178 [self.delegate lastMusic];
170 179 }
  180 + return MPRemoteCommandHandlerStatusSuccess;
171 181 }
172 182  
173   -- (void)nextTrackAction:(MPRemoteCommandCenter *)sender {
  183 +- (MPRemoteCommandHandlerStatus)nextTrackAction:(MPRemoteCommandCenter *)sender {
174 184 if (self.delegate && [self.delegate respondsToSelector:@selector(NextMusic)]) {
175 185 [self.delegate NextMusic];
176 186 }
  187 + return MPRemoteCommandHandlerStatusSuccess;
177 188 }
178 189  
179   -- (void)playOrPauseAction:(MPRemoteCommandCenter *)sender {
  190 +- (MPRemoteCommandHandlerStatus)playOrPauseAction:(MPRemoteCommandCenter *)sender {
180 191 [self playAndPause];
  192 + return MPRemoteCommandHandlerStatusSuccess;
181 193 }
182 194  
183 195 @end
... ...