Skip to content

A
android_street
Commit f4d6a04f authored by 张释方's avatar 张释方
Browse files
Options

Merge branch 'dev_1.1.0' of http://gitlab.mints-id.com/android/android_street into branch_zsf_2

parents 171f2da8 843447bb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 232 additions and 427 deletions
app/src/main/assets/web/common/zsc1.js deleted 100644 → 0
View file @ 171f2da8
function getZsKey() {
return getParam("gk")==null?"":getParam("gk");
}
function getRequestUrl(a) {
return "http://maps."+getParam("base")+".com/" + getParam("u") + ""
}
function getVrUrls() {
return [
"http://lh3.ggpht."+getParam("base")+".com/" + getParam("u") + "/",
"http://lh4.ggpht."+getParam("base")+".com/" + getParam("u") + "/",
"http://lh5.ggpht."+getParam("base")+".com/" + getParam("u") + "/",
"http://lh6.ggpht."+getParam("base")+".com/" + getParam("u") + "/"
]
};
function getVrUrls0(a) {
if ( getParam("ut") =='uz')
return [
"http://geo0.ggpht."+getParam("base")+".com/" + getParam("u") + "/cbk",
"http://geo1.ggpht."+getParam("base")+".com/" + getParam("u") + "/cbk",
"http://geo2.ggpht."+getParam("base")+".com/" + getParam("u") + "/cbk",
"http://geo3.ggpht."+getParam("base")+".com/" + getParam("u") + "/cbk"
]
var date = Date.parse(new Date()) / 1000
console.log("kkkk")
return ['https://streetscape.xinzhi.space/' + date + '/' + md5(date).toUpperCase()+"/cbk"]
}
function getMb1U() {
return [
"http://khms0."+getParam("base")+".com/" + getParam("u") + "/kh?v=904\u0026hl=zh-CN\u0026",
"http://khms1."+getParam("base")+".com/" + getParam("u") + "/kh?v=904\u0026hl=zh-CN\u0026"
]
}
function getMb2U() {
return [
"http://khms0."+getParam("base")+".com/" + getParam("u") + "/kh?v=130\u0026hl=zh-CN\u0026",
"http://khms1."+getParam("base")+".com/" + getParam("u") + "/kh?v=130\u0026hl=zh-CN\u0026"
]
}
///
function wordToHex(lValue) {
let WordToHexValue = "",
WordToHexValueTemp = "",
lByte,
lCount;
for (lCount = 0; lCount <= 3; lCount++) {
lByte = lValue >>> lCount * 8 & 255;
WordToHexValueTemp = "0" + lByte.toString(16);
WordToHexValue = WordToHexValue + WordToHexValueTemp.substr(WordToHexValueTemp.length - 2, 2);
}
return WordToHexValue;
};
function rotateLeft(lValue, iShiftBits) {
return lValue << iShiftBits | lValue >>> 32 - iShiftBits;
};
function addUnsigned(lX, lY) {
let lX4, lY4, lX8, lY8, lResult;
lX8 = lX & 0x80000000;
lY8 = lY & 0x80000000;
lX4 = lX & 0x40000000;
lY4 = lY & 0x40000000;
lResult = (lX & 0x3FFFFFFF) + (lY & 0x3FFFFFFF);
if (lX4 & lY4) return lResult ^ 0x80000000 ^ lX8 ^ lY8;
if (lX4 | lY4) {
if (lResult & 0x40000000) return lResult ^ 0xC0000000 ^ lX8 ^ lY8; else return lResult ^ 0x40000000 ^ lX8 ^ lY8;
} else {
return lResult ^ lX8 ^ lY8;
}
};
function F(x, y, z) {
return x & y | ~x & z;
};
function G(x, y, z) {
return x & z | y & ~z;
};
function H(x, y, z) {
return x ^ y ^ z;
};
function I(x, y, z) {
return y ^ (x | ~z);
};
function FF(a, b, c, d, x, s, ac) {
a = addUnsigned(a, addUnsigned(addUnsigned(F(b, c, d), x), ac));
return addUnsigned(rotateLeft(a, s), b);
};
function GG(a, b, c, d, x, s, ac) {
a = addUnsigned(a, addUnsigned(addUnsigned(G(b, c, d), x), ac));
return addUnsigned(rotateLeft(a, s), b);
};
function HH(a, b, c, d, x, s, ac) {
a = addUnsigned(a, addUnsigned(addUnsigned(H(b, c, d), x), ac));
return addUnsigned(rotateLeft(a, s), b);
};
function II(a, b, c, d, x, s, ac) {
a = addUnsigned(a, addUnsigned(addUnsigned(I(b, c, d), x), ac));
return addUnsigned(rotateLeft(a, s), b);
};
function convertToWordArray(string) {
let lWordCount;
let lMessageLength = string.length;
let lNumberOfWordsTempOne = lMessageLength + 8;
let lNumberOfWordsTempTwo = (lNumberOfWordsTempOne - lNumberOfWordsTempOne % 64) / 64;
let lNumberOfWords = (lNumberOfWordsTempTwo + 1) * 16;
let lWordArray = Array(lNumberOfWords - 1);
let lBytePosition = 0;
let lByteCount = 0;
while (lByteCount < lMessageLength) {
lWordCount = (lByteCount - lByteCount % 4) / 4;
lBytePosition = lByteCount % 4 * 8;
lWordArray[lWordCount] = lWordArray[lWordCount] | string.charCodeAt(lByteCount) << lBytePosition;
lByteCount++;
}
lWordCount = (lByteCount - lByteCount % 4) / 4;
lBytePosition = lByteCount % 4 * 8;
lWordArray[lWordCount] = lWordArray[lWordCount] | 0x80 << lBytePosition;
lWordArray[lNumberOfWords - 2] = lMessageLength << 3;
lWordArray[lNumberOfWords - 1] = lMessageLength >>> 29;
return lWordArray;
};
function md5(string) {
let str = string + 'EfAvGE#aR@bC@VvdC223$xC23sWXR$vf'
let x = Array();
let k, AA, BB, CC, DD, a, b, c, d;
let S11 = 7,
S12 = 12,
S13 = 17,
S14 = 22;
let S21 = 5,
S22 = 9,
S23 = 14,
S24 = 20;
let S31 = 4,
S32 = 11,
S33 = 16,
S34 = 23;
let S41 = 6,
S42 = 10,
S43 = 15,
S44 = 21;
str = uTF8Encode(str);
x = convertToWordArray(str);
a = 0x67452301;
b = 0xEFCDAB89;
c = 0x98BADCFE;
d = 0x10325476;
for (k = 0; k < x.length; k += 16) {
AA = a;
BB = b;
CC = c;
DD = d;
a = FF(a, b, c, d, x[k + 0], S11, 0xD76AA478);
d = FF(d, a, b, c, x[k + 1], S12, 0xE8C7B756);
c = FF(c, d, a, b, x[k + 2], S13, 0x242070DB);
b = FF(b, c, d, a, x[k + 3], S14, 0xC1BDCEEE);
a = FF(a, b, c, d, x[k + 4], S11, 0xF57C0FAF);
d = FF(d, a, b, c, x[k + 5], S12, 0x4787C62A);
c = FF(c, d, a, b, x[k + 6], S13, 0xA8304613);
b = FF(b, c, d, a, x[k + 7], S14, 0xFD469501);
a = FF(a, b, c, d, x[k + 8], S11, 0x698098D8);
d = FF(d, a, b, c, x[k + 9], S12, 0x8B44F7AF);
c = FF(c, d, a, b, x[k + 10], S13, 0xFFFF5BB1);
b = FF(b, c, d, a, x[k + 11], S14, 0x895CD7BE);
a = FF(a, b, c, d, x[k + 12], S11, 0x6B901122);
d = FF(d, a, b, c, x[k + 13], S12, 0xFD987193);
c = FF(c, d, a, b, x[k + 14], S13, 0xA679438E);
b = FF(b, c, d, a, x[k + 15], S14, 0x49B40821);
a = GG(a, b, c, d, x[k + 1], S21, 0xF61E2562);
d = GG(d, a, b, c, x[k + 6], S22, 0xC040B340);
c = GG(c, d, a, b, x[k + 11], S23, 0x265E5A51);
b = GG(b, c, d, a, x[k + 0], S24, 0xE9B6C7AA);
a = GG(a, b, c, d, x[k + 5], S21, 0xD62F105D);
d = GG(d, a, b, c, x[k + 10], S22, 0x2441453);
c = GG(c, d, a, b, x[k + 15], S23, 0xD8A1E681);
b = GG(b, c, d, a, x[k + 4], S24, 0xE7D3FBC8);
a = GG(a, b, c, d, x[k + 9], S21, 0x21E1CDE6);
d = GG(d, a, b, c, x[k + 14], S22, 0xC33707D6);
c = GG(c, d, a, b, x[k + 3], S23, 0xF4D50D87);
b = GG(b, c, d, a, x[k + 8], S24, 0x455A14ED);
a = GG(a, b, c, d, x[k + 13], S21, 0xA9E3E905);
d = GG(d, a, b, c, x[k + 2], S22, 0xFCEFA3F8);
c = GG(c, d, a, b, x[k + 7], S23, 0x676F02D9);
b = GG(b, c, d, a, x[k + 12], S24, 0x8D2A4C8A);
a = HH(a, b, c, d, x[k + 5], S31, 0xFFFA3942);
d = HH(d, a, b, c, x[k + 8], S32, 0x8771F681);
c = HH(c, d, a, b, x[k + 11], S33, 0x6D9D6122);
b = HH(b, c, d, a, x[k + 14], S34, 0xFDE5380C);
a = HH(a, b, c, d, x[k + 1], S31, 0xA4BEEA44);
d = HH(d, a, b, c, x[k + 4], S32, 0x4BDECFA9);
c = HH(c, d, a, b, x[k + 7], S33, 0xF6BB4B60);
b = HH(b, c, d, a, x[k + 10], S34, 0xBEBFBC70);
a = HH(a, b, c, d, x[k + 13], S31, 0x289B7EC6);
d = HH(d, a, b, c, x[k + 0], S32, 0xEAA127FA);
c = HH(c, d, a, b, x[k + 3], S33, 0xD4EF3085);
b = HH(b, c, d, a, x[k + 6], S34, 0x4881D05);
a = HH(a, b, c, d, x[k + 9], S31, 0xD9D4D039);
d = HH(d, a, b, c, x[k + 12], S32, 0xE6DB99E5);
c = HH(c, d, a, b, x[k + 15], S33, 0x1FA27CF8);
b = HH(b, c, d, a, x[k + 2], S34, 0xC4AC5665);
a = II(a, b, c, d, x[k + 0], S41, 0xF4292244);
d = II(d, a, b, c, x[k + 7], S42, 0x432AFF97);
c = II(c, d, a, b, x[k + 14], S43, 0xAB9423A7);
b = II(b, c, d, a, x[k + 5], S44, 0xFC93A039);
a = II(a, b, c, d, x[k + 12], S41, 0x655B59C3);
d = II(d, a, b, c, x[k + 3], S42, 0x8F0CCC92);
c = II(c, d, a, b, x[k + 10], S43, 0xFFEFF47D);
b = II(b, c, d, a, x[k + 1], S44, 0x85845DD1);
a = II(a, b, c, d, x[k + 8], S41, 0x6FA87E4F);
d = II(d, a, b, c, x[k + 15], S42, 0xFE2CE6E0);
c = II(c, d, a, b, x[k + 6], S43, 0xA3014314);
b = II(b, c, d, a, x[k + 13], S44, 0x4E0811A1);
a = II(a, b, c, d, x[k + 4], S41, 0xF7537E82);
d = II(d, a, b, c, x[k + 11], S42, 0xBD3AF235);
c = II(c, d, a, b, x[k + 2], S43, 0x2AD7D2BB);
b = II(b, c, d, a, x[k + 9], S44, 0xEB86D391);
a = addUnsigned(a, AA);
b = addUnsigned(b, BB);
c = addUnsigned(c, CC);
d = addUnsigned(d, DD);
}
let tempValue = wordToHex(a) + wordToHex(b) + wordToHex(c) + wordToHex(d);
return tempValue.toLowerCase();
}
function uTF8Encode(string) {
string = string.replace(/\x0d\x0a/g, "\x0a");
let output = "";
for (let n = 0; n < string.length; n++) {
let c = string.charCodeAt(n);
if (c < 128) {
output += String.fromCharCode(c);
} else if (c > 127 && c < 2048) {
output += String.fromCharCode(c >> 6 | 192);
output += String.fromCharCode(c & 63 | 128);
} else {
output += String.fromCharCode(c >> 12 | 224);
output += String.fromCharCode(c >> 6 & 63 | 128);
output += String.fromCharCode(c & 63 | 128);
}
}
return output;
};
\ No newline at end of file
app/src/main/assets/web/m.html
View file @ f4d6a04f
......@@ -29,7 +29,7 @@
</body>
</html>
<script type="text/javascript" charset="UTF-8" src="./common/url.js"></script>
<script type="text/javascript" charset="UTF-8" src="./zhs/url.js"></script>
<script>
document.write('<script type="text/javascript"' +
......
app/src/main/assets/web/mr.html
View file @ f4d6a04f
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<script src="./common/url.js"></script>
<script src="./zhs/url.js"></script>
<script>
document.write('<script type="text/javascript"' +
' src="https://api.map.baidu.com/api?v=3.0&ak=' + getParam("bk") + '"><\/script>')
......
app/src/main/assets/web/streets.html
View file @ f4d6a04f
......@@ -488,9 +488,9 @@
height: 100%;
}
</style>
<script type="text/javascript" charset="UTF-8" src="./common/url.js"></script>
<script type="text/javascript" charset="UTF-8" src="./common/zsc.js"></script>
<script type="text/javascript" charset="UTF-8" src="./zss.js"></script>
<script type="text/javascript" charset="UTF-8" src="./zhs/url.js"></script>
<script type="text/javascript" charset="UTF-8" src="./zhs/zsc.js"></script>
<script type="text/javascript" charset="UTF-8" src="./zhs/zss.js"></script>
<script type="text/javascript" charset="UTF-8" src="./streets_files/common.js"></script>
<script type="text/javascript" charset="UTF-8" src="./streets_files/util.js"></script>
<script type="text/javascript" charset="UTF-8" src="./streets_files/geometry.js"></script>
......
app/src/main/assets/web/common/ap.js → app/src/main/assets/web/zhs/ap.js
View file @ f4d6a04f
......@@ -114,16 +114,6 @@ function needPay() {
}
}
function needPayPopup() {
try {
doAppFun("needPayPopup");
} catch (e) {
// console.log("tips", msg)
//alert("app未弹框==>" + msg + e)
}
}
function tips(msg) {
try {
doAppFun("tips", msg);
......@@ -182,10 +172,16 @@ connectWebViewJavascriptBridge(function (bridge) {
bridge.registerHandler("initZsMap", function (data, responseCallback) {
data = JSON.parse(data)
vm.initZsMap(data);
vm.initZsMap(data,false);
responseCallback(getVmMsg("suc:initZsMap"));
});
bridge.registerHandler("beginInitZsMap", function (data, responseCallback) {
data = JSON.parse(data)
vm.beginInitZsMap(data);
responseCallback(getVmMsg("suc:beginInitZsMap"));
});
bridge.registerHandler("addZoom", function (data, responseCallback) {
vm.addZoom();
responseCallback(getVmMsg("suc:addZoom"));
......@@ -200,8 +196,7 @@ connectWebViewJavascriptBridge(function (bridge) {
responseCallback(getVmMsg("suc:changeVrButton"));
});
bridge.registerHandler("showScenics", function (data, responseCallback) {
data = JSON.parse(data)
vm.doShowScenics(data.list);
vm.doShowScenics();
responseCallback(getVmMsg("suc:showScenics"));
});
......
app/src/main/assets/web/zsmap.html
View file @ f4d6a04f
......@@ -65,6 +65,7 @@
}
.scale-size {
margin: 5px 1px 0 1.5px;
width: 50px;
height: 1px;
box-shadow: 0px 0px 1px 2px #fff;
background: #000;
......@@ -79,6 +80,10 @@
#map .gmnoprint {
display: none !important;
}
.zsmaker{
margin-top: 25px;
}
[v-cloak] {display: none;}
......@@ -96,7 +101,7 @@
</div>
<div id="scale">
<div class="left-side"></div>
<div class="scale-size" id="scaleSize" :style="'width:'+pxValue+'px'"></div>
<div class="scale-size" id="scaleSize" ></div>
<div class="right-side"></div>
</div>
</div>
......@@ -106,27 +111,26 @@
</body>
<script type="text/javascript" charset="UTF-8" src="./common/vue.min.js"></script>
<script type="text/javascript" charset="UTF-8" src="./common/latlng.js"></script>
<script type="text/javascript" charset="UTF-8" src="./common/url.js"></script>
<script type="text/javascript" charset="UTF-8" src="./common/zsc.js"></script>
<script type="text/javascript" charset="UTF-8" src="./common/gmap.js"></script>
<script type="text/javascript" charset="UTF-8" src="./common/bmap.js"></script>
<script type="text/javascript" charset="UTF-8" src="./zsmap.js"></script>
<script type="text/javascript" charset="UTF-8" src="./zhs/latlng.js"></script>
<script type="text/javascript" charset="UTF-8" src="./zhs/url.js"></script>
<script type="text/javascript" charset="UTF-8" src="./zhs/zsc.js"></script>
<script type="text/javascript" charset="UTF-8" src="./zhs/gmap.js"></script>
<script type="text/javascript" charset="UTF-8" src="./zhs/zsmap.js"></script>
<script>
document.write('<script type="text/javascript"' +
' src="https://api.map.baidu.com/api?v=3.0&ak=' + getParam("bk") + '"><\/script>');
</script>
<script src="./common/jquery.min.js"></script>
<script src="./common/baidu.js" async=""></script>
<script type="text/javascript" charset="UTF-8" src="./common/ap.js" async=""></script>
<script type="text/javascript" charset="UTF-8" src="./zhs/baidu.js" async=""></script>
<script type="text/javascript" charset="UTF-8" src="./zhs/ap.js" async=""></script>
<script type="text/javascript" charset="UTF-8" src="./zsmap_files/common.js"></script>
<script type="text/javascript" charset="UTF-8" src="./zsmap_files/util.js"></script>
<script type="text/javascript" charset="UTF-8" src="./zsmap_files/map.js"></script>
<script type="text/javascript" charset="UTF-8" src="./zsmap_files/onion.js"></script>
<script type="text/javascript" charset="UTF-8" src="./zsmap_files/controls.js"></script>
<script src="./zsmap_files/js" async=""></script>
<!--<script src="vconsole.min.js"></script>-->
<!--<script>-->
<!-- var vConsole = new VConsole();-->
<!--</script>-->
<script src="./common/vconsole.min.js"></script>
<script>
var vConsole = new VConsole();
</script>
</html>
app/src/main/java/com/mints/street/bean/GPS.java
View file @ f4d6a04f
......@@ -47,6 +47,14 @@ public class GPS {
this.lng = lng;
}
public int getInner() {
return inner;
}
public void setInner(int inner) {
this.inner = inner;
}
public String toString() {
return "lat:" + lat + "," + "lng:" + lng+"," + "inner:" + inner;
}
......
app/src/main/java/com/mints/street/bean/InitMapBean.kt
View file @ f4d6a04f
......@@ -8,4 +8,8 @@ class InitMapBean {
var lng: Double = 0.0
var vip: Int? = 0//0 非vip 1 vip
var inner: Int? = 0// 0国内 ，1国外
var mapType:String?=null//当前地图类型
var showVrButton: Int? = 0 //是否展示街景按钮 1 展示，0 不展示
var showScenics: Int? = 0 //是否展示景点推荐 1 展示 ，0 不展示
var scenics:List<HotViewBean.Dataslist>?=null//景点信息 ，接口查询返回
}
\ No newline at end of file
app/src/main/java/com/mints/street/main/googlemap/GoogleMapFragment.kt
View file @ f4d6a04f
......@@ -103,7 +103,7 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel
jsToAndroid()
binding.imageLocationIcon.setOnClickListener {
initZsMap()
loadPosition()
}
RxUtils.onMultiClick(binding.stbBgSearch) {
SearchMapActivity.startSearchMapActivity(this)
......@@ -124,11 +124,10 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel
this@GoogleMapFragment, object : HotViewDialog.OnHotItemClick {
override fun onItemClick(position: Int, itemBean: HotViewBean.Dataslist?) {
itemBean?.apply {
//todo 冯瑞雨 修改toDouble
//点击调转页面
viewModel.authorized(bvid, name)
//更新当前坐标（控制js页面做回调）
initZsMap(lat?.toDouble(), lng?.toDouble())
loadPosition(lat?.toDouble(), lng?.toDouble())
}
}
}).init().show()
......@@ -192,7 +191,7 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel
}
//加载完成
binding.webview.registerHandler("allIsOk") { _, _ ->
initZsMap()
viewModel.getviewrecommend()
}
//android->js 景点推荐 弹出景点弹框
binding.webview.registerHandler("openScenicsFrame") { data, _ ->
......@@ -242,8 +241,9 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel
/**
* 调用JS
* 定位
*/
private fun initZsMap(lat: Double? = null, lng: Double? = null, inner: Int = 0) {
private fun loadPosition(lat: Double? = null, lng: Double? = null, inner: Int = 0) {
val initMapBean = InitMapBean()
initMapBean.lat = lat ?: gps.lat
initMapBean.lng = lng ?: gps.lng
......@@ -261,6 +261,32 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel
) {
}
}
/**
* 调用JS
* 第一次加载
*/
private fun beginInitZsMap(lat: Double? = null, lng: Double? = null,
inner: Int = 0,bean: HotViewBean?=null) {
val initMapBean = InitMapBean()
initMapBean.lat = lat ?: gps.lat
initMapBean.lng = lng ?: gps.lng
if (UserManager.INSTANCE.getVipFlag()) {
//vip
initMapBean.vip = 1
} else {
//非vip
initMapBean.vip = 0
}
initMapBean.inner = inner
initMapBean.mapType = "hybrid"
initMapBean.showVrButton = 1
initMapBean.showScenics = 0
initMapBean.scenics = bean?.list
binding.webview.callHandler(
"beginInitZsMap", Gson().toJson(initMapBean)
) {
}
}
/**
* 开关街景按钮
......@@ -380,10 +406,12 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel
)
}
})
//搜索页面回调参数
viewModel.pt.observe(this, Observer {
initZsMap(it.lat, it.lng)
loadPosition(it.lat, it.lng,it.inner)
binding.scrollLayout.toggle(ScrollLayout.STATUS_CLOSE)
})
//获取地图展示样式
viewModel.mapStyleSortBean.observe(this, Observer {
it?.apply {
dialogMapStyle = DialogMapStyle(context!!, it,
......@@ -416,7 +444,7 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel
})
viewModel.viewRecommed.observe(this, Observer {
it?.apply {
openScenics(this)
beginInitZsMap(gps.lat, gps.lng,bean = this)
}
})
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment