Skip to content

Commit 4efcf3c

Browse files
author
shengyonggen
committed
修改ios版本
1 parent 260bd6f commit 4efcf3c

File tree

5 files changed

+83
-16
lines changed

5 files changed

+83
-16
lines changed

sensorsdata.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/detector.min.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ var detector = {};
138138
}],
139139
["windows", /\bwindows nt ([0-9.]+)/],
140140
["macosx", /\bmac os x ([0-9._]+)/],
141-
["iPhone OS", function(ua) {
141+
["iOS", function(ua) {
142142
if (/\bcpu(?: iphone)? os /.test(ua)) {
143143
return /\bcpu(?: iphone)? os ([0-9._]+)/;
144144
} else if (ua.indexOf("iph os ") !== -1) {

src/sdk.js

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -980,14 +980,16 @@ _.info = {
980980

981981
return params;
982982
},
983-
campaignParamsStandard: function(prefix) {
983+
campaignParamsStandard: function(prefix,prefix_add) {
984+
prefix = prefix || '';
985+
prefix_add = prefix_add || '';
984986
var utms = _.info.campaignParams();
985987
var $utms = {}, otherUtms = {};
986988
for (var i in utms) {
987989
if ((' ' + source_channel_standard + ' ').indexOf(' ' + i + ' ') !== -1) {
988990
$utms[prefix + i] = utms[i];
989991
} else {
990-
otherUtms[i] = utms[i];
992+
otherUtms[prefix_add + i] = utms[i];
991993
}
992994
}
993995
return {
@@ -1111,10 +1113,15 @@ var saNewUser = {
11111113
});
11121114
}
11131115
// utm
1114-
var $utms = _.info.campaignParamsStandard('$latest_').$utms;
1116+
var allUtms = _.info.campaignParamsStandard('$latest_','_latest_');
1117+
var $utms = allUtms.$utms;
1118+
var otherUtms = allUtms.otherUtms;
11151119
if (!_.isEmptyObject($utms)) {
11161120
sd.register($utms);
11171121
}
1122+
if (!_.isEmptyObject(otherUtms)) {
1123+
sd.register(otherUtms);
1124+
}
11181125
}
11191126

11201127
};
@@ -1783,6 +1790,30 @@ saEvent.send = function(p, callback) {
17831790
};
17841791
};
17851792

1793+
function start_heatmap(){
1794+
/*
1795+
if(!_.isObject(sd.para.heatmap) || !sd.para.heatmap.collect_url || !sd.para.heatmap.collect_elements){
1796+
return false;
1797+
}
1798+
// 验证url,function成功就行,非function认为都是全部
1799+
if(_.isFunction(sd.para.heatmap.collect_url) && !sd.para.heatmap.collect_url()){
1800+
return false;
1801+
}
1802+
if(sd.para.heatmap.collect_elements === 'all'){
1803+
document.onclick = function(){
1804+
1805+
};
1806+
}else if(sd.para.heatmap.collect_elements === 'interact'){
1807+
document.onclick = function(e){
1808+
var ev = window.event || e;
1809+
1810+
}
1811+
}*/
1812+
1813+
1814+
1815+
}
1816+
17861817

17871818
sd.init = function() {
17881819
// 防止爬虫等异常情况
@@ -1791,6 +1822,8 @@ saEvent.send = function(p, callback) {
17911822
return false;
17921823
}*/
17931824
app_js_bridge();
1825+
// start_heatmap();
1826+
17941827
// 初始化referrer等页面属性 1.6
17951828
_.info.initPage();
17961829

src/sensorsdata.full.js

Lines changed: 39 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ if(typeof JSON!=='object'){JSON={}}(function(){'use strict';var rx_one=/^[\],:{}
207207
}],
208208
["windows", /\bwindows nt ([0-9.]+)/],
209209
["macosx", /\bmac os x ([0-9._]+)/],
210-
["iPhone OS", function(ua) {
210+
["iOS", function(ua) {
211211
if (/\bcpu(?: iphone)? os /.test(ua)) {
212212
return /\bcpu(?: iphone)? os ([0-9._]+)/;
213213
} else if (ua.indexOf("iph os ") !== -1) {
@@ -614,7 +614,7 @@ if(typeof JSON!=='object'){JSON={}}(function(){'use strict';var rx_one=/^[\],:{}
614614
, slice = ArrayProto.slice
615615
, toString = ObjProto.toString
616616
, hasOwnProperty = ObjProto.hasOwnProperty
617-
, LIB_VERSION = '1.6.1';
617+
, LIB_VERSION = '1.6.7';
618618

619619
sd.lib_version = LIB_VERSION;
620620

@@ -1590,14 +1590,16 @@ _.info = {
15901590

15911591
return params;
15921592
},
1593-
campaignParamsStandard: function(prefix) {
1593+
campaignParamsStandard: function(prefix,prefix_add) {
1594+
prefix = prefix || '';
1595+
prefix_add = prefix_add || '';
15941596
var utms = _.info.campaignParams();
15951597
var $utms = {}, otherUtms = {};
15961598
for (var i in utms) {
15971599
if ((' ' + source_channel_standard + ' ').indexOf(' ' + i + ' ') !== -1) {
15981600
$utms[prefix + i] = utms[i];
15991601
} else {
1600-
otherUtms[i] = utms[i];
1602+
otherUtms[prefix_add + i] = utms[i];
16011603
}
16021604
}
16031605
return {
@@ -1721,10 +1723,15 @@ var saNewUser = {
17211723
});
17221724
}
17231725
// utm
1724-
var $utms = _.info.campaignParamsStandard('$latest_').$utms;
1726+
var allUtms = _.info.campaignParamsStandard('$latest_','_latest_');
1727+
var $utms = allUtms.$utms;
1728+
var otherUtms = allUtms.otherUtms;
17251729
if (!_.isEmptyObject($utms)) {
17261730
sd.register($utms);
17271731
}
1732+
if (!_.isEmptyObject(otherUtms)) {
1733+
sd.register(otherUtms);
1734+
}
17281735
}
17291736

17301737
};
@@ -2079,6 +2086,7 @@ saEvent.send = function(p, callback) {
20792086
// setOnceProfile 如果是新用户,且允许设置profile
20802087
if (is_first_visitor && !para.not_set_profile) {
20812088
sd.setOnceProfile(_.extend({
2089+
// 暂时隐藏,等extractor都部署上去 $first_landing_page: _.info.pageProp.url.slice(0, sd.para.max_referrer_string_length),
20822090
$first_visit_time: new Date(),
20832091
$first_referrer: (document.referrer).slice(0, sd.para.max_referrer_string_length),
20842092
$first_browser_language: navigator.language,
@@ -2386,6 +2394,30 @@ saEvent.send = function(p, callback) {
23862394
};
23872395
};
23882396

2397+
function start_heatmap(){
2398+
/*
2399+
if(!_.isObject(sd.para.heatmap) || !sd.para.heatmap.collect_url || !sd.para.heatmap.collect_elements){
2400+
return false;
2401+
}
2402+
// 验证url,function成功就行,非function认为都是全部
2403+
if(_.isFunction(sd.para.heatmap.collect_url) && !sd.para.heatmap.collect_url()){
2404+
return false;
2405+
}
2406+
if(sd.para.heatmap.collect_elements === 'all'){
2407+
document.onclick = function(){
2408+
2409+
};
2410+
}else if(sd.para.heatmap.collect_elements === 'interact'){
2411+
document.onclick = function(e){
2412+
var ev = window.event || e;
2413+
2414+
}
2415+
}*/
2416+
2417+
2418+
2419+
}
2420+
23892421

23902422
sd.init = function() {
23912423
// 防止爬虫等异常情况
@@ -2394,6 +2426,8 @@ saEvent.send = function(p, callback) {
23942426
return false;
23952427
}*/
23962428
app_js_bridge();
2429+
// start_heatmap();
2430+
23972431
// 初始化referrer等页面属性 1.6
23982432
_.info.initPage();
23992433

vtrack.min.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)