Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
This commit is contained in:
commit
a4af480ab8
@ -31,7 +31,7 @@ export function PassflowConnect(deviceaction,toptrain,downtrain,routegroup,passe
|
|||||||
function callback(Response) {
|
function callback(Response) {
|
||||||
const data = JSON.parse(Response.body);
|
const data = JSON.parse(Response.body);
|
||||||
|
|
||||||
// console.log(data);
|
|
||||||
/** 站台客流当前人数信息 */
|
/** 站台客流当前人数信息 */
|
||||||
if(data.type == "STAND_PFI"){
|
if(data.type == "STAND_PFI"){
|
||||||
|
|
||||||
|
@ -31,6 +31,10 @@ export function TrainConnect(trafficTrain,deviceaction,toptrain,routegroup,passe
|
|||||||
const data = JSON.parse(Response.body);
|
const data = JSON.parse(Response.body);
|
||||||
|
|
||||||
|
|
||||||
|
if(data.type != "TrainRun_3D"){
|
||||||
|
console.log(data);
|
||||||
|
}
|
||||||
|
|
||||||
if(data.type == "BeAbout2Arrive_3D"){
|
if(data.type == "BeAbout2Arrive_3D"){
|
||||||
if(toptrain.nowcode == data.body.groupNumber){
|
if(toptrain.nowcode == data.body.groupNumber){
|
||||||
console.log(data);
|
console.log(data);
|
||||||
|
@ -339,14 +339,14 @@ export function Jl3dTrafficTrain(dom,skinCode,routegroup,viewMap) {
|
|||||||
// console.log(scope.trainList[i]);
|
// console.log(scope.trainList[i]);
|
||||||
for(let an=passerTrain.toptrain.action.top.length-1;an>=0;an--){
|
for(let an=passerTrain.toptrain.action.top.length-1;an>=0;an--){
|
||||||
passerTrain.toptrain.action.top[an].reset();
|
passerTrain.toptrain.action.top[an].reset();
|
||||||
passerTrain.toptrain.action.top[an].time = passerTrain.toptrain.action.top[an]._clip.duration;
|
passerTrain.toptrain.action.top[an].time = 0;
|
||||||
passerTrain.toptrain.action.top[an].timeScale = -1;
|
passerTrain.toptrain.action.top[an].timeScale = -1;
|
||||||
passerTrain.toptrain.action.top[an].play();
|
passerTrain.toptrain.action.top[an].play();
|
||||||
}
|
}
|
||||||
|
|
||||||
for(let an=passerTrain.toptrain.action.top.length-1;an>=0;an--){
|
for(let an=passerTrain.toptrain.action.top.length-1;an>=0;an--){
|
||||||
passerTrain.toptrain.action.down[an].reset();
|
passerTrain.toptrain.action.down[an].reset();
|
||||||
passerTrain.toptrain.action.down[an].time = passerTrain.toptrain.action.top[an]._clip.duration;
|
passerTrain.toptrain.action.down[an].time = 0;
|
||||||
passerTrain.toptrain.action.down[an].timeScale = -1;
|
passerTrain.toptrain.action.down[an].timeScale = -1;
|
||||||
passerTrain.toptrain.action.down[an].play();
|
passerTrain.toptrain.action.down[an].play();
|
||||||
}
|
}
|
||||||
@ -355,14 +355,14 @@ export function Jl3dTrafficTrain(dom,skinCode,routegroup,viewMap) {
|
|||||||
if(scope.trainList[i].doorCode == "1"){
|
if(scope.trainList[i].doorCode == "1"){
|
||||||
for(let an=passerTrain.toptrain.action.top.length-1;an>=0;an--){
|
for(let an=passerTrain.toptrain.action.top.length-1;an>=0;an--){
|
||||||
passerTrain.toptrain.action.top[an].reset();
|
passerTrain.toptrain.action.top[an].reset();
|
||||||
passerTrain.toptrain.action.top[an].time = 0;
|
passerTrain.toptrain.action.top[an].time = passerTrain.toptrain.action.top[an]._clip.duration;
|
||||||
passerTrain.toptrain.action.top[an].timeScale = 1;
|
passerTrain.toptrain.action.top[an].timeScale = 1;
|
||||||
passerTrain.toptrain.action.top[an].play();
|
passerTrain.toptrain.action.top[an].play();
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
for(let an=passerTrain.toptrain.action.top.length-1;an>=0;an--){
|
for(let an=passerTrain.toptrain.action.top.length-1;an>=0;an--){
|
||||||
passerTrain.toptrain.action.down[an].reset();
|
passerTrain.toptrain.action.down[an].reset();
|
||||||
passerTrain.toptrain.action.down[an].time = 0;
|
passerTrain.toptrain.action.down[an].time = passerTrain.toptrain.action.top[an]._clip.duration;
|
||||||
passerTrain.toptrain.action.down[an].timeScale = 1;
|
passerTrain.toptrain.action.down[an].timeScale = 1;
|
||||||
passerTrain.toptrain.action.down[an].play();
|
passerTrain.toptrain.action.down[an].play();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user