推送修改

This commit is contained in:
尹吉欢
2018-06-25 15:06:13 +08:00
parent 719c953093
commit 9a9438f8be
3 changed files with 62 additions and 92 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

+4 -4
View File
@@ -26,9 +26,9 @@ function savePageLog() {
baidu_lng = p.coords.longitude;
baidu_lat = p.coords.latitude;
baidu_address = p.address.street;
doSavePageLog({page:page, lng:baidu_lng, lat:baidu_lat, province:baidu_province, city:baidu_city, region:baidu_region, address:baidu_address, device:device, model:model, pushClientId:pushClientId});
doSavePageLog({page:page, lng:baidu_lng, lat:baidu_lat, province:baidu_province, city:baidu_city, region:baidu_region, address:baidu_address, device:device, model:model, pushClientId:pushClientId,channel:YOUFANG_CHANNEL});
}, function(e){
doSavePageLog({page:page, device:device, model:model, pushClientId:pushClientId});
doSavePageLog({page:page, device:device, model:model, pushClientId:pushClientId,channel:YOUFANG_CHANNEL});
},
{
provider:'baidu',
@@ -61,9 +61,9 @@ function saveBehaviorLog(event,dataMap) {
baidu_lng = p.coords.longitude;
baidu_lat = p.coords.latitude;
baidu_address = p.address.street;
doSaveBehaviorLog({page:page, lng:baidu_lng, lat:baidu_lat, province:baidu_province, city:baidu_city, region:baidu_region, address:baidu_address, device:device, model:model,event:event,businessData:dataMap});
doSaveBehaviorLog({page:page, lng:baidu_lng, lat:baidu_lat, province:baidu_province, city:baidu_city, region:baidu_region, address:baidu_address, device:device, model:model,event:event,businessData:dataMap,channel:YOUFANG_CHANNEL});
}, function(e){
doSaveBehaviorLog({page:page, device:device, model:model,event:event,businessData:dataMap});
doSaveBehaviorLog({page:page, device:device, model:model,event:event,businessData:dataMap,channel:YOUFANG_CHANNEL});
},
{
provider:'baidu',
+58 -88
View File
@@ -32,59 +32,43 @@ document.addEventListener("plusready", function() {
if (payload.type == "0") {
plus.ui.alert(title+"\n"+content);
} else if (payload.type == "1") {
plus.nativeUI.confirm(content, function(e){
if (e.index==0) {
if(plus.webview.getWebviewById('H5693FF3D')==null){
plus.webview.show(plus.webview.getWebviewById("HBuilder"));
}else{
plus.webview.show(plus.webview.getWebviewById("H5693FF3D"));
}
var targetTab = payload.url+".html";
var defaultTab = document.getElementById(targetTab);
//模拟首页点击
mui.trigger(defaultTab, 'tap');
//切换选项卡高亮
var current = document.querySelector(".mui-bar-tab>.mui-tab-item.mui-active");
if (defaultTab != current) {
current.classList.remove('mui-active');
defaultTab.classList.add('mui-active');
}
}
}, title, ["查看","忽略"] );
if(plus.webview.getWebviewById('H5693FF3D')==null){
plus.webview.show(plus.webview.getWebviewById("HBuilder"));
}else{
plus.webview.show(plus.webview.getWebviewById("H5693FF3D"));
}
var targetTab = payload.url+".html";
var defaultTab = document.getElementById(targetTab);
//模拟首页点击
mui.trigger(defaultTab, 'tap');
//切换选项卡高亮
var current = document.querySelector(".mui-bar-tab>.mui-tab-item.mui-active");
if (defaultTab != current) {
current.classList.remove('mui-active');
defaultTab.classList.add('mui-active');
}
} else if (payload.type == "2") {
if (payload.url.startWith("http")) {
plus.nativeUI.confirm(content, function(e){
if (e.index==0) {
clicked('views/webview_embed.html', true,false,{},{url:payload.url})
}
}, title, ["查看","忽略"] );
clicked('views/webview_embed.html', true,false,{},{url:payload.url})
} else {
// 处理打开app中的二级页面,一级页面在type=1中已经处理了,如果有http的地址就是打开外部页面
// 否则就是打开app内部页面
plus.nativeUI.confirm(content, function(e){
if (e.index==0) {
var url = payload.url;
var sindex = url.indexOf('?') == -1 ? url.length : url.indexOf('?');
var openUrl = url.substring(0, sindex);
var paramStr = url.substring(sindex+1);
var jsonData = {};
var parray = paramStr.split('&')
for(var i=0;i<parray.length;i++){
var subArray = parray[i].split('=')
if(parray[i] != ""){
if(subArray.length > 0) {
jsonData[subArray[0]] = subArray[1];
}
}
var url = payload.url;
var sindex = url.indexOf('?') == -1 ? url.length : url.indexOf('?');
var openUrl = url.substring(0, sindex);
var paramStr = url.substring(sindex+1);
var jsonData = {};
var parray = paramStr.split('&')
for(var i=0;i<parray.length;i++){
var subArray = parray[i].split('=')
if(parray[i] != ""){
if(subArray.length > 0) {
jsonData[subArray[0]] = subArray[1];
}
clicked(openUrl,true,false,{},jsonData)
}
}, title, ["查看","忽略"] );
}
clicked(openUrl,true,false,{},jsonData)
}
}
@@ -92,57 +76,43 @@ document.addEventListener("plusready", function() {
if (payload.type == "0") {
plus.ui.alert(content);
} else if (payload.type == "1") {
plus.nativeUI.confirm(content, function(e){
if (e.index==0) {
if(plus.webview.getWebviewById('H5693FF3D')==null){
plus.webview.show(plus.webview.getWebviewById("HBuilder"));
}else{
plus.webview.show(plus.webview.getWebviewById("H5693FF3D"));
}
var targetTab = payload.url+".html";
var defaultTab = document.getElementById(targetTab);
//模拟首页点击
mui.trigger(defaultTab, 'tap');
//切换选项卡高亮
var current = document.querySelector(".mui-bar-tab>.mui-tab-item.mui-active");
if (defaultTab != current) {
current.classList.remove('mui-active');
defaultTab.classList.add('mui-active');
}
}
}, title, ["查看","忽略"] );
if(plus.webview.getWebviewById('H5693FF3D')==null){
plus.webview.show(plus.webview.getWebviewById("HBuilder"));
}else{
plus.webview.show(plus.webview.getWebviewById("H5693FF3D"));
}
var targetTab = payload.url+".html";
var defaultTab = document.getElementById(targetTab);
//模拟首页点击
mui.trigger(defaultTab, 'tap');
//切换选项卡高亮
var current = document.querySelector(".mui-bar-tab>.mui-tab-item.mui-active");
if (defaultTab != current) {
current.classList.remove('mui-active');
defaultTab.classList.add('mui-active');
}
} else if (payload.type == "2") {
if (payload.url.startWith("http")) {
plus.nativeUI.confirm(content, function(e){
if (e.index==0) {
clicked('views/webview_embed.html', true,false,{},{url:payload.url})
}
}, title, ["查看","忽略"] );
clicked('views/webview_embed.html', true,false,{},{url:payload.url})
} else {
// 处理打开app中的二级页面,一级页面在type=1中已经处理了,如果有http的地址就是打开外部页面
// 否则就是打开app内部页面
plus.nativeUI.confirm(content, function(e){
if (e.index==0) {
var url = payload.url;
var sindex = url.indexOf('?') == -1 ? url.length : url.indexOf('?');
var openUrl = url.substring(0, sindex);
var paramStr = url.substring(sindex+1);
var jsonData = {};
var parray = paramStr.split('&')
for(var i=0;i<parray.length;i++){
var subArray = parray[i].split('=')
if(parray[i] != ""){
if(subArray.length > 0) {
jsonData[subArray[0]] = subArray[1];
}
}
var url = payload.url;
var sindex = url.indexOf('?') == -1 ? url.length : url.indexOf('?');
var openUrl = url.substring(0, sindex);
var paramStr = url.substring(sindex+1);
var jsonData = {};
var parray = paramStr.split('&')
for(var i=0;i<parray.length;i++){
var subArray = parray[i].split('=')
if(parray[i] != ""){
if(subArray.length > 0) {
jsonData[subArray[0]] = subArray[1];
}
clicked(openUrl,true,false,{},jsonData)
}
}, title, ["查看","忽略"] );
}
clicked(openUrl,true,false,{},jsonData)
}