Skip to content

Commit 63948f4

Browse files
author
shengyonggen
committed
修改打通和singlepage
1 parent bf46b7c commit 63948f4

File tree

8 files changed

+95
-71
lines changed

8 files changed

+95
-71
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sa-sdk-javascript",
3-
"version": "1.9.1",
3+
"version": "1.9.6",
44
"description": "official sensorsdata javascript sdk",
55
"main": "sensorsdata.min.js",
66
"scripts": {

‎sensorsdata.amd.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.

‎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/sdk.js‎

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,20 @@ var source_channel_standard = 'utm_source utm_medium utm_campaign utm_content ut
2424

2525
var logger = typeof logger === 'object' ? logger : {};
2626
logger.info = function() {
27-
if (!sd.para.show_log) {
28-
return false;
29-
}
30-
if(sd.para.show_log === true || sd.para.show_log === 'string'){
31-
arguments[0] = _.formatJsonString(arguments[0]);
32-
}
27+
if((_.sessionStorage.isSupport() && sessionStorage.getItem('sensorsdata_jssdk_debug') === 'true') || sd.para.show_log){
3328

34-
if (typeof console === 'object' && console.log) {
35-
try {
36-
return console.log.apply(console, arguments);
37-
} catch (e) {
38-
console.log(arguments[0]);
29+
if(sd.para.show_log === true || sd.para.show_log === 'string' || sd.para.show_log === false){
30+
arguments[0] = _.formatJsonString(arguments[0]);
31+
}
32+
33+
if (typeof console === 'object' && console.log) {
34+
try {
35+
return console.log.apply(console, arguments);
36+
} catch (e) {
37+
console.log(arguments[0]);
38+
}
3939
}
40+
4041
}
4142
};
4243

@@ -902,7 +903,7 @@ _.cookie = {
902903
//
903904
if (days !== 0) {
904905
var date = new Date();
905-
// 默认是填，可以是秒
906+
// 默认是天，可以是秒
906907
if (String(days).slice(-1) === 's') {
907908
date.setTime(date.getTime() + (Number(String(days).slice(0, -1)) * 1000));
908909
} else {
@@ -1728,11 +1729,11 @@ sd.sendState.getSendCall = function(data, callback) {
17281729
// 打通app传数据给app
17291730
if(sd.para.use_app_track === true || sd.para.use_app_track === 'only'){
17301731
if((typeof SensorsData_APP_JS_Bridge === 'object') && SensorsData_APP_JS_Bridge.sensorsdata_track){
1731-
SensorsData_APP_JS_Bridge.sensorsdata_track(data);
1732-
(typeof callback === 'function') && callback();
1732+
SensorsData_APP_JS_Bridge.sensorsdata_track(JSON.stringify(_.extend({server_url:sd.para.server_url},originData)));
1733+
(typeof callback === 'function') && callback();
17331734
}else if(/sa-sdk-ios/.test(navigator.userAgent) && !window.MSStream){
17341735
var iframe = document.createElement('iframe');
1735-
iframe.setAttribute('src', 'sensorsanalytics://trackEvent?event=' + encodeURIComponent(data));
1736+
iframe.setAttribute('src', 'sensorsanalytics://trackEvent?event=' + encodeURIComponent(JSON.stringify(_.extend({server_url:sd.para.server_url},originData))));
17361737
document.documentElement.appendChild(iframe);
17371738
iframe.parentNode.removeChild(iframe);
17381739
iframe = null;
@@ -1806,6 +1807,12 @@ sd.sendState.stateInfo.prototype.start = function(){
18061807
this.img.src = this.server_url;
18071808
};
18081809

1810+
sd.sendState.ajaxCall = function(){
1811+
// _.ajax({});
1812+
1813+
};
1814+
1815+
18091816
sd.sendState.sendCall = function(server_url,callback){
18101817
++this._receive;
18111818
var state = '_state' + this._receive;
@@ -2404,21 +2411,22 @@ saEvent.send = function(p, callback) {
24042411
}
24052412

24062413

2407-
function closure(){
2414+
function closure(p,c){
24082415
sd.track('$pageview', _.extend({
24092416
$referrer: url,
24102417
$referrer_host: _.url('hostname',url) || '',
24112418
$url: location.href,
24122419
$url_path: location.pathname,
24132420
$title: document.title
2414-
}, para, getUtm()),callback
2421+
}, p, getUtm()),c
24152422
);
24162423
url = location.href;
24172424
}
2418-
closure();
2425+
closure(para,callback);
24192426
this.autoTrackSinglePage = closure;
24202427
},
2421-
autoTrackWithoutProfile:function(para,callback){
2428+
autoTrackWithoutProfile: function(para,callback){
2429+
para = _.isObject(para) ? para : {};
24222430
this.autoTrack(_.extend(para,{not_set_profile:true}),callback);
24232431
},
24242432
autoTrack: function(para, callback) {
@@ -2440,7 +2448,7 @@ saEvent.send = function(p, callback) {
24402448
$first_visit_time: new Date(),
24412449
$first_referrer: _.getReferrer(),
24422450
$first_browser_language: navigator.language || '取值异常',
2443-
$first_browser_charset: document.charset || '取值异常',
2451+
$first_browser_charset: typeof document.charset === 'string' ? document.charset.toUpperCase() : '取值异常',
24442452
$first_referrer_host: _.info.pageProp.referrer_host,
24452453
$first_traffic_source_type: _.getSourceFromReferrer(),
24462454
$first_search_keyword: _.getKeywordFromReferrer()

‎src/sensorsdata.full.amd.js‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ var ObjProto = Object.prototype;
134134
var slice = ArrayProto.slice;
135135
var toString = ObjProto.toString;
136136
var hasOwnProperty = ObjProto.hasOwnProperty;
137-
var LIB_VERSION = '1.9.6';
137+
var LIB_VERSION = '1.9.7';
138138

139139
sd.lib_version = LIB_VERSION;
140140

@@ -154,19 +154,20 @@ var source_channel_standard = 'utm_source utm_medium utm_campaign utm_content ut
154154

155155
var logger = typeof logger === 'object' ? logger : {};
156156
logger.info = function() {
157-
if (!sd.para.show_log) {
158-
return false;
159-
}
160-
if(sd.para.show_log === true || sd.para.show_log === 'string'){
161-
arguments[0] = _.formatJsonString(arguments[0]);
162-
}
157+
if((_.sessionStorage.isSupport() && sessionStorage.getItem('sensorsdata_jssdk_debug') === 'true') || sd.para.show_log){
163158

164-
if (typeof console === 'object' && console.log) {
165-
try {
166-
return console.log.apply(console, arguments);
167-
} catch (e) {
168-
console.log(arguments[0]);
159+
if(sd.para.show_log === true || sd.para.show_log === 'string' || sd.para.show_log === false){
160+
arguments[0] = _.formatJsonString(arguments[0]);
169161
}
162+
163+
if (typeof console === 'object' && console.log) {
164+
try {
165+
return console.log.apply(console, arguments);
166+
} catch (e) {
167+
console.log(arguments[0]);
168+
}
169+
}
170+
170171
}
171172
};
172173

@@ -1032,7 +1033,7 @@ _.cookie = {
10321033
//
10331034
if (days !== 0) {
10341035
var date = new Date();
1035-
// 默认是填，可以是秒
1036+
// 默认是天，可以是秒
10361037
if (String(days).slice(-1) === 's') {
10371038
date.setTime(date.getTime() + (Number(String(days).slice(0, -1)) * 1000));
10381039
} else {
@@ -1858,11 +1859,11 @@ sd.sendState.getSendCall = function(data, callback) {
18581859
// 打通app传数据给app
18591860
if(sd.para.use_app_track === true || sd.para.use_app_track === 'only'){
18601861
if((typeof SensorsData_APP_JS_Bridge === 'object') && SensorsData_APP_JS_Bridge.sensorsdata_track){
1861-
SensorsData_APP_JS_Bridge.sensorsdata_track(data);
1862-
(typeof callback === 'function') && callback();
1862+
SensorsData_APP_JS_Bridge.sensorsdata_track(JSON.stringify(_.extend({server_url:sd.para.server_url},originData)));
1863+
(typeof callback === 'function') && callback();
18631864
}else if(/sa-sdk-ios/.test(navigator.userAgent) && !window.MSStream){
18641865
var iframe = document.createElement('iframe');
1865-
iframe.setAttribute('src', 'sensorsanalytics://trackEvent?event=' + encodeURIComponent(data));
1866+
iframe.setAttribute('src', 'sensorsanalytics://trackEvent?event=' + encodeURIComponent(JSON.stringify(_.extend({server_url:sd.para.server_url},originData))));
18661867
document.documentElement.appendChild(iframe);
18671868
iframe.parentNode.removeChild(iframe);
18681869
iframe = null;
@@ -1936,6 +1937,12 @@ sd.sendState.stateInfo.prototype.start = function(){
19361937
this.img.src = this.server_url;
19371938
};
19381939

1940+
sd.sendState.ajaxCall = function(){
1941+
// _.ajax({});
1942+
1943+
};
1944+
1945+
19391946
sd.sendState.sendCall = function(server_url,callback){
19401947
++this._receive;
19411948
var state = '_state' + this._receive;
@@ -2528,21 +2535,22 @@ saEvent.send = function(p, callback) {
25282535
}
25292536

25302537

2531-
function closure(){
2538+
function closure(p,c){
25322539
sd.track('$pageview', _.extend({
25332540
$referrer: url,
25342541
$referrer_host: _.url('hostname',url) || '',
25352542
$url: location.href,
25362543
$url_path: location.pathname,
25372544
$title: document.title
2538-
}, para, getUtm()),callback
2545+
}, p, getUtm()),c
25392546
);
25402547
url = location.href;
25412548
}
2542-
closure();
2549+
closure(para,callback);
25432550
this.autoTrackSinglePage = closure;
25442551
},
2545-
autoTrackWithoutProfile:function(para,callback){
2552+
autoTrackWithoutProfile: function(para,callback){
2553+
para = _.isObject(para) ? para : {};
25462554
this.autoTrack(_.extend(para,{not_set_profile:true}),callback);
25472555
},
25482556
autoTrack: function(para, callback) {
@@ -2564,7 +2572,7 @@ saEvent.send = function(p, callback) {
25642572
$first_visit_time: new Date(),
25652573
$first_referrer: _.getReferrer(),
25662574
$first_browser_language: navigator.language || '取值异常',
2567-
$first_browser_charset: document.charset || '取值异常',
2575+
$first_browser_charset: typeof document.charset === 'string' ? document.charset.toUpperCase() : '取值异常',
25682576
$first_referrer_host: _.info.pageProp.referrer_host,
25692577
$first_traffic_source_type: _.getSourceFromReferrer(),
25702578
$first_search_keyword: _.getKeywordFromReferrer()

‎src/sensorsdata.full.js‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ var ObjProto = Object.prototype;
131131
var slice = ArrayProto.slice;
132132
var toString = ObjProto.toString;
133133
var hasOwnProperty = ObjProto.hasOwnProperty;
134-
var LIB_VERSION = '1.9.6';
134+
var LIB_VERSION = '1.9.7';
135135

136136
sd.lib_version = LIB_VERSION;
137137

@@ -151,19 +151,20 @@ var source_channel_standard = 'utm_source utm_medium utm_campaign utm_content ut
151151

152152
var logger = typeof logger === 'object' ? logger : {};
153153
logger.info = function() {
154-
if (!sd.para.show_log) {
155-
return false;
156-
}
157-
if(sd.para.show_log === true || sd.para.show_log === 'string'){
158-
arguments[0] = _.formatJsonString(arguments[0]);
159-
}
154+
if((_.sessionStorage.isSupport() && sessionStorage.getItem('sensorsdata_jssdk_debug') === 'true') || sd.para.show_log){
160155

161-
if (typeof console === 'object' && console.log) {
162-
try {
163-
return console.log.apply(console, arguments);
164-
} catch (e) {
165-
console.log(arguments[0]);
156+
if(sd.para.show_log === true || sd.para.show_log === 'string' || sd.para.show_log === false){
157+
arguments[0] = _.formatJsonString(arguments[0]);
166158
}
159+
160+
if (typeof console === 'object' && console.log) {
161+
try {
162+
return console.log.apply(console, arguments);
163+
} catch (e) {
164+
console.log(arguments[0]);
165+
}
166+
}
167+
167168
}
168169
};
169170

@@ -1029,7 +1030,7 @@ _.cookie = {
10291030
//
10301031
if (days !== 0) {
10311032
var date = new Date();
1032-
// 默认是填，可以是秒
1033+
// 默认是天，可以是秒
10331034
if (String(days).slice(-1) === 's') {
10341035
date.setTime(date.getTime() + (Number(String(days).slice(0, -1)) * 1000));
10351036
} else {
@@ -1855,11 +1856,11 @@ sd.sendState.getSendCall = function(data, callback) {
18551856
// 打通app传数据给app
18561857
if(sd.para.use_app_track === true || sd.para.use_app_track === 'only'){
18571858
if((typeof SensorsData_APP_JS_Bridge === 'object') && SensorsData_APP_JS_Bridge.sensorsdata_track){
1858-
SensorsData_APP_JS_Bridge.sensorsdata_track(data);
1859-
(typeof callback === 'function') && callback();
1859+
SensorsData_APP_JS_Bridge.sensorsdata_track(JSON.stringify(_.extend({server_url:sd.para.server_url},originData)));
1860+
(typeof callback === 'function') && callback();
18601861
}else if(/sa-sdk-ios/.test(navigator.userAgent) && !window.MSStream){
18611862
var iframe = document.createElement('iframe');
1862-
iframe.setAttribute('src', 'sensorsanalytics://trackEvent?event=' + encodeURIComponent(data));
1863+
iframe.setAttribute('src', 'sensorsanalytics://trackEvent?event=' + encodeURIComponent(JSON.stringify(_.extend({server_url:sd.para.server_url},originData))));
18631864
document.documentElement.appendChild(iframe);
18641865
iframe.parentNode.removeChild(iframe);
18651866
iframe = null;
@@ -1933,6 +1934,12 @@ sd.sendState.stateInfo.prototype.start = function(){
19331934
this.img.src = this.server_url;
19341935
};
19351936

1937+
sd.sendState.ajaxCall = function(){
1938+
// _.ajax({});
1939+
1940+
};
1941+
1942+
19361943
sd.sendState.sendCall = function(server_url,callback){
19371944
++this._receive;
19381945
var state = '_state' + this._receive;
@@ -2525,21 +2532,22 @@ saEvent.send = function(p, callback) {
25252532
}
25262533

25272534

2528-
function closure(){
2535+
function closure(p,c){
25292536
sd.track('$pageview', _.extend({
25302537
$referrer: url,
25312538
$referrer_host: _.url('hostname',url) || '',
25322539
$url: location.href,
25332540
$url_path: location.pathname,
25342541
$title: document.title
2535-
}, para, getUtm()),callback
2542+
}, p, getUtm()),c
25362543
);
25372544
url = location.href;
25382545
}
2539-
closure();
2546+
closure(para,callback);
25402547
this.autoTrackSinglePage = closure;
25412548
},
2542-
autoTrackWithoutProfile:function(para,callback){
2549+
autoTrackWithoutProfile: function(para,callback){
2550+
para = _.isObject(para) ? para : {};
25432551
this.autoTrack(_.extend(para,{not_set_profile:true}),callback);
25442552
},
25452553
autoTrack: function(para, callback) {
@@ -2561,7 +2569,7 @@ saEvent.send = function(p, callback) {
25612569
$first_visit_time: new Date(),
25622570
$first_referrer: _.getReferrer(),
25632571
$first_browser_language: navigator.language || '取值异常',
2564-
$first_browser_charset: document.charset || '取值异常',
2572+
$first_browser_charset: typeof document.charset === 'string' ? document.charset.toUpperCase() : '取值异常',
25652573
$first_referrer_host: _.info.pageProp.referrer_host,
25662574
$first_traffic_source_type: _.getSourceFromReferrer(),
25672575
$first_search_keyword: _.getKeywordFromReferrer()

‎version.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
var sensorsdata_js_sdk_latest_version = '1.9.6';
1+
var sensorsdata_js_sdk_latest_version = '1.9.7';

‎vtrack.min.js‎

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

0 commit comments

Comments
 (0)