李勇

1.伴音模块增加了seek的间隔处理;2.sever.json选择增加空指针处理

@@ -35,7 +35,7 @@ import QuestionApe from 'apes/QuestionApe'; @@ -35,7 +35,7 @@ import QuestionApe from 'apes/QuestionApe';
35 import UTF8 from 'utf-8'; 35 import UTF8 from 'utf-8';
36 36
37 let loger = Loger.getLoger('McuClient'); 37 let loger = Loger.getLoger('McuClient');
38 -let _sdkInfo = {"version": "v1.56.1.20170727", "author": "www.3mang.com"}; 38 +let _sdkInfo = {"version": "v1.57.0.20170727", "author": "www.3mang.com"};
39 39
40 //APE 40 //APE
41 let _sass; 41 let _sass;
@@ -436,7 +436,11 @@ class IpManager extends Emiter { @@ -436,7 +436,11 @@ class IpManager extends Emiter {
436 436
437 //中国的需要细分 437 //中国的需要细分
438 //按isp查找 438 //按isp查找
439 - let ispData = countryData.isp[isp]; 439 + let ispData =null;
  440 + if(countryData.isp){
  441 + ispData= countryData.isp[isp];
  442 + }
  443 +
440 //isp查找到就返回 444 //isp查找到就返回
441 if (ispData) { 445 if (ispData) {
442 // loger.log("_returnServerMS->ispData",ispData); 446 // loger.log("_returnServerMS->ispData",ispData);
@@ -444,7 +448,11 @@ class IpManager extends Emiter { @@ -444,7 +448,11 @@ class IpManager extends Emiter {
444 } 448 }
445 449
446 //isp没查找到,用province 450 //isp没查找到,用province
447 - let provinceData = countryData.province[province]; 451 + let provinceData =null;
  452 + if( countryData.province){
  453 + countryData.province[province];
  454 + }
  455 +
448 //用province查找到就返回 456 //用province查找到就返回
449 if (provinceData) { 457 if (provinceData) {
450 // loger.log("_returnServerMS->provinceData",provinceData); 458 // loger.log("_returnServerMS->provinceData",provinceData);
@@ -411,9 +411,9 @@ class MusicSharedApe extends Ape { @@ -411,9 +411,9 @@ class MusicSharedApe extends Ape {
411 seekDistance=parseInt(Math.abs(seekDistance)); 411 seekDistance=parseInt(Math.abs(seekDistance));
412 loger.warn("timeDistance:"+timeDistance+" seek2seek:"+seek2seek+" seekDistance:"+seekDistance); 412 loger.warn("timeDistance:"+timeDistance+" seek2seek:"+seek2seek+" seekDistance:"+seekDistance);
413 413
414 - if(seekDistance<5){ 414 + if(seekDistance<=5){
415 //记录最后一次的数据 415 //记录最后一次的数据
416 - loger.warn("伴音更新数据->数据只有SEEK发生改变,低于5秒不需要再更新->timeDistance:"+timeDistance+"->seekDistance"+seekDistance); 416 + loger.warn("伴音更新数据->数据只有SEEK发生改变,低于5秒不需要再更新->");
417 //记录最后一次激活的数据 417 //记录最后一次激活的数据
418 this.lastActiveData=getMusicPackFullInfo; 418 this.lastActiveData=getMusicPackFullInfo;
419 this.lastActiveData.time=new Date().getTime(); 419 this.lastActiveData.time=new Date().getTime();