earthsdk3-ue 0.0.1-beta.0.1 → 0.0.1-beta.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
- /*! earthsdk3-ue(0.0.1-beta.0.1-f2ceb5ed-2024-11-25T02:42:08.000Z) 版权所有@北京西部世界科技有限公司 */
1
+ /*! earthsdk3-ue(0.0.1-beta.0.3-cf3e1865-2024-11-28T08:09:04.000Z) 版权所有@北京西部世界科技有限公司 */
2
2
  (function webpackUniversalModuleDefinition(root, factory) {
3
3
  if(typeof exports === 'object' && typeof module === 'object')
4
4
  module.exports = factory(require("earthsdk3"), require("xbsj-base"));
@@ -8837,13 +8837,13 @@ var UeCloudViewer = /** @class */ (function (_super) {
8837
8837
  _this._ueViewer = _ueViewer;
8838
8838
  _this._videoInitialized = _this.dv((0, xbsj_base_1.react)(false));
8839
8839
  _this._webRtcConnected = _this.dv((0, xbsj_base_1.react)(false));
8840
+ _this._webSocketOpen = _this.dv((0, xbsj_base_1.react)(false));
8840
8841
  _this._ueFuncResultWithIdsEvent = _this.dv(new xbsj_base_1.Event());
8841
8842
  _this._ueFuncWithIdAndResultCallbacks = [];
8842
8843
  _this._waitingUeFuncIdAndResultCallbacks = new Map();
8843
8844
  _this._waitingUeCalls = new Set();
8844
8845
  _this._ueEvent = _this.dv(new xbsj_base_1.Event());
8845
8846
  _this._errorEvent = _this.dv(new xbsj_base_1.Event());
8846
- _this._closeEvent = _this.dv(new xbsj_base_1.Event());
8847
8847
  _this._readyEvent = _this.dv(new xbsj_base_1.Event());
8848
8848
  var ueViewer = _this._ueViewer;
8849
8849
  var ue5ViewerWrapper = _this.dv(new WebRtcManagerWrapper_1.WebRtcManagerWrapper(container, wsUri, esmsgWsUri));
@@ -8854,32 +8854,40 @@ var UeCloudViewer = /** @class */ (function (_super) {
8854
8854
  _this.d(ueViewer.debugChanged.don(update));
8855
8855
  }
8856
8856
  {
8857
- var allReadyEvent = _this.dv((0, xbsj_base_1.createNextAnimateFrameEvent)(_this._videoInitialized.changed, _this._webRtcConnected.changed));
8857
+ var ready_1 = false;
8858
+ var allReadyEvent = _this.dv((0, xbsj_base_1.createNextAnimateFrameEvent)(_this._videoInitialized.changed, _this._webRtcConnected.changed, _this._webSocketOpen.changed));
8858
8859
  _this.d(allReadyEvent.don(function () {
8860
+ if (ready_1)
8861
+ return;
8859
8862
  var webSocketReady = _this._ue5ViewerWrapper.instance.webSocketReady;
8860
- if (_this._videoInitialized.value && _this._webRtcConnected.value && webSocketReady) {
8863
+ if (_this.videoInitialized && _this.webRtcConnected && webSocketReady) {
8861
8864
  _this._readyEvent.emit();
8865
+ ready_1 = true;
8866
+ console.log("%c[EarthSDK videoInitialized && webRtcConnected && webSocketReady]", "background: #a6ec99; color: black");
8867
+ var param = { eventType: 'init', params: {} };
8868
+ _this._ue5ViewerWrapper.emitUIInteractionForBigData(param);
8869
+ }
8870
+ else {
8871
+ console.warn('webSocketReady', webSocketReady);
8872
+ ready_1 = false;
8862
8873
  }
8863
8874
  }));
8864
8875
  }
8865
- //'videoInitialized', 'webRtcConnected', 'webRtcDisconnected', 'webRtcFailed', 'webSocketError', 'webSocketClose','ueevent'
8876
+ //'videoInitialized', 'webRtcConnected', 'webRtcDisconnected',
8877
+ //'webRtcFailed', 'webSocketError', 'webSocketClose', 'ueevent'
8866
8878
  _this.d(ue5ViewerWrapper.event.don(function (eventName, eventDetailStr) {
8867
8879
  var e_1, _a;
8868
- if (eventName === 'webRtcFailed' || eventName === 'webSocketError') {
8880
+ if (eventName === 'errorEvent') {
8869
8881
  _this._errorEvent.emit(eventDetailStr);
8870
- // console.log(`[${eventName}]: 像素流连接错误或消息通信连接错误!`)
8871
- }
8872
- else if (eventName === 'webRtcDisconnected' || eventName === 'webSocketClose') {
8873
- // console.log(`[${eventName}]: 像素流连接断开或消息通信连接关闭!`)
8874
- _this._closeEvent.emit(eventDetailStr);
8875
8882
  }
8876
8883
  else if (eventName === 'videoInitialized') {
8877
8884
  _this._videoInitialized.value = true;
8878
- // console.log('[videoInitialized]: 视频流初始化成功!');
8879
8885
  }
8880
8886
  else if (eventName === 'webRtcConnected') {
8881
8887
  _this._webRtcConnected.value = true;
8882
- // console.log('[webRtcConnected]: 像素流连接成功!');
8888
+ }
8889
+ else if (eventName === 'webSocketOpen') {
8890
+ _this._webSocketOpen.value = true;
8883
8891
  }
8884
8892
  else if (eventName === 'ueevent') {
8885
8893
  var detailJson = JSON.parse(eventDetailStr);
@@ -8920,7 +8928,7 @@ var UeCloudViewer = /** @class */ (function (_super) {
8920
8928
  }
8921
8929
  ratio_1 = ueViewer.resolutionScale;
8922
8930
  //分辨率缩放比例
8923
- ue5ViewerWrapper.resize(lastWidth_1 * ratio_1, lastHeight_1 * ratio_1);
8931
+ ue5ViewerWrapper.resize(lastWidth_1 / ratio_1, lastHeight_1 / ratio_1);
8924
8932
  });
8925
8933
  }
8926
8934
  _this.d(_this._ueFuncResultWithIdsEvent.don(function (ueFuncResultWithIds) {
@@ -9030,6 +9038,11 @@ var UeCloudViewer = /** @class */ (function (_super) {
9030
9038
  enumerable: false,
9031
9039
  configurable: true
9032
9040
  });
9041
+ Object.defineProperty(UeCloudViewer.prototype, "webSocketOpen", {
9042
+ get: function () { return this._webSocketOpen.value; },
9043
+ enumerable: false,
9044
+ configurable: true
9045
+ });
9033
9046
  Object.defineProperty(UeCloudViewer.prototype, "ue5ViewerWrapper", {
9034
9047
  get: function () { return this._ue5ViewerWrapper; },
9035
9048
  enumerable: false,
@@ -9040,21 +9053,11 @@ var UeCloudViewer = /** @class */ (function (_super) {
9040
9053
  enumerable: false,
9041
9054
  configurable: true
9042
9055
  });
9043
- Object.defineProperty(UeCloudViewer.prototype, "closeEvent", {
9044
- get: function () { return this._closeEvent; },
9045
- enumerable: false,
9046
- configurable: true
9047
- });
9048
9056
  Object.defineProperty(UeCloudViewer.prototype, "readyEvent", {
9049
9057
  get: function () { return this._readyEvent; },
9050
9058
  enumerable: false,
9051
9059
  configurable: true
9052
9060
  });
9053
- UeCloudViewer.prototype.disconnect = function () {
9054
- var _a, _b, _c, _d, _e, _f, _g;
9055
- (_c = (_b = (_a = this === null || this === void 0 ? void 0 : this._ue5ViewerWrapper) === null || _a === void 0 ? void 0 : _a.instance) === null || _b === void 0 ? void 0 : _b.pixelStream) === null || _c === void 0 ? void 0 : _c.disconnect();
9056
- (_g = (_f = (_e = (_d = this === null || this === void 0 ? void 0 : this._ue5ViewerWrapper) === null || _d === void 0 ? void 0 : _d.instance) === null || _e === void 0 ? void 0 : _e.pixelStream) === null || _f === void 0 ? void 0 : _f.webSocketController.webSocket) === null || _g === void 0 ? void 0 : _g.close();
9057
- };
9058
9061
  UeCloudViewer.prototype.callUeFunc = function (ueFunc) {
9059
9062
  var _this = this;
9060
9063
  return new Promise(function (resolve) {
@@ -9164,12 +9167,8 @@ var WebRtcManager = /** @class */ (function (_super) {
9164
9167
  _this._container = _container;
9165
9168
  _this._option = _option;
9166
9169
  _this.debug = false;
9167
- _this._videoInitialized = _this.dv(new xbsj_base_1.Event());
9168
- _this._webRtcConnected = _this.dv(new xbsj_base_1.Event());
9169
- _this._webRtcDisconnected = _this.dv(new xbsj_base_1.Event());
9170
- _this._webRtcFailed = _this.dv(new xbsj_base_1.Event());
9171
9170
  _this._error = _this.dv(new xbsj_base_1.Event());
9172
- _this._close = _this.dv(new xbsj_base_1.Event());
9171
+ _this._connected = _this.dv(new xbsj_base_1.Event());
9173
9172
  _this._ueevent = _this.dv(new xbsj_base_1.Event());
9174
9173
  //发送时记录消息,回调函数中对应消息后再删除
9175
9174
  _this.uiInteractionCallbacks = new Map();
@@ -9180,6 +9179,7 @@ var WebRtcManager = /** @class */ (function (_super) {
9180
9179
  AutoConnect: true,
9181
9180
  StartVideoMuted: true,
9182
9181
  WaitForStreamer: true,
9182
+ SuppressBrowserKeys: false,
9183
9183
  ss: _this._option.ws,
9184
9184
  }
9185
9185
  });
@@ -9187,22 +9187,16 @@ var WebRtcManager = /** @class */ (function (_super) {
9187
9187
  config.setFlagEnabled(lib_pixelstreamingfrontend_ue5_4_1.Flags.HoveringMouseMode, true);
9188
9188
  config.setFlagEnabled(lib_pixelstreamingfrontend_ue5_4_1.Flags.MatchViewportResolution, true);
9189
9189
  //这个重复次数,有可能服务端的streamer还未连接
9190
- config.setNumericSetting(lib_pixelstreamingfrontend_ue5_4_1.NumericParameters.MaxReconnectAttempts, 100);
9190
+ config.setNumericSetting(lib_pixelstreamingfrontend_ue5_4_1.NumericParameters.MaxReconnectAttempts, 0);
9191
9191
  _this._pixelStream = new lib_pixelstreamingfrontend_ue5_4_1.PixelStreaming(config, { videoElementParent: _this.container });
9192
- _this.d(function () {
9193
- _this._pixelStream.disconnect();
9194
- //@ts-ignore
9195
- _this._pixelStream = undefined;
9196
- });
9197
- //@ts-ignore
9198
- _this._webRtcController = _this._pixelStream._webRtcController;
9199
- _this._ws = _this._option.ws;
9200
9192
  //input事件覆盖
9201
9193
  {
9202
9194
  // const setSendData = () => {
9203
9195
  var webSocket_1 = _this.pixelStream.webSocketController.webSocket;
9204
- var originSendData_1 = _this.webRtcController.sendMessageController.dataChannelSender.sendData;
9205
- _this.webRtcController.sendMessageController.dataChannelSender.constructor.prototype.sendData = function (data) {
9196
+ //@ts-ignore
9197
+ var originSendData_1 = _this._pixelStream._webRtcController.sendMessageController.dataChannelSender.sendData;
9198
+ //@ts-ignore
9199
+ _this._pixelStream._webRtcController.sendMessageController.dataChannelSender.constructor.prototype.sendData = function (data) {
9206
9200
  // try {
9207
9201
  if (webSocket_1) {
9208
9202
  webSocket_1.send((0, createMsgInput_1.createMsgInput)(data));
@@ -9218,17 +9212,22 @@ var WebRtcManager = /** @class */ (function (_super) {
9218
9212
  // }
9219
9213
  };
9220
9214
  // }
9221
- // this.pixelStream.webSocketController.webSocket.addEventListener("open", setSendData);
9222
- // this.d(() => { this.pixelStream.webSocketController.webSocket.removeEventListener('open', setSendData) })
9223
9215
  }
9224
9216
  {
9225
- var events = ['error', 'close'];
9217
+ var events = ['error', 'close', 'open'];
9226
9218
  events.forEach(function (eventName) {
9227
- var func = function (e) {
9219
+ var func = function () {
9228
9220
  if (_this.isDestroyed())
9229
9221
  return;
9230
- //@ts-ignore
9231
- _this[eventName].emit(eventName);
9222
+ if (eventName === 'open') {
9223
+ _this.connected.emit('webSocketOpen');
9224
+ }
9225
+ else if (eventName === 'close') {
9226
+ _this.error.emit('webSocketClose');
9227
+ }
9228
+ else if (eventName === 'error') {
9229
+ _this.error.emit('webSocketError');
9230
+ }
9232
9231
  };
9233
9232
  _this.pixelStream.webSocketController.webSocket.addEventListener(eventName, func);
9234
9233
  _this.d(function () { _this.pixelStream.webSocketController.webSocket.removeEventListener(eventName, func); });
@@ -9241,8 +9240,13 @@ var WebRtcManager = /** @class */ (function (_super) {
9241
9240
  var func = function () {
9242
9241
  if (_this.isDestroyed())
9243
9242
  return;
9244
- //@ts-ignore
9245
- _this[eventName].emit(eventName);
9243
+ if (eventName === 'webRtcConnected' || eventName === 'videoInitialized') {
9244
+ _this.connected.emit(eventName);
9245
+ }
9246
+ else if (eventName === 'webRtcDisconnected' || eventName === 'webRtcFailed') {
9247
+ _this.error.emit(eventName);
9248
+ _this.pixelStream.disconnect();
9249
+ }
9246
9250
  };
9247
9251
  _this.pixelStream.addEventListener(eventName, func);
9248
9252
  _this.d(function () { _this.pixelStream.removeEventListener(eventName, func); });
@@ -9253,10 +9257,7 @@ var WebRtcManager = /** @class */ (function (_super) {
9253
9257
  _this.pixelStream.addResponseEventListener("handle_responses", function (decodedString) {
9254
9258
  _this.processResponse(decodedString);
9255
9259
  });
9256
- _this.d(function () {
9257
- _this.pixelStream.disconnect();
9258
- _this.pixelStream.removeResponseEventListener('handle_responses');
9259
- });
9260
+ _this.d(function () { _this.pixelStream.removeResponseEventListener('handle_responses'); });
9260
9261
  // //处理ue事件
9261
9262
  // this.pixelStream.addResponseEventListener('esueviewer', (response) => {
9262
9263
  // console.warn("接收到消息 esueviewer", response);
@@ -9267,33 +9268,13 @@ var WebRtcManager = /** @class */ (function (_super) {
9267
9268
  }
9268
9269
  return _this;
9269
9270
  }
9270
- Object.defineProperty(WebRtcManager.prototype, "videoInitialized", {
9271
- get: function () { return this._videoInitialized; },
9272
- enumerable: false,
9273
- configurable: true
9274
- });
9275
- Object.defineProperty(WebRtcManager.prototype, "webRtcConnected", {
9276
- get: function () { return this._webRtcConnected; },
9277
- enumerable: false,
9278
- configurable: true
9279
- });
9280
- Object.defineProperty(WebRtcManager.prototype, "webRtcDisconnected", {
9281
- get: function () { return this._webRtcDisconnected; },
9282
- enumerable: false,
9283
- configurable: true
9284
- });
9285
- Object.defineProperty(WebRtcManager.prototype, "webRtcFailed", {
9286
- get: function () { return this._webRtcFailed; },
9287
- enumerable: false,
9288
- configurable: true
9289
- });
9290
9271
  Object.defineProperty(WebRtcManager.prototype, "error", {
9291
9272
  get: function () { return this._error; },
9292
9273
  enumerable: false,
9293
9274
  configurable: true
9294
9275
  });
9295
- Object.defineProperty(WebRtcManager.prototype, "close", {
9296
- get: function () { return this._close; },
9276
+ Object.defineProperty(WebRtcManager.prototype, "connected", {
9277
+ get: function () { return this._connected; },
9297
9278
  enumerable: false,
9298
9279
  configurable: true
9299
9280
  });
@@ -9307,21 +9288,11 @@ var WebRtcManager = /** @class */ (function (_super) {
9307
9288
  enumerable: false,
9308
9289
  configurable: true
9309
9290
  });
9310
- Object.defineProperty(WebRtcManager.prototype, "ws", {
9311
- get: function () { return this._ws; },
9312
- enumerable: false,
9313
- configurable: true
9314
- });
9315
9291
  Object.defineProperty(WebRtcManager.prototype, "pixelStream", {
9316
9292
  get: function () { return this._pixelStream; },
9317
9293
  enumerable: false,
9318
9294
  configurable: true
9319
9295
  });
9320
- Object.defineProperty(WebRtcManager.prototype, "webRtcController", {
9321
- get: function () { return this._webRtcController; },
9322
- enumerable: false,
9323
- configurable: true
9324
- });
9325
9296
  Object.defineProperty(WebRtcManager.prototype, "webSocketReady", {
9326
9297
  get: function () { return this.pixelStream.webSocketController.webSocket.readyState === 1; },
9327
9298
  enumerable: false,
@@ -9412,7 +9383,8 @@ var WebRtcManager = /** @class */ (function (_super) {
9412
9383
  return true;
9413
9384
  };
9414
9385
  WebRtcManager.prototype.getVideoSize = function () {
9415
- var ve = this.webRtcController.videoPlayer.getVideoElement();
9386
+ //@ts-ignore
9387
+ var ve = this._pixelStream._webRtcController.videoPlayer.getVideoElement();
9416
9388
  return { width: ve.videoWidth, height: ve.videoHeight };
9417
9389
  };
9418
9390
  //像素流命令
@@ -9498,23 +9470,13 @@ var WebRtcManagerWrapper = /** @class */ (function (_super) {
9498
9470
  _this._event = _this.dv(new xbsj_base_1.Event());
9499
9471
  _this._instance = _this.dv(new WebRtcManager_1.WebRtcManager(_this._container, { ws: _this._wsuri }));
9500
9472
  {
9501
- _this.d(_this._instance.videoInitialized.don(function (str) {
9502
- _this._event.emit('videoInitialized', str);
9503
- }));
9504
- _this.d(_this._instance.webRtcConnected.don(function (str) {
9505
- _this._event.emit('webRtcConnected', str);
9506
- }));
9507
- _this.d(_this._instance.webRtcDisconnected.don(function (str) {
9508
- _this._event.emit('webRtcDisconnected', str);
9509
- }));
9510
- _this.d(_this._instance.webRtcFailed.don(function (str) {
9511
- _this._event.emit('webRtcFailed', str);
9473
+ _this.d(_this._instance.connected.don(function (str) {
9474
+ _this._event.emit(str, str);
9475
+ console.log("%c[EarthSDK ".concat(str, "]"), "background: #a6ec99; color: black");
9512
9476
  }));
9513
9477
  _this.d(_this._instance.error.don(function (str) {
9514
- _this._event.emit('webSocketError', str);
9515
- }));
9516
- _this.d(_this._instance.close.don(function (str) {
9517
- _this._event.emit('webSocketClose', str);
9478
+ _this._event.emit('errorEvent', str);
9479
+ console.log("%c[EarthSDK ".concat(str, "]"), "background: red; color: black");
9518
9480
  }));
9519
9481
  _this.d(_this._instance.ueevent.don(function (str) {
9520
9482
  _this._event.emit('ueevent', str);
@@ -9580,7 +9542,7 @@ exports.WebRtcManagerWrapper = WebRtcManagerWrapper;
9580
9542
  "use strict";
9581
9543
 
9582
9544
  Object.defineProperty(exports, "__esModule", ({ value: true }));
9583
- exports.printLog = exports.getContainer = exports.createMsgInput = exports.arrayBufferToBase64 = void 0;
9545
+ exports.getContainer = exports.createMsgInput = exports.arrayBufferToBase64 = void 0;
9584
9546
  function arrayBufferToBase64(buffer) {
9585
9547
  var binary = '';
9586
9548
  var bytes = new Uint8Array(buffer);
@@ -9608,14 +9570,6 @@ function getContainer(container) {
9608
9570
  }
9609
9571
  }
9610
9572
  exports.getContainer = getContainer;
9611
- function printLog(type, msgType, msg) {
9612
- var color = type === 'err' ? '#cd4639' : '#64b587';
9613
- var bgcolor = type === 'err' ? '#cd4639' : '#64b587';
9614
- console.group("%c[".concat(msgType, "]"), "background-color:".concat(bgcolor, ";color:#fff;font-weight:bold;padding:4px;border-radius:5px;"));
9615
- console.log("%c".concat(msg), "border:1px dashed ".concat(color, ";border-radius:5px;padding:10px;line-height:25px;color:").concat(color, ";"));
9616
- console.groupEnd();
9617
- }
9618
- exports.printLog = printLog;
9619
9573
 
9620
9574
 
9621
9575
  /***/ }),
@@ -9828,7 +9782,7 @@ var ESUeViewer = /** @class */ (function (_super) {
9828
9782
  return [4 /*yield*/, (0, CallUeFuncs_1.changeNavigationModeCallFunc)(this.viewer, parms)];
9829
9783
  case 1:
9830
9784
  res = _b.sent();
9831
- (res && !res.error) && ((this.navigationMode = parms.mode));
9785
+ (res && !res.error) && ((this._navigationMode.value = parms.mode));
9832
9786
  return [2 /*return*/, res];
9833
9787
  }
9834
9788
  });
@@ -10515,7 +10469,7 @@ var ESUeViewer = /** @class */ (function (_super) {
10515
10469
  return [4 /*yield*/, (0, CallUeFuncs_1.changeNavigationModeCallFunc)(this.viewer, opt)];
10516
10470
  case 1:
10517
10471
  res = _b.sent();
10518
- (res && !res.error) && (this.navigationMode = opt.mode);
10472
+ (res && !res.error) && (this._navigationMode.value = opt.mode);
10519
10473
  return [2 /*return*/, res];
10520
10474
  }
10521
10475
  });
@@ -10538,7 +10492,7 @@ var ESUeViewer = /** @class */ (function (_super) {
10538
10492
  return [4 /*yield*/, (0, CallUeFuncs_1.changeNavigationModeCallFunc)(this.viewer, opt)];
10539
10493
  case 1:
10540
10494
  res = _b.sent();
10541
- (res && !res.error) && (this.navigationMode = opt.mode);
10495
+ (res && !res.error) && (this._navigationMode.value = opt.mode);
10542
10496
  return [2 /*return*/, res];
10543
10497
  }
10544
10498
  });
@@ -10566,7 +10520,7 @@ var ESUeViewer = /** @class */ (function (_super) {
10566
10520
  return [4 /*yield*/, (0, CallUeFuncs_1.changeNavigationModeCallFunc)(this.viewer, opt)];
10567
10521
  case 1:
10568
10522
  res = _b.sent();
10569
- (res && !res.error) && (this.navigationMode = opt.mode);
10523
+ (res && !res.error) && (this._navigationMode.value = opt.mode);
10570
10524
  return [2 /*return*/, res];
10571
10525
  }
10572
10526
  });
@@ -10599,7 +10553,7 @@ var ESUeViewer = /** @class */ (function (_super) {
10599
10553
  return [4 /*yield*/, (0, CallUeFuncs_1.changeNavigationModeCallFunc)(this.viewer, opt)];
10600
10554
  case 1:
10601
10555
  res = _b.sent();
10602
- (res && !res.error) && (this.navigationMode = opt.mode);
10556
+ (res && !res.error) && (this._navigationMode.value = opt.mode);
10603
10557
  return [2 /*return*/, res];
10604
10558
  }
10605
10559
  });
@@ -10622,7 +10576,7 @@ var ESUeViewer = /** @class */ (function (_super) {
10622
10576
  return [4 /*yield*/, (0, CallUeFuncs_1.changeNavigationModeCallFunc)(this.viewer, opt)];
10623
10577
  case 1:
10624
10578
  res = _b.sent();
10625
- (res && !res.error) && (this.navigationMode = opt.mode);
10579
+ (res && !res.error) && (this._navigationMode.value = opt.mode);
10626
10580
  return [2 /*return*/, res];
10627
10581
  }
10628
10582
  });
@@ -10660,7 +10614,7 @@ var ESUeViewer = /** @class */ (function (_super) {
10660
10614
  return [4 /*yield*/, (0, CallUeFuncs_1.changeNavigationModeCallFunc)(this.viewer, opt)];
10661
10615
  case 1:
10662
10616
  res = _b.sent();
10663
- (res && !res.error) && (this.navigationMode = opt.mode);
10617
+ (res && !res.error) && (this._navigationMode.value = opt.mode);
10664
10618
  return [2 /*return*/, res];
10665
10619
  }
10666
10620
  });
@@ -10688,7 +10642,7 @@ var ESUeViewer = /** @class */ (function (_super) {
10688
10642
  return [4 /*yield*/, (0, CallUeFuncs_1.changeNavigationModeCallFunc)(this.viewer, opt)];
10689
10643
  case 1:
10690
10644
  res = _b.sent();
10691
- (res && !res.error) && (this.navigationMode = opt.mode);
10645
+ (res && !res.error) && (this._navigationMode.value = opt.mode);
10692
10646
  return [2 /*return*/, res];
10693
10647
  }
10694
10648
  });
@@ -10821,7 +10775,9 @@ var ESUeViewer = /** @class */ (function (_super) {
10821
10775
  }(earthsdk3_1.ESViewer));
10822
10776
  exports.ESUeViewer = ESUeViewer;
10823
10777
  (function (ESUeViewer) {
10824
- ESUeViewer.createDefaultProps = function () { return (__assign(__assign({}, (0, ReactProps_1.createReactProps)()), { resolutionScale: 1, autoReconnect: false, propChangedListening: undefined, objectEventListening: undefined, widgetEventListening: undefined, speechRecognitionListening: undefined, customMessageListening: undefined })); };
10778
+ ESUeViewer.createDefaultProps = function () { return (__assign(__assign(__assign({}, earthsdk3_1.ESViewer.createDefaultProps()), (0, ReactProps_1.createReactProps)()), {
10779
+ //分辨率缩放比例
10780
+ resolutionScale: 1, autoReconnect: false, propChangedListening: undefined, objectEventListening: undefined, widgetEventListening: undefined, speechRecognitionListening: undefined, customMessageListening: undefined })); };
10825
10781
  })(ESUeViewer = exports.ESUeViewer || (exports.ESUeViewer = {}));
10826
10782
  exports.ESUeViewer = ESUeViewer;
10827
10783
  (0, xbsj_base_1.extendClassProps)(ESUeViewer.prototype, ESUeViewer.createDefaultProps);
@@ -10889,15 +10845,13 @@ var xbsj_base_1 = __webpack_require__(/*! xbsj-base */ "xbsj-base");
10889
10845
  var index_1 = __webpack_require__(/*! ../index */ "./src/ESUeViewer/index.ts");
10890
10846
  var earthsdk3_1 = __webpack_require__(/*! earthsdk3 */ "earthsdk3");
10891
10847
  //全局属性,消息通信的所有属性
10892
- var createReactProps = function () { return (__assign(__assign({}, earthsdk3_1.ESViewer.createDefaultProps()), { geoReferenceOrigin: (0, xbsj_base_1.reactArrayWithUndefined)(undefined), keepWorldOriginNearCamera: undefined, useCache: undefined, widgetInteractionDistance: undefined, memReportInterval: undefined,
10848
+ var createReactProps = function () { return (__assign(__assign({}, earthsdk3_1.ESViewer.createCommonProps()), {
10849
+ //语音模式
10850
+ apiKey: '', apiUrl: '', secretKey: '', speechVoiceMode: '', geoReferenceOrigin: (0, xbsj_base_1.reactArrayWithUndefined)(undefined), keepWorldOriginNearCamera: undefined, useCache: undefined, widgetInteractionDistance: undefined, memReportInterval: undefined,
10893
10851
  // 天气和后处理参数
10894
- sceneControlled: undefined, brightness: undefined, emissiveIntensity: undefined,
10895
- // 旧版本需要用到
10896
- sunIntensity: undefined, sunskyControlled: undefined, ev100Ratio: undefined, statusUpdateInterval: undefined, baseUrl: undefined })); };
10852
+ sceneControlled: undefined, brightness: undefined, emissiveIntensity: undefined, statusUpdateInterval: undefined, baseUrl: undefined })); };
10897
10853
  exports.createReactProps = createReactProps;
10898
- var reactPropDefaults = __assign(__assign({}, earthsdk3_1.ESViewer.defaults), { geoReferenceOrigin: undefined, keepWorldOriginNearCamera: false, useCache: true, widgetInteractionDistance: 200, memReportInterval: 10, sceneControlled: true, brightness: 0, emissiveIntensity: 1,
10899
- // 旧版本需要用到
10900
- sunIntensity: 111000, sunskyControlled: true, ev100Ratio: 0.01, statusUpdateInterval: 0.5, baseUrl: (_a = window.location.href) !== null && _a !== void 0 ? _a : '' });
10854
+ var reactPropDefaults = __assign(__assign({}, earthsdk3_1.ESViewer.defaults), { geoReferenceOrigin: undefined, keepWorldOriginNearCamera: false, useCache: true, widgetInteractionDistance: 200, memReportInterval: 10, sceneControlled: true, brightness: 0, emissiveIntensity: 1, statusUpdateInterval: 0.5, baseUrl: (_a = window.location.href) !== null && _a !== void 0 ? _a : '' });
10901
10855
  exports.reactPropDefaults = reactPropDefaults;
10902
10856
  function getGlobalPropsKey() {
10903
10857
  var reactProps = createReactProps();
@@ -11226,7 +11180,6 @@ var UeCloudViewer_1 = __webpack_require__(/*! ../CustomPixelStream/UeCloudViewer
11226
11180
  var UeLocalViewer_1 = __webpack_require__(/*! ./UeLocalViewer */ "./src/ESUeViewer/inner/UeLocalViewer.ts");
11227
11181
  var ViewerInstance_1 = __webpack_require__(/*! ./ViewerInstance */ "./src/ESUeViewer/inner/ViewerInstance.ts");
11228
11182
  var ViewerLocalInstance_1 = __webpack_require__(/*! ./ViewerLocalInstance */ "./src/ESUeViewer/inner/ViewerLocalInstance.ts");
11229
- var createMsgInput_1 = __webpack_require__(/*! ../CustomPixelStream/createMsgInput */ "./src/ESUeViewer/CustomPixelStream/createMsgInput.ts");
11230
11183
  var ViewerCreating = /** @class */ (function (_super) {
11231
11184
  __extends(ViewerCreating, _super);
11232
11185
  function ViewerCreating(container, params, ueViewer) {
@@ -11261,17 +11214,17 @@ var ViewerCreating = /** @class */ (function (_super) {
11261
11214
  (container && videoContainer_1) && container.removeChild(videoContainer_1) && (videoContainer_1 = undefined);
11262
11215
  });
11263
11216
  var createViewerProcessing_1 = _this.dv((0, xbsj_base_1.createProcessingFromAsyncFunc)(function (cancelsManager) { return __awaiter(_this, void 0, void 0, function () {
11264
- var wsserver, wsesmsg, _a, ws, esmsg, offsetWidth, offsetHeight, _b, uri, app, token, tokenStr, resParam, response, resultJson, server, esmsg, cloudViewer;
11217
+ var wsserver, wsesmsg, _a, ws, esmsg, offsetWidth_1, offsetHeight_1, _b, uri, app, token, tokenStr, resParam, response, resultJson, server, esmsg, cloudViewer, offsetWidth, offsetHeight;
11265
11218
  var _this = this;
11266
11219
  return __generator(this, function (_c) {
11267
11220
  switch (_c.label) {
11268
11221
  case 0:
11269
11222
  {
11270
- ueViewer.viewer && ueViewer.viewer.destroy();
11223
+ ueViewer.viewer && (!ueViewer.viewer.isDestroyed()) && ueViewer.viewer.destroy();
11271
11224
  ueViewer.viewer = undefined;
11272
11225
  videoContainer_1 && container.removeChild(videoContainer_1) && (videoContainer_1 = undefined);
11273
11226
  videoContainer_1 = document.createElement('div');
11274
- videoContainer_1.setAttribute('earthsdk2-ue', 'earthsdk2-ue-videoContainer');
11227
+ videoContainer_1.setAttribute('earthsdk3-ue', 'earthsdk3-ue-videoContainer');
11275
11228
  videoContainer_1.style.cssText = "position:relative; height: 100%;width:100%;";
11276
11229
  container.appendChild(videoContainer_1);
11277
11230
  }
@@ -11281,10 +11234,10 @@ var ViewerCreating = /** @class */ (function (_super) {
11281
11234
  wsesmsg = esmsg;
11282
11235
  }
11283
11236
  if (!(hasPorp(params.options, 'uri') && hasPorp(params.options, 'app'))) return [3 /*break*/, 3];
11284
- offsetWidth = videoContainer_1.offsetWidth, offsetHeight = videoContainer_1.offsetHeight;
11237
+ offsetWidth_1 = videoContainer_1.offsetWidth, offsetHeight_1 = videoContainer_1.offsetHeight;
11285
11238
  _b = params.options, uri = _b.uri, app = _b.app, token = _b.token;
11286
11239
  tokenStr = token ? "?essstoken=".concat(token) : '';
11287
- resParam = "/".concat(app, "/").concat(offsetWidth !== null && offsetWidth !== void 0 ? offsetWidth : 1920, "/").concat(offsetHeight !== null && offsetHeight !== void 0 ? offsetHeight : 1080) + tokenStr;
11240
+ resParam = "/".concat(app, "/").concat(offsetWidth_1 !== null && offsetWidth_1 !== void 0 ? offsetWidth_1 : 1920, "/").concat(offsetHeight_1 !== null && offsetHeight_1 !== void 0 ? offsetHeight_1 : 1080) + tokenStr;
11288
11241
  console.log("\u8BF7\u6C42\u4FE1\u4EE4\u670D\u52A1\u5668: ".concat(uri, "instance").concat(resParam));
11289
11242
  return [4 /*yield*/, cancelsManager.promise(fetch("".concat(uri, "instance").concat(resParam), { method: "GET", }))];
11290
11243
  case 1:
@@ -11296,7 +11249,6 @@ var ViewerCreating = /** @class */ (function (_super) {
11296
11249
  ueViewer.setStatus('Error');
11297
11250
  ueViewer.setStatusLog("\u4FE1\u4EE4\u670D\u52A1\u5668\u8BF7\u6C42\u5931\u8D25 ".concat(resultJson.status));
11298
11251
  this._reconnectEvent.emit(undefined);
11299
- (0, createMsgInput_1.printLog)('err', '信令服务器错误', resultJson.status);
11300
11252
  return [2 /*return*/];
11301
11253
  }
11302
11254
  server = resultJson.server, esmsg = resultJson.esmsg;
@@ -11306,40 +11258,27 @@ var ViewerCreating = /** @class */ (function (_super) {
11306
11258
  _c.label = 3;
11307
11259
  case 3:
11308
11260
  cloudViewer = this.dv(new UeCloudViewer_1.UeCloudViewer(videoContainer_1, wsserver, wsesmsg, ueViewer));
11309
- this.d(function () {
11310
- ueViewer.viewer && ueViewer.viewer.destroy();
11311
- ueViewer.viewer = undefined;
11312
- });
11261
+ this.d(function () { return ueViewer.viewer = undefined; });
11313
11262
  //监听cloudViewer事件
11314
- {
11315
- this.d(cloudViewer.readyEvent.don(function () {
11316
- ueViewer.setStatus('Created');
11317
- ueViewer.setStatusLog('云渲染视口创建成功!');
11318
- (0, createMsgInput_1.printLog)('info', 'readyEvent', '[videoInitialized]:视频流初始化成功! [webRtcConnected]:像素流连接成功! [webSocketReady]: 消息通信连接成功!');
11319
- }));
11320
- this.d(cloudViewer.closeEvent.don(function (str) {
11321
- var errorStr = (str === 'webRtcDisconnected') ? "[webRtcDisconnected]:\u50CF\u7D20\u6D41\u8FDE\u63A5\u4E2D\u65AD!" : "[webSocketClose]:\u6D88\u606F\u901A\u4FE1\u8FDE\u63A5\u5173\u95ED!";
11322
- ueViewer.setStatus('Error');
11323
- ueViewer.setStatusLog(errorStr);
11324
- _this._reconnectEvent.emit(cloudViewer);
11325
- (0, createMsgInput_1.printLog)('err', 'closeEvent', errorStr);
11326
- }));
11327
- this.d(cloudViewer.errorEvent.don(function (str) {
11328
- var errorStr = (str === 'webRtcFailed') ? "[webRtcFailed]:\u50CF\u7D20\u6D41\u8FDE\u63A5\u9519\u8BEF!" : "[webSocketError]:\u6D88\u606F\u901A\u4FE1\u8FDE\u63A5\u9519\u8BEF!";
11329
- ueViewer.setStatus('Error');
11330
- ueViewer.setStatusLog(errorStr);
11331
- _this._reconnectEvent.emit(cloudViewer);
11332
- (0, createMsgInput_1.printLog)('err', 'errorEvent', errorStr);
11333
- }));
11334
- }
11263
+ this.d(cloudViewer.errorEvent.don(function (str) {
11264
+ var errorStr = "[".concat(str, "]:\u50CF\u7D20\u6D41\u8FDE\u63A5\u9519\u8BEF!");
11265
+ ueViewer.setStatus('Error');
11266
+ ueViewer.setStatusLog(errorStr);
11267
+ _this._reconnectEvent.emit(cloudViewer);
11268
+ }));
11335
11269
  return [4 /*yield*/, cancelsManager.promise(new Promise(function (resolve) { return _this.d(cloudViewer.readyEvent.donce(resolve)); }))];
11336
11270
  case 4:
11337
11271
  _c.sent();
11272
+ ueViewer.setStatus('Created');
11273
+ ueViewer.setStatusLog('云渲染视口创建成功!');
11338
11274
  //连接成功时间间隔归零
11339
11275
  intervalTime = 0;
11340
11276
  timer && clearTimeout(timer);
11341
11277
  timer = undefined;
11278
+ offsetWidth = videoContainer_1.offsetWidth, offsetHeight = videoContainer_1.offsetHeight;
11279
+ cloudViewer.ue5ViewerWrapper.resize(offsetWidth, offsetHeight);
11342
11280
  ueViewer.viewer = cloudViewer;
11281
+ this.d(function () { return ueViewer.viewer = undefined; });
11343
11282
  this.dv(new ViewerInstance_1.ViewerInstance(ueViewer, cloudViewer));
11344
11283
  return [2 /*return*/];
11345
11284
  }
@@ -11349,20 +11288,14 @@ var ViewerCreating = /** @class */ (function (_super) {
11349
11288
  _this.d(_this._reconnectEvent.don(function (cviewer) {
11350
11289
  if (timer !== undefined)
11351
11290
  return;
11291
+ cviewer && (!cviewer.isDestroyed()) && cviewer.destroy();
11352
11292
  ueViewer.viewer && (!ueViewer.viewer.isDestroyed()) && ueViewer.viewer.destroy();
11353
11293
  ueViewer.viewer = undefined;
11354
- if (ueViewer.autoReconnect && cviewer) {
11355
- //没有链接成功过也不重连
11356
- if (!cviewer.webRtcConnected || !cviewer.videoInitialized)
11357
- return;
11294
+ if (ueViewer.autoReconnect) {
11358
11295
  ueViewer.setStatus('Reconnecting');
11359
11296
  ueViewer.setStatusLog("\u6B63\u5728\u5C1D\u8BD5\u91CD\u65B0\u8FDE\u63A5...");
11360
- intervalTime = (intervalTime + 10000) > 30000 ? 30000 : (intervalTime + 10000);
11297
+ intervalTime = (intervalTime + 5000) > 30000 ? 30000 : (intervalTime + 5000);
11361
11298
  console.warn("\u95F4\u9694\uFF1A".concat(intervalTime / 1000, "s,\u6B63\u5728\u5C1D\u8BD5\u91CD\u65B0\u8FDE\u63A5..."));
11362
- timer = undefined;
11363
- cviewer && cviewer.disconnect();
11364
- //@ts-ignore
11365
- cviewer.ue5ViewerWrapper.instance._pixelStream = undefined;
11366
11299
  timer = window.setTimeout(function () {
11367
11300
  createViewerProcessing_1.restart();
11368
11301
  }, intervalTime);
@@ -11372,7 +11305,6 @@ var ViewerCreating = /** @class */ (function (_super) {
11372
11305
  ueViewer.setStatus('Error');
11373
11306
  ueViewer.setStatusLog("\u4E91\u6E32\u67D3\u89C6\u53E3\u521B\u5EFA\u5931\u8D25\uFF01");
11374
11307
  _this._reconnectEvent.emit(undefined);
11375
- (0, createMsgInput_1.printLog)('err', '未知错误', "\u4E91\u6E32\u67D3\u89C6\u53E3\u521B\u5EFA\u5931\u8D25! ".concat(error));
11376
11308
  }));
11377
11309
  }
11378
11310
  else {
@@ -16902,6 +16834,325 @@ var UeESLocationMeasurement = /** @class */ (function (_super) {
16902
16834
  exports.UeESLocationMeasurement = UeESLocationMeasurement;
16903
16835
 
16904
16836
 
16837
+ /***/ }),
16838
+
16839
+ /***/ "./src/UeObjects/general/UeESNavigator/index.ts":
16840
+ /*!******************************************************!*\
16841
+ !*** ./src/UeObjects/general/UeESNavigator/index.ts ***!
16842
+ \******************************************************/
16843
+ /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
16844
+
16845
+ "use strict";
16846
+
16847
+ var __extends = (this && this.__extends) || (function () {
16848
+ var extendStatics = function (d, b) {
16849
+ extendStatics = Object.setPrototypeOf ||
16850
+ ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
16851
+ function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
16852
+ return extendStatics(d, b);
16853
+ };
16854
+ return function (d, b) {
16855
+ if (typeof b !== "function" && b !== null)
16856
+ throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
16857
+ extendStatics(d, b);
16858
+ function __() { this.constructor = d; }
16859
+ d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
16860
+ };
16861
+ })();
16862
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
16863
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
16864
+ return new (P || (P = Promise))(function (resolve, reject) {
16865
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
16866
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
16867
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
16868
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
16869
+ });
16870
+ };
16871
+ var __generator = (this && this.__generator) || function (thisArg, body) {
16872
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
16873
+ return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
16874
+ function verb(n) { return function (v) { return step([n, v]); }; }
16875
+ function step(op) {
16876
+ if (f) throw new TypeError("Generator is already executing.");
16877
+ while (g && (g = 0, op[0] && (_ = 0)), _) try {
16878
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
16879
+ if (y = 0, t) op = [op[0] & 2, t.value];
16880
+ switch (op[0]) {
16881
+ case 0: case 1: t = op; break;
16882
+ case 4: _.label++; return { value: op[1], done: false };
16883
+ case 5: _.label++; y = op[1]; op = [0]; continue;
16884
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
16885
+ default:
16886
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
16887
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
16888
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
16889
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
16890
+ if (t[2]) _.ops.pop();
16891
+ _.trys.pop(); continue;
16892
+ }
16893
+ op = body.call(thisArg, _);
16894
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
16895
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
16896
+ }
16897
+ };
16898
+ var __read = (this && this.__read) || function (o, n) {
16899
+ var m = typeof Symbol === "function" && o[Symbol.iterator];
16900
+ if (!m) return o;
16901
+ var i = m.call(o), r, ar = [], e;
16902
+ try {
16903
+ while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
16904
+ }
16905
+ catch (error) { e = { error: error }; }
16906
+ finally {
16907
+ try {
16908
+ if (r && !r.done && (m = i["return"])) m.call(i);
16909
+ }
16910
+ finally { if (e) throw e.error; }
16911
+ }
16912
+ return ar;
16913
+ };
16914
+ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
16915
+ if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
16916
+ if (ar || !(i in from)) {
16917
+ if (!ar) ar = Array.prototype.slice.call(from, 0, i);
16918
+ ar[i] = from[i];
16919
+ }
16920
+ }
16921
+ return to.concat(ar || Array.prototype.slice.call(from));
16922
+ };
16923
+ Object.defineProperty(exports, "__esModule", ({ value: true }));
16924
+ exports.UeESNavigator = void 0;
16925
+ var earthsdk3_1 = __webpack_require__(/*! earthsdk3 */ "earthsdk3");
16926
+ var xbsj_base_1 = __webpack_require__(/*! xbsj-base */ "xbsj-base");
16927
+ var url1 = earthsdk3_1.ESSceneObject.context.getStrFromEnv(earthsdk3_1.ESNavigator.defaults.imgUrl);
16928
+ var UeESNavigator = /** @class */ (function (_super) {
16929
+ __extends(UeESNavigator, _super);
16930
+ function UeESNavigator(sceneObject, ueViewer) {
16931
+ var _this = _super.call(this, sceneObject, ueViewer) || this;
16932
+ var viewer = ueViewer.viewer;
16933
+ if (!viewer) {
16934
+ console.warn("viewer is undefined!");
16935
+ return _this;
16936
+ }
16937
+ var customDiv = _this.disposeVar(new earthsdk3_1.ESCustomDiv());
16938
+ ueViewer.add(customDiv);
16939
+ _this.dispose(function () { return ueViewer.delete(customDiv); });
16940
+ _this.dispose((0, xbsj_base_1.track)([customDiv, 'show'], [sceneObject, 'show']));
16941
+ customDiv.instanceClass = /** @class */ (function (_super) {
16942
+ __extends(MyDiv, _super);
16943
+ // subContainer是外部视口的div容器,可以在这里创建自己需要的DOM元素
16944
+ // customDiv指向当前的CustomDiv场景对象
16945
+ // viewer指定当前的视口
16946
+ function MyDiv(_subContainer, customDiv, viewer) {
16947
+ var _this = _super.call(this) || this;
16948
+ _this._subContainer = _subContainer;
16949
+ var div = document.createElement('div');
16950
+ _this._subContainer.appendChild(div);
16951
+ _this.dispose(function () { return _this._subContainer.removeChild(div); });
16952
+ {
16953
+ var a_1 = function () { return __awaiter(_this, void 0, void 0, function () {
16954
+ var res, position, rotation, a;
16955
+ return __generator(this, function (_b) {
16956
+ switch (_b.label) {
16957
+ case 0: return [4 /*yield*/, ueViewer.getCurrentCameraInfo()];
16958
+ case 1:
16959
+ res = _b.sent();
16960
+ position = res === null || res === void 0 ? void 0 : res.position;
16961
+ rotation = res === null || res === void 0 ? void 0 : res.rotation;
16962
+ a = __spreadArray([], __read(rotation), false);
16963
+ a[0] = 360;
16964
+ ueViewer.flyIn(position, a);
16965
+ return [2 /*return*/];
16966
+ }
16967
+ });
16968
+ }); };
16969
+ div.addEventListener('click', a_1);
16970
+ div.style.cursor = 'pointer';
16971
+ _this.dispose(function () { return div.removeEventListener('click', a_1); });
16972
+ }
16973
+ {
16974
+ var update = function () {
16975
+ div.style.width = "".concat(sceneObject.cssSize ? sceneObject.cssSize : earthsdk3_1.ESNavigator.defaults.cssSize, "px");
16976
+ div.style.height = "".concat(sceneObject.cssSize ? sceneObject.cssSize : earthsdk3_1.ESNavigator.defaults.cssSize, "px");
16977
+ };
16978
+ update();
16979
+ sceneObject.dispose(sceneObject.cssSizeChanged.disposableOn(update));
16980
+ }
16981
+ div.style.position = 'fixed';
16982
+ {
16983
+ var update = function () {
16984
+ div.style.top = "".concat(sceneObject.cssPosition ? sceneObject.cssPosition[0] : earthsdk3_1.ESNavigator.defaults.cssPosition[0], "px");
16985
+ div.style.right = "".concat(sceneObject.cssPosition ? sceneObject.cssPosition[1] : earthsdk3_1.ESNavigator.defaults.cssPosition[1], "px");
16986
+ };
16987
+ update();
16988
+ sceneObject.dispose(sceneObject.cssPositionChanged.disposableOn(update));
16989
+ }
16990
+ div.style.transition = ' right 0.4s linear';
16991
+ div.style.cursor = 'pointer';
16992
+ var box = document.createElement('div');
16993
+ div.appendChild(box);
16994
+ _this.dispose(function () { return div.removeChild(box); });
16995
+ box.style.width = '100%';
16996
+ box.style.height = '100%';
16997
+ box.style.position = 'relative';
16998
+ var rbox = document.createElement('img');
16999
+ box.appendChild(rbox);
17000
+ _this.dispose(function () { return box.removeChild(rbox); });
17001
+ rbox.style.width = '100%';
17002
+ rbox.style.height = '100%';
17003
+ rbox.style.border = 'none';
17004
+ {
17005
+ var update = function () { return rbox.src = sceneObject.imgUrl; };
17006
+ update();
17007
+ sceneObject.dispose(sceneObject.imgUrlChanged.disposableOn(update));
17008
+ }
17009
+ {
17010
+ var aaa_1 = function () {
17011
+ var rotation = ueViewer.getCurrentCameraInfo().rotation[0];
17012
+ var a = -rotation;
17013
+ rbox.style.transform = "rotate(".concat(a, "deg)");
17014
+ };
17015
+ var timer_1;
17016
+ var update = function () { return __awaiter(_this, void 0, void 0, function () {
17017
+ return __generator(this, function (_b) {
17018
+ aaa_1();
17019
+ if (sceneObject.show) {
17020
+ div.style.display = 'block';
17021
+ timer_1 = setInterval(function () {
17022
+ aaa_1();
17023
+ }, 1000);
17024
+ }
17025
+ else {
17026
+ div.style.display = 'none';
17027
+ clearInterval(timer_1);
17028
+ }
17029
+ return [2 /*return*/];
17030
+ });
17031
+ }); };
17032
+ _this.dispose(sceneObject.showChanged.disposableOn(update));
17033
+ update();
17034
+ _this.dispose(function () { return clearInterval(timer_1); });
17035
+ }
17036
+ rbox.style.transformOrigin = '50% 50%';
17037
+ return _this;
17038
+ }
17039
+ return MyDiv;
17040
+ }(xbsj_base_1.Destroyable));
17041
+ return _this;
17042
+ }
17043
+ var _a;
17044
+ _a = UeESNavigator;
17045
+ UeESNavigator.type = _a.register("ESUeViewer", earthsdk3_1.ESNavigator.type, _a);
17046
+ return UeESNavigator;
17047
+ }(earthsdk3_1.EngineObject));
17048
+ exports.UeESNavigator = UeESNavigator;
17049
+
17050
+
17051
+ /***/ }),
17052
+
17053
+ /***/ "./src/UeObjects/general/UeESPath/index.ts":
17054
+ /*!*************************************************!*\
17055
+ !*** ./src/UeObjects/general/UeESPath/index.ts ***!
17056
+ \*************************************************/
17057
+ /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
17058
+
17059
+ "use strict";
17060
+
17061
+ var __extends = (this && this.__extends) || (function () {
17062
+ var extendStatics = function (d, b) {
17063
+ extendStatics = Object.setPrototypeOf ||
17064
+ ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
17065
+ function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
17066
+ return extendStatics(d, b);
17067
+ };
17068
+ return function (d, b) {
17069
+ if (typeof b !== "function" && b !== null)
17070
+ throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
17071
+ extendStatics(d, b);
17072
+ function __() { this.constructor = d; }
17073
+ d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
17074
+ };
17075
+ })();
17076
+ var __assign = (this && this.__assign) || function () {
17077
+ __assign = Object.assign || function(t) {
17078
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
17079
+ s = arguments[i];
17080
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
17081
+ t[p] = s[p];
17082
+ }
17083
+ return t;
17084
+ };
17085
+ return __assign.apply(this, arguments);
17086
+ };
17087
+ var __read = (this && this.__read) || function (o, n) {
17088
+ var m = typeof Symbol === "function" && o[Symbol.iterator];
17089
+ if (!m) return o;
17090
+ var i = m.call(o), r, ar = [], e;
17091
+ try {
17092
+ while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
17093
+ }
17094
+ catch (error) { e = { error: error }; }
17095
+ finally {
17096
+ try {
17097
+ if (r && !r.done && (m = i["return"])) m.call(i);
17098
+ }
17099
+ finally { if (e) throw e.error; }
17100
+ }
17101
+ return ar;
17102
+ };
17103
+ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
17104
+ if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
17105
+ if (ar || !(i in from)) {
17106
+ if (!ar) ar = Array.prototype.slice.call(from, 0, i);
17107
+ ar[i] = from[i];
17108
+ }
17109
+ }
17110
+ return to.concat(ar || Array.prototype.slice.call(from));
17111
+ };
17112
+ Object.defineProperty(exports, "__esModule", ({ value: true }));
17113
+ exports.UeESPath = void 0;
17114
+ var earthsdk3_1 = __webpack_require__(/*! earthsdk3 */ "earthsdk3");
17115
+ var base_1 = __webpack_require__(/*! ../../base */ "./src/UeObjects/base/index.ts");
17116
+ var UeESPath = /** @class */ (function (_super) {
17117
+ __extends(UeESPath, _super);
17118
+ function UeESPath(sceneObject, ueViewer) {
17119
+ var _this = _super.call(this, sceneObject, ueViewer) || this;
17120
+ var viewer = ueViewer.viewer;
17121
+ if (!viewer) {
17122
+ console.warn("viewer is undefined!");
17123
+ return _this;
17124
+ }
17125
+ {
17126
+ // 兼容旧的属性,后期不支持设置purple和blue
17127
+ var update = function () {
17128
+ var materialMode = sceneObject.materialMode === "blue"
17129
+ ? "multipleArrows"
17130
+ : sceneObject.materialMode === "purple"
17131
+ ? "singleArrow"
17132
+ : sceneObject.materialMode;
17133
+ viewer.callUeFunc({
17134
+ f: 'update',
17135
+ p: {
17136
+ id: sceneObject.id,
17137
+ materialMode: materialMode,
17138
+ }
17139
+ });
17140
+ };
17141
+ _this.dispose(sceneObject.materialModeChanged.disposableOn(update));
17142
+ _this.dispose(sceneObject.createdEvent.disposableOn(update));
17143
+ }
17144
+ return _this;
17145
+ }
17146
+ var _a;
17147
+ _a = UeESPath;
17148
+ UeESPath.type = _a.register("ESUeViewer", earthsdk3_1.ESPath.type, _a);
17149
+ UeESPath.forceUeUpdateProps = __spreadArray([], __read(base_1.UeESGeoVector.forceUeUpdateProps), false);
17150
+ UeESPath.propValFuncs = __assign(__assign({}, base_1.UeESGeoVector.propValFuncs), { materialMode: null });
17151
+ return UeESPath;
17152
+ }(base_1.UeESGeoVector));
17153
+ exports.UeESPath = UeESPath;
17154
+
17155
+
16905
17156
  /***/ }),
16906
17157
 
16907
17158
  /***/ "./src/UeObjects/general/UeESPipeFence/index.ts":
@@ -18631,6 +18882,240 @@ var UeESViewShed = /** @class */ (function (_super) {
18631
18882
  exports.UeESViewShed = UeESViewShed;
18632
18883
 
18633
18884
 
18885
+ /***/ }),
18886
+
18887
+ /***/ "./src/UeObjects/general/UeESViewerStatusBar/index.ts":
18888
+ /*!************************************************************!*\
18889
+ !*** ./src/UeObjects/general/UeESViewerStatusBar/index.ts ***!
18890
+ \************************************************************/
18891
+ /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
18892
+
18893
+ "use strict";
18894
+
18895
+ var __extends = (this && this.__extends) || (function () {
18896
+ var extendStatics = function (d, b) {
18897
+ extendStatics = Object.setPrototypeOf ||
18898
+ ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
18899
+ function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
18900
+ return extendStatics(d, b);
18901
+ };
18902
+ return function (d, b) {
18903
+ if (typeof b !== "function" && b !== null)
18904
+ throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
18905
+ extendStatics(d, b);
18906
+ function __() { this.constructor = d; }
18907
+ d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
18908
+ };
18909
+ })();
18910
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
18911
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
18912
+ return new (P || (P = Promise))(function (resolve, reject) {
18913
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
18914
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
18915
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
18916
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
18917
+ });
18918
+ };
18919
+ var __generator = (this && this.__generator) || function (thisArg, body) {
18920
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
18921
+ return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
18922
+ function verb(n) { return function (v) { return step([n, v]); }; }
18923
+ function step(op) {
18924
+ if (f) throw new TypeError("Generator is already executing.");
18925
+ while (g && (g = 0, op[0] && (_ = 0)), _) try {
18926
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
18927
+ if (y = 0, t) op = [op[0] & 2, t.value];
18928
+ switch (op[0]) {
18929
+ case 0: case 1: t = op; break;
18930
+ case 4: _.label++; return { value: op[1], done: false };
18931
+ case 5: _.label++; y = op[1]; op = [0]; continue;
18932
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
18933
+ default:
18934
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
18935
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
18936
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
18937
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
18938
+ if (t[2]) _.ops.pop();
18939
+ _.trys.pop(); continue;
18940
+ }
18941
+ op = body.call(thisArg, _);
18942
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
18943
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
18944
+ }
18945
+ };
18946
+ Object.defineProperty(exports, "__esModule", ({ value: true }));
18947
+ exports.UeESViewerStatusBar = void 0;
18948
+ var earthsdk3_1 = __webpack_require__(/*! earthsdk3 */ "earthsdk3");
18949
+ var ESUeViewer_1 = __webpack_require__(/*! ../../../ESUeViewer */ "./src/ESUeViewer/index.ts");
18950
+ var xbsj_base_1 = __webpack_require__(/*! xbsj-base */ "xbsj-base");
18951
+ function copyClipboard(text) {
18952
+ return __awaiter(this, void 0, void 0, function () {
18953
+ return __generator(this, function (_a) {
18954
+ navigator.clipboard.writeText(text)
18955
+ .then(function () {
18956
+ console.log('复制成功');
18957
+ }, function (e) {
18958
+ console.log('复制失败');
18959
+ });
18960
+ return [2 /*return*/];
18961
+ });
18962
+ });
18963
+ }
18964
+ var UeESViewerStatusBar = /** @class */ (function (_super) {
18965
+ __extends(UeESViewerStatusBar, _super);
18966
+ function UeESViewerStatusBar(sceneObject, ueViewer) {
18967
+ var _this = _super.call(this, sceneObject, ueViewer) || this;
18968
+ var viewer = ueViewer.viewer;
18969
+ if (!viewer) {
18970
+ console.warn("viewer is undefined!");
18971
+ return _this;
18972
+ }
18973
+ var customDiv = _this.disposeVar(new earthsdk3_1.ESCustomDiv());
18974
+ ueViewer.add(customDiv);
18975
+ _this.dispose(function () { return ueViewer.delete(customDiv); });
18976
+ customDiv.instanceClass = /** @class */ (function (_super) {
18977
+ __extends(MyDiv, _super);
18978
+ function MyDiv(_subContainer, customDiv, viewer) {
18979
+ var _this = _super.call(this) || this;
18980
+ _this._subContainer = _subContainer;
18981
+ if (!viewer)
18982
+ return _this;
18983
+ if (!(viewer instanceof ESUeViewer_1.ESUeViewer))
18984
+ return _this;
18985
+ var div = document.createElement('div');
18986
+ _this._subContainer.appendChild(div);
18987
+ _this.dispose(function () { return _this._subContainer.removeChild(div); });
18988
+ div.style.width = '100%';
18989
+ div.style.position = 'absolute';
18990
+ div.style.height = "".concat(earthsdk3_1.ESViewerStatusBar.defaults.height, "px");
18991
+ div.style.left = '0';
18992
+ div.style.bottom = '0';
18993
+ div.style.color = '#fff';
18994
+ div.style.padding = '0 20px 0 0';
18995
+ div.style.boxSizing = 'border-box';
18996
+ div.style.lineHeight = "".concat(earthsdk3_1.ESViewerStatusBar.defaults.height, "px");
18997
+ div.style.zIndex = '100'; // 特别重要,不能丢!很可能导致保存后打开看不到!
18998
+ div.style.alignContent = 'center';
18999
+ div.style.justifyContent = 'space-between';
19000
+ var spanl = document.createElement('span');
19001
+ div.appendChild(spanl);
19002
+ _this.dispose(function () { return div.removeChild(spanl); });
19003
+ var spanLeft = document.createElement('span');
19004
+ spanl.appendChild(spanLeft);
19005
+ _this.dispose(function () { return spanl.removeChild(spanLeft); });
19006
+ var spanRight = document.createElement('span');
19007
+ spanl.appendChild(spanRight);
19008
+ spanRight.addEventListener('dblclick', function () {
19009
+ var innerHTML = spanRight.innerHTML;
19010
+ if (innerHTML.startsWith('鼠标位置')) {
19011
+ innerHTML = innerHTML.slice(5);
19012
+ }
19013
+ copyClipboard(innerHTML);
19014
+ });
19015
+ spanRight.style.cursor = 'pointer';
19016
+ _this.dispose(function () { return spanl.removeChild(spanRight); });
19017
+ var span = document.createElement('span');
19018
+ div.appendChild(span);
19019
+ _this.dispose(function () { return div.removeChild(span); });
19020
+ {
19021
+ var update = function () {
19022
+ var _b, _c;
19023
+ div.style.height = ((_b = sceneObject.height) !== null && _b !== void 0 ? _b : earthsdk3_1.ESViewerStatusBar.defaults.height) + 'px';
19024
+ div.style.lineHeight = ((_c = sceneObject.height) !== null && _c !== void 0 ? _c : earthsdk3_1.ESViewerStatusBar.defaults.height) + 'px';
19025
+ };
19026
+ _this.dispose(sceneObject.heightChanged.disposableOn(update));
19027
+ update();
19028
+ }
19029
+ {
19030
+ var update = function () {
19031
+ var _b;
19032
+ div.style.fontSize = ((_b = sceneObject.fontSize) !== null && _b !== void 0 ? _b : earthsdk3_1.ESViewerStatusBar.defaults.fontSize) + 'px';
19033
+ };
19034
+ _this.dispose(sceneObject.fontSizeChanged.disposableOn(update));
19035
+ update();
19036
+ }
19037
+ {
19038
+ var update = function () {
19039
+ if (sceneObject.bgColor) {
19040
+ // console.log('sceneObject.bgColor', sceneObject.bgColor);
19041
+ div.style.background = "rgba(".concat(sceneObject.bgColor[0] * 255, ",").concat(sceneObject.bgColor[1] * 255, ",").concat(sceneObject.bgColor[2] * 255, ",").concat(sceneObject.bgColor[3], ")");
19042
+ }
19043
+ else {
19044
+ div.style.background = "rgba(".concat(earthsdk3_1.ESViewerStatusBar.defaults.bgColor[0], ",").concat(earthsdk3_1.ESViewerStatusBar.defaults.bgColor[1], ",").concat(earthsdk3_1.ESViewerStatusBar.defaults.bgColor[2], ",").concat(earthsdk3_1.ESViewerStatusBar.defaults.bgColor[3], ")");
19045
+ }
19046
+ };
19047
+ _this.dispose(sceneObject.bgColorChanged.disposableOn(update));
19048
+ update();
19049
+ }
19050
+ {
19051
+ viewer.getVersion().then(function (res) {
19052
+ if (res) {
19053
+ span.innerText = "Ue \u7248\u672C : ".concat(res[0], " ");
19054
+ }
19055
+ }).catch(function (error) {
19056
+ console.log(error);
19057
+ });
19058
+ }
19059
+ {
19060
+ var aaa_1 = function () {
19061
+ var leftInnerText = '';
19062
+ var rightInnerText = '';
19063
+ leftInnerText += "\u5E27\u7387:".concat(viewer.getFPS().toFixed(0), "FPS");
19064
+ spanLeft.innerText = leftInnerText;
19065
+ var res = ueViewer.getCurrentCameraInfo();
19066
+ leftInnerText += " \u7ECF\u5EA6: ".concat(res.position[0].toFixed(5), "\u00B0 \u7EAC\u5EA6: ").concat(res.position[1].toFixed(5), "\u00B0 \u9AD8\u5EA6: ").concat(res.position[2].toFixed(2), "\u7C73 \u504F\u822A\u89D2: ").concat(res.rotation[0].toFixed(2), "\u00B0 \u4FEF\u4EF0\u89D2: ").concat(res.rotation[1].toFixed(2), "\u00B0 \u7FFB\u6EDA\u89D2:").concat(res.rotation[2].toFixed(2), "\u00B0 ");
19067
+ spanLeft.innerText = leftInnerText;
19068
+ ueViewer.pick().then(function (res) {
19069
+ if (res) {
19070
+ var pickResult = res.pickResult;
19071
+ if (pickResult && pickResult.position) {
19072
+ var position = pickResult.position;
19073
+ rightInnerText += "\u9F20\u6807\u4F4D\u7F6E:".concat(position[0].toFixed(5), "\u00B0 ").concat(position[1].toFixed(5), "\u00B0 ").concat(position[2].toFixed(2), "m");
19074
+ }
19075
+ else {
19076
+ rightInnerText += "\u6682\u65F6\u65E0\u6CD5\u83B7\u53D6\u9F20\u6807\u4F4D\u7F6E...";
19077
+ }
19078
+ spanRight.innerText = rightInnerText;
19079
+ }
19080
+ }).catch(function (error) {
19081
+ console.log(error);
19082
+ });
19083
+ };
19084
+ var timer_1;
19085
+ var update = function () { return __awaiter(_this, void 0, void 0, function () {
19086
+ return __generator(this, function (_b) {
19087
+ aaa_1();
19088
+ if (sceneObject.show) {
19089
+ div.style.display = 'flex';
19090
+ timer_1 = setInterval(function () {
19091
+ aaa_1();
19092
+ }, 1000);
19093
+ }
19094
+ else {
19095
+ div.style.display = 'none';
19096
+ clearInterval(timer_1);
19097
+ }
19098
+ return [2 /*return*/];
19099
+ });
19100
+ }); };
19101
+ _this.dispose(sceneObject.showChanged.disposableOn(update));
19102
+ update();
19103
+ _this.dispose(function () { return clearInterval(timer_1); });
19104
+ }
19105
+ return _this;
19106
+ }
19107
+ return MyDiv;
19108
+ }(xbsj_base_1.Destroyable));
19109
+ return _this;
19110
+ }
19111
+ var _a;
19112
+ _a = UeESViewerStatusBar;
19113
+ UeESViewerStatusBar.type = _a.register("ESUeViewer", earthsdk3_1.ESViewerStatusBar.type, _a);
19114
+ return UeESViewerStatusBar;
19115
+ }(earthsdk3_1.EngineObject));
19116
+ exports.UeESViewerStatusBar = UeESViewerStatusBar;
19117
+
19118
+
18634
19119
  /***/ }),
18635
19120
 
18636
19121
  /***/ "./src/UeObjects/general/UeESVisibilityAnalysis/index.ts":
@@ -18890,9 +19375,9 @@ __exportStar(__webpack_require__(/*! ./UeESViewShed */ "./src/UeObjects/general/
18890
19375
  __exportStar(__webpack_require__(/*! ./UeESVisibilityAnalysis */ "./src/UeObjects/general/UeESVisibilityAnalysis/index.ts"), exports);
18891
19376
  __exportStar(__webpack_require__(/*! ./UeESVolumeMeasurement */ "./src/UeObjects/general/UeESVolumeMeasurement/index.ts"), exports);
18892
19377
  __exportStar(__webpack_require__(/*! ./UeESWidget */ "./src/UeObjects/general/UeESWidget/index.ts"), exports);
18893
- // export * from './UeESNavigator';
18894
- // export * from './UeESPath';
18895
- // export * from './UeESViewerStatusBar';
19378
+ __exportStar(__webpack_require__(/*! ./UeESNavigator */ "./src/UeObjects/general/UeESNavigator/index.ts"), exports);
19379
+ __exportStar(__webpack_require__(/*! ./UeESPath */ "./src/UeObjects/general/UeESPath/index.ts"), exports);
19380
+ __exportStar(__webpack_require__(/*! ./UeESViewerStatusBar */ "./src/UeObjects/general/UeESViewerStatusBar/index.ts"), exports);
18896
19381
 
18897
19382
 
18898
19383
  /***/ }),