|
@@ -195,7 +195,7 @@ export class FloorScene extends SGraphyScene {
|
|
this.unzip(blob)
|
|
this.unzip(blob)
|
|
.then((jsonData: any) => {
|
|
.then((jsonData: any) => {
|
|
that.addBaseMapItem(jsonData);
|
|
that.addBaseMapItem(jsonData);
|
|
- relove();
|
|
|
|
|
|
+ relove(jsonData);
|
|
})
|
|
})
|
|
.catch((error: any) => {
|
|
.catch((error: any) => {
|
|
console.log(error);
|
|
console.log(error);
|
|
@@ -222,8 +222,16 @@ export class FloorScene extends SGraphyScene {
|
|
//解压数据
|
|
//解压数据
|
|
let base64Data = btoa(binaryString);
|
|
let base64Data = btoa(binaryString);
|
|
let unGzipData = that.unzipBase64(base64Data);
|
|
let unGzipData = that.unzipBase64(base64Data);
|
|
- that.data = unGzipData.entityList[0].Elements;
|
|
|
|
- resolve(that.data);
|
|
|
|
|
|
+ try {
|
|
|
|
+ that.data = unGzipData.entityList
|
|
|
|
+ ? unGzipData.entityList[0].Elements
|
|
|
|
+ : unGzipData.EntityList[0].Elements;
|
|
|
|
+ resolve(that.data);
|
|
|
|
+ } catch (e) {
|
|
|
|
+ console.log(e);
|
|
|
|
+ console.log(unGzipData);
|
|
|
|
+ resolve("error");
|
|
|
|
+ }
|
|
};
|
|
};
|
|
});
|
|
});
|
|
} // Function unzip
|
|
} // Function unzip
|
|
@@ -258,24 +266,36 @@ export class FloorScene extends SGraphyScene {
|
|
* @param data itemList对象
|
|
* @param data itemList对象
|
|
*/
|
|
*/
|
|
private addBaseMapItem(data: FloorData) {
|
|
private addBaseMapItem(data: FloorData) {
|
|
- data.Walls.map((t: Wall) => {
|
|
|
|
- this.addWall(t);
|
|
|
|
- });
|
|
|
|
- data.Columns.map((t: Column) => {
|
|
|
|
- this.addColumn(t);
|
|
|
|
- });
|
|
|
|
- data.Windows.map((t: Casement) => {
|
|
|
|
- this.addCasement(t);
|
|
|
|
- });
|
|
|
|
- data.VirtualWalls.map((t: VirtualWall) => {
|
|
|
|
- this.addVirtualWall(t);
|
|
|
|
- });
|
|
|
|
- data.Doors.map((t: Door) => {
|
|
|
|
- this.addDoor(t);
|
|
|
|
- });
|
|
|
|
- data.Spaces.map((t: Space) => {
|
|
|
|
- this.addSpace(t);
|
|
|
|
- });
|
|
|
|
|
|
+ if (data.Walls) {
|
|
|
|
+ data.Walls.map((t: Wall) => {
|
|
|
|
+ this.addWall(t);
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ if (data.Columns) {
|
|
|
|
+ data.Columns.map((t: Column) => {
|
|
|
|
+ this.addColumn(t);
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ if (data.Windows) {
|
|
|
|
+ data.Windows.map((t: Casement) => {
|
|
|
|
+ this.addCasement(t);
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ if (data.VirtualWalls) {
|
|
|
|
+ data.VirtualWalls.map((t: VirtualWall) => {
|
|
|
|
+ this.addVirtualWall(t);
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ if (data.Doors) {
|
|
|
|
+ data.Doors.map((t: Door) => {
|
|
|
|
+ this.addDoor(t);
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ if (data.Spaces) {
|
|
|
|
+ data.Spaces.map((t: Space) => {
|
|
|
|
+ this.addSpace(t);
|
|
|
|
+ });
|
|
|
|
+ }
|
|
} // Function addBaseMapItem
|
|
} // Function addBaseMapItem
|
|
|
|
|
|
/**
|
|
/**
|