|
@@ -1,7 +1,7 @@
|
|
-import {logApi} from '@/http/logApi'
|
|
|
|
|
|
+import { logApi } from '@/http/logApi'
|
|
import { getBrowser } from '@/uilts/help.js';
|
|
import { getBrowser } from '@/uilts/help.js';
|
|
import { logType } from './logEnum.js';
|
|
import { logType } from './logEnum.js';
|
|
-import {getChromeStorage} from '@/uilts/chromeExtension'
|
|
|
|
|
|
+import { getChromeStorage } from '@/uilts/chromeExtension'
|
|
|
|
|
|
let userInfo = null;
|
|
let userInfo = null;
|
|
let mid = '';
|
|
let mid = '';
|
|
@@ -10,27 +10,30 @@ let mid = '';
|
|
* @extParams 最终上报到阿里云以json字符串存储的参数,如果extparams传入的不是obj会转换成obj
|
|
* @extParams 最终上报到阿里云以json字符串存储的参数,如果extparams传入的不是obj会转换成obj
|
|
*/
|
|
*/
|
|
export async function reportLog(eventData = {}, extParams = {}) {
|
|
export async function reportLog(eventData = {}, extParams = {}) {
|
|
- if(!userInfo) {
|
|
|
|
|
|
+ if (!userInfo) {
|
|
userInfo = await getChromeStorage('userInfo') || null;
|
|
userInfo = await getChromeStorage('userInfo') || null;
|
|
}
|
|
}
|
|
if (!mid) {
|
|
if (!mid) {
|
|
mid = await getChromeStorage('mid') || '';
|
|
mid = await getChromeStorage('mid') || '';
|
|
}
|
|
}
|
|
-
|
|
|
|
if (chrome && chrome.tabs) {
|
|
if (chrome && chrome.tabs) {
|
|
chrome.tabs.getCurrent((tab) => {
|
|
chrome.tabs.getCurrent((tab) => {
|
|
- let isMobile = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i);
|
|
|
|
- let { url = '' } = tab;
|
|
|
|
- let platform = isMobile ? `mobile` : `pc`;
|
|
|
|
- let browser = getBrowser();
|
|
|
|
- let extData = {
|
|
|
|
- url,
|
|
|
|
- platform,
|
|
|
|
- browser,
|
|
|
|
- twitterId: userInfo.nickName,
|
|
|
|
- ...eventData,
|
|
|
|
|
|
+ if (tab && tab.url) {
|
|
|
|
+ let isMobile = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i);
|
|
|
|
+ let { url = '' } = tab;
|
|
|
|
+ let platform = isMobile ? `mobile` : `pc`;
|
|
|
|
+ let browser = getBrowser();
|
|
|
|
+ let extData = {
|
|
|
|
+ url,
|
|
|
|
+ platform,
|
|
|
|
+ browser,
|
|
|
|
+ twitterId: userInfo.nickName,
|
|
|
|
+ ...eventData,
|
|
|
|
+ }
|
|
|
|
+ paramsPretreatmentAndRequest(logType.denet, extData, extParams)
|
|
|
|
+ }else{
|
|
|
|
+ paramsPretreatmentAndRequest(logType.denet, eventData, extParams)
|
|
}
|
|
}
|
|
- paramsPretreatmentAndRequest(logType.denet, extData, extParams)
|
|
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
paramsPretreatmentAndRequest(logType.denet, eventData, extParams)
|
|
paramsPretreatmentAndRequest(logType.denet, eventData, extParams)
|
|
@@ -41,16 +44,18 @@ function paramsPretreatmentAndRequest(logType, eventData, extParams) {
|
|
extParams = wrapObject(extParams)
|
|
extParams = wrapObject(extParams)
|
|
let obj = {};
|
|
let obj = {};
|
|
let pageSource = eventData.pageSource;
|
|
let pageSource = eventData.pageSource;
|
|
- if(eventData.hasOwnProperty('pageSource')) {
|
|
|
|
|
|
+ if (eventData.hasOwnProperty('pageSource')) {
|
|
delete eventData.pageSource;
|
|
delete eventData.pageSource;
|
|
}
|
|
}
|
|
obj.logType = logType;
|
|
obj.logType = logType;
|
|
obj.eventData = JSON.stringify(eventData)
|
|
obj.eventData = JSON.stringify(eventData)
|
|
obj.extParams = JSON.stringify(extParams)
|
|
obj.extParams = JSON.stringify(extParams)
|
|
- logApi({params: {
|
|
|
|
- pageSource,
|
|
|
|
- ...obj
|
|
|
|
- }})
|
|
|
|
|
|
+ logApi({
|
|
|
|
+ params: {
|
|
|
|
+ pageSource,
|
|
|
|
+ ...obj
|
|
|
|
+ }
|
|
|
|
+ })
|
|
}
|
|
}
|
|
|
|
|
|
function wrapObject(extParams) {
|
|
function wrapObject(extParams) {
|