huangmh
/
client_iot-daoshi-template-v
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' of git.1000my.com:huangmh/client_iot-daoshi-template-v into dev

ShangHai_LongXiang
jiannibang 2 years ago
parent
07a8bc038a 4f4e22f00f
commit
2b94574cdd
1 changed files with 4 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      public/static/qm/MainMap_QM_go.js

9
public/static/qm/MainMap_QM_go.js
View File

@ -159,7 +159,7 @@ var QMUtil = function () {
bSpace: 5000, bSpace: 5000,
fSpace: 500, //双叠层状态下楼层的间距 fSpace: 500, //双叠层状态下楼层的间距
maxDis: 700, maxDis: 700,
minDis: 100,
minDis: 40,
shadow: true, //是否显示阴影 shadow: true, //是否显示阴影
navColor: 0xee6a50, //途径店铺颜色 navColor: 0xee6a50, //途径店铺颜色
aRadius: 2, //圆角半径 大于2 则店铺box显示圆角 aRadius: 2, //圆角半径 大于2 则店铺box显示圆角
@ -3213,7 +3213,7 @@ MainMap_QM.prototype = {
* @apiParamExample {int} 请求示例 * @apiParamExample {int} 请求示例
* *
* Map_QM.setCameraDist(150); * Map_QM.setCameraDist(150);
*
*
*/ */
setCameraDist: function (cDist, updateFun, callBack) { setCameraDist: function (cDist, updateFun, callBack) {
cDist = Map_QM.util.options.minDis > parseInt(cDist) ? Map_QM.util.options.minDis : parseInt(cDist); cDist = Map_QM.util.options.minDis > parseInt(cDist) ? Map_QM.util.options.minDis : parseInt(cDist);
@ -5542,14 +5542,13 @@ MainMap_QM.prototype = {
let vh = bottomY-topY; let vh = bottomY-topY;
let disc = Map_QM.controls.getDistance(); let disc = Map_QM.controls.getDistance();
if(vh==0 || vw/vh < Map_QM.w/Map_QM.h){ //按高度计算 if(vh==0 || vw/vh < Map_QM.w/Map_QM.h){ //按高度计算
Map_QM.setCameraDist((disc*vh/Map_QM.h)+30, Map_QM.moveMapPosition, Map_QM.drawPathStart);
Map_QM.setCameraDist((disc*vh/Map_QM.h)+20, Map_QM.moveMapPosition, Map_QM.drawPathStart);
}else{ //按宽度计算 }else{ //按宽度计算
Map_QM.setCameraDist((disc*vw/Map_QM.w)+30, Map_QM.moveMapPosition, Map_QM.drawPathStart);
Map_QM.setCameraDist((disc*vw/Map_QM.w)+20, Map_QM.moveMapPosition, Map_QM.drawPathStart);
} }
} }
}, },
drawPathStart:function(){ drawPathStart:function(){
console.log("**********");
document.addEventListener("pathOver", Map_QM.onFindPathFloor, true); document.addEventListener("pathOver", Map_QM.onFindPathFloor, true);
if (Map_QM.util.isMorePath) { if (Map_QM.util.isMorePath) {
Map_QM.mapArr[Map_QM.forShopArr[Map_QM.util._indexPathFloor].build][Map_QM.forShopArr[Map_QM.util._indexPathFloor].floor].findPath.onFindPathAnimation(pathNodes[Map_QM.util._indexPathFloor].pathNode, Map_QM.util.isMorePath,pathNodes[Map_QM.util._indexPathFloor].floor); //传入数组 Map_QM.mapArr[Map_QM.forShopArr[Map_QM.util._indexPathFloor].build][Map_QM.forShopArr[Map_QM.util._indexPathFloor].floor].findPath.onFindPathAnimation(pathNodes[Map_QM.util._indexPathFloor].pathNode, Map_QM.util.isMorePath,pathNodes[Map_QM.util._indexPathFloor].floor); //传入数组

Write Preview
Loading…
Cancel
Save