From 94852177f41d052b64e2199bec8c3890a2405a9a Mon Sep 17 00:00:00 2001 From: iFish Date: Fri, 5 Sep 2014 18:34:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8F=90=E4=BA=A4=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RwTicketAssistantV2/app/12306/mobileproxy.js | 5 +- RwTicketAssistantV2/app/background.js | 42 +++++++++++----- .../app/infobar/scripts/core.js | 16 ++++++- RwTicketAssistantV2/app/manifest.json | 10 ++-- .../app/pages/serverstatus.html | 6 +-- Web12306/CrxHandler.cs | 45 +++++++++++++++++- Web12306/Properties/AssemblyInfo.cs | 2 +- Web12306/Web.config | 8 +++- Web12306/css/index.css | 6 +-- Web12306/css/ui/chat/chat-container.css | 1 + Web12306/css/ui/query-result.css | 5 ++ Web12306/images/handd.gif | Bin 0 -> 17581 bytes Web12306/index.html | 20 +------- Web12306/js/account/sessionMgr.js | 4 +- Web12306/js/boot.js | 25 ++++++++-- Web12306/js/platform/extensionPort.js | 3 +- Web12306/js/ui/chat/chatframe.js | 4 +- Web12306/js/ui/ui-submit-order.js | 2 +- Web12306/js/ui/ui-sysnotice.js | 5 +- Web12306/js/ui/ui-trainlist.js | 4 ++ build.cmd | 1 + 21 files changed, 158 insertions(+), 56 deletions(-) create mode 100644 Web12306/images/handd.gif diff --git a/RwTicketAssistantV2/app/12306/mobileproxy.js b/RwTicketAssistantV2/app/12306/mobileproxy.js index 63ec85d..e6f18b6 100644 --- a/RwTicketAssistantV2/app/12306/mobileproxy.js +++ b/RwTicketAssistantV2/app/12306/mobileproxy.js @@ -201,5 +201,8 @@ $(function () { document.body.dataset["targetExtensionId"] = chrome.runtime.id; document.body.dataset["targetExtensionVersion"] = chrome.runtime.getManifest().version; document.body.dataset["mobileSupportInitialized"] = 1; - document.dispatchEvent(new CustomEvent("mobileSupportInitialized")); + chrome.runtime.sendMessage({ action: "getBv" }, function (m) { + document.body.dataset["browserVersion"] = m.bv; + document.dispatchEvent(new CustomEvent("mobileSupportInitialized")); + }); }); \ No newline at end of file diff --git a/RwTicketAssistantV2/app/background.js b/RwTicketAssistantV2/app/background.js index 04ffa42..27402fb 100644 --- a/RwTicketAssistantV2/app/background.js +++ b/RwTicketAssistantV2/app/background.js @@ -1,6 +1,7 @@ var MANIFEST = chrome.runtime.getManifest(); var INFOBAR = chrome.infobars || (chrome.experimental && chrome.experimental.infobars); var isDebug = (compressFunc + '').indexOf("false") != -1; +var bv = window.external.LiebaoGetVersion && window.external.LiebaoGetVersion() || /Chrome\/([\d\.]+)/i.exec(navigator.userAgent)[1]; var entry12306 = false; var log = (function () { @@ -1076,7 +1077,7 @@ window.cbl = function (u, h) { trackback(m.detail.type, m.detail.values); }); - trackback(99); + trackback(99, [MANIFEST.version, bv]); })(); //#endregion @@ -1085,7 +1086,8 @@ window.cbl = function (u, h) { //#region 版本更新 (function () { - var updateurl = "http://www.fishlee.net/service/update2/44/44/version_v6" + (INFOBAR ? "" : "_1") + ".json?" + Math.random(); + var cv = parseInt(/Chrome\/(\d+)/i.exec(navigator.userAgent)[1]); + var updateurl = "http://www.fishlee.net/service/update2/44/" + (cv < 34 ? "44" : "60") + "/version_v6" + (INFOBAR ? "" : "_1") + ".json?" + Math.random(); var lastCheckUpdate = null; var hasUpdate = false, lastVersion = null, lastMessage = null, updateInfo = null; @@ -1118,14 +1120,19 @@ window.cbl = function (u, h) { }; var msgCallback = function (m, s, r) { - if (m && m.action === 'getUpdateInfo') + if (!m || !m.action) + return; + + if (m.action === 'getUpdateInfo') r(updateInfo); - if (m && m.action === 'getVersionInfo') + else if (m.action === 'getVersionInfo') r({ curVersion: MANIFEST.version, updateInfo: updateInfo }); - if (m && m.action === 'triggerUpdate') { + else if (m.action === 'triggerUpdate') { if (!lastCheckUpdate || (new Date() - lastCheckUpdate) >= 300000) { checkUpdate(); } + } else if (m.action === "getBv") { + r({ bv: bv }); } }; chrome.runtime.onMessage.addListener(msgCallback); @@ -1308,6 +1315,13 @@ window.cbl = function (u, h) { var callbackQueue = []; var lastLoad = null; + var setRoomCount = function (id, count) { + if (!servers) + return; + var room = _.findWhere(servers, { id: id }); + if (room) room.onlinecount = count; + }; + var execCallback = function () { var callback; while (callbackQueue.length) { @@ -1350,7 +1364,8 @@ window.cbl = function (u, h) { }); return { - loadServers: loadServers + loadServers: loadServers, + setRoomCount: setRoomCount }; })(); @@ -1403,6 +1418,7 @@ window.cbl = function (u, h) { } if (msg.action === "chatUpdateOnline") { currentRoom.onlinecount = msg.detail.count; + serverMgr.setRoomCount(currentRoom.id, currentRoom.onlinecount); } postMessageToPort(msg); }; @@ -1423,11 +1439,15 @@ window.cbl = function (u, h) { socket.send(JSON.stringify(msg)); }; var disconnect = function () { - if (!socket) - return; - socket.close(); - socket = null; + if (socket) { + socket.close(); + socket = null; + } + if (currentRoom) { + $.post("http://12306.liebao.cn/index.php?r=Api/GetRoomOnlineNum", { roomId: roomId }); + } currentRoom = null; + if (heratBeatTimer) { clearInterval(heratBeatTimer); heratBeatTimer = null; @@ -1490,7 +1510,7 @@ window.cbl = function (u, h) { hasChange = true; } if (hasChange) { - alarms.forEach(function (task) { + _.each(alarms, function (task) { var id = "ALARM-" + task.data.fromCode + "-" + task.data.toCode + new Date().getTime(); chrome.runtime.sendMessage({ action: "track", detail: { type: 132, values: [task.type || 0, task.point || 0] } }); diff --git a/RwTicketAssistantV2/app/infobar/scripts/core.js b/RwTicketAssistantV2/app/infobar/scripts/core.js index 91aa9f1..bad614a 100644 --- a/RwTicketAssistantV2/app/infobar/scripts/core.js +++ b/RwTicketAssistantV2/app/infobar/scripts/core.js @@ -57,6 +57,7 @@ var otsweb = (function () { var fun = function () { var e = this; + var queryUrl = "http://kyfw.12306.cn/otn/leftTicket/query"; var getTicketInfo = function (v) { var data = {}, info = v.indexOf("#") === -1 ? v : /getSelected\(['"](.*?)['"]\)/i.exec(v)[1].split('#')[11], @@ -129,8 +130,19 @@ var otsweb = (function () { "leftTicketDTO.to_station": to, "purpose_codes": code == "00" ? "ADULT" : code }; - e.ajaxGet("http://kyfw.12306.cn/otn/leftTicket/query", "http://kyfw.12306.cn/otn/leftTicket/init", data, "json", function (response) { - if (!response || !response.status) { + e.ajaxGet(queryUrl, "http://kyfw.12306.cn/otn/leftTicket/init", data, "json", function (response) { + if (!response) { + callback(null); + return; + } + + if (response.c_url) { + queryUrl = "http://kyfw.12306.cn/otn/" + response.c_url; + e.queryTicketOtn.apply(e, [].slice.call(arguments)); + return; + } + + if (!response.status) { callback(null); return; } diff --git a/RwTicketAssistantV2/app/manifest.json b/RwTicketAssistantV2/app/manifest.json index db68bbf..90c7d92 100644 --- a/RwTicketAssistantV2/app/manifest.json +++ b/RwTicketAssistantV2/app/manifest.json @@ -51,12 +51,12 @@ "browser_action": { "default_icon": "icons/icon_32.png", "default_popup": "air/popup.html", - "default_title": "猎豹抢票党 (集成12306订票助手V6)" + "default_title": "猎豹抢票党/12306订票助手 V7" }, - "description": "12306订票助手 v6: 帮您订票的小助手 by 木鱼，全力为您的车票购买献计献策！", + "description": "12306订票助手 v7: 帮您订票的小助手 by 木鱼，全力为您的车票购买献计献策！", "key": "7k6gnXVACvUPU2DfslJgSrWJTHqIg5uwd+Kgl/5zSg==", - "name": "12306订票助手V6/猎豹抢票党", - "version": "7.0.0", + "name": "猎豹抢票党/12306订票助手 V7", + "version": "7.0.1", "manifest_version": 2, "icons": { "16": "icons/icon_16.png", @@ -70,7 +70,7 @@ "background": { "page": "background.html" }, - "minimum_chrome_version": "28.0", + "minimum_chrome_version": "28", "externally_connectable": { "ids": [ ], "matches": [ diff --git a/RwTicketAssistantV2/app/pages/serverstatus.html b/RwTicketAssistantV2/app/pages/serverstatus.html index d8bfdc5..ad4704d 100644 --- a/RwTicketAssistantV2/app/pages/serverstatus.html +++ b/RwTicketAssistantV2/app/pages/serverstatus.html @@ -36,10 +36,10 @@
  • diff --git a/Web12306/CrxHandler.cs b/Web12306/CrxHandler.cs index 81101c0..3e8e46c 100644 --- a/Web12306/CrxHandler.cs +++ b/Web12306/CrxHandler.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Text.RegularExpressions; using System.Web; namespace Web12306 @@ -9,6 +10,8 @@ namespace Web12306 { #region Implementation of IHttpHandler +#if !DEBUG + /// /// 通过实现 接口的自定义 HttpHandler 启用 HTTP Web 请求的处理。 /// @@ -18,9 +21,49 @@ namespace Web12306 var request = context.Request; var response = context.Response; - response.Redirect("http://www.fishlee.net/service/download/383"); + var ua = request.UserAgent; + if (string.IsNullOrEmpty(ua)) + return; + + var m = Regex.Match(ua, @"Chrome/(\d+)", RegexOptions.IgnoreCase); + if (!m.Success) + return; + + var v = int.Parse(m.Groups[1].Value); + + if (v < 34) + { + response.Redirect("http://www.fishlee.net/service/dcl/44"); + } + else + { + response.Redirect("http://www.fishlee.net/service/dcl/60"); + } + } +#else + /// + /// 通过实现 接口的自定义 HttpHandler 启用 HTTP Web 请求的处理。 + /// + /// 对象，它提供对用于为 HTTP 请求提供服务的内部服务器对象（如 Request、Response、Session 和 Server）的引用。 + public void ProcessRequest(HttpContext context) + { + var request = context.Request; + var response = context.Response; + + var ua = request.UserAgent; + if (string.IsNullOrEmpty(ua)) + return; + + var m = Regex.Match(ua, @"Chrome/(\d+)", RegexOptions.IgnoreCase); + if (!m.Success) + return; + + response.Redirect("crx.crx"); + + } +#endif /// /// 获取一个值，该值指示其他请求是否可以使用 实例。 /// diff --git a/Web12306/Properties/AssemblyInfo.cs b/Web12306/Properties/AssemblyInfo.cs index a92f117..f9663de 100644 --- a/Web12306/Properties/AssemblyInfo.cs +++ b/Web12306/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // 你可以指定所有值，也可以让修订版本和内部版本号采用默认值， // 方法是按如下所示使用 "*": -[assembly: AssemblyVersion("1.0.15002.62")] +[assembly: AssemblyVersion("1.0.14248.66")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Web12306/Web.config b/Web12306/Web.config index f749a29..a465836 100644 --- a/Web12306/Web.config +++ b/Web12306/Web.config @@ -1,4 +1,4 @@ - + @@ -957,7 +949,7 @@ - diff --git a/Web12306/js/account/sessionMgr.js b/Web12306/js/account/sessionMgr.js index eb63fe9..35e4ebd 100644 --- a/Web12306/js/account/sessionMgr.js +++ b/Web12306/js/account/sessionMgr.js @@ -114,7 +114,7 @@ } var profile = storage.obj("12306_user_" + dispname) || { hasNotVerifyedPassenger: false, dispname: dispname, passengers: [], savedProfile: { list: [] }, currentProfile: {}, rawPassenger: [], options: { soundPrompt: true } }; - profile.currentProfile = $.extend({}, that.defaultProfile, profile.currentProfile, cp); + profile.currentProfile = $.extend({}, _.clone(that.defaultProfile), profile.currentProfile, cp); if (!profile.currentProfile.autoRefreshDelay) profile.currentProfile.autoRefreshDelay = 5; if (username) @@ -256,7 +256,7 @@ get: function () { return session && session.currentProfile; }, set: function (value) { - session.currentProfile = $.extend({}, that.defaultProfile, value); + session.currentProfile = $.extend({}, _.clone(that.defaultProfile), value); that.fireEvent("currentProfileChanged"); that.save(); } diff --git a/Web12306/js/boot.js b/Web12306/js/boot.js index 7a65cf4..a946f87 100644 --- a/Web12306/js/boot.js +++ b/Web12306/js/boot.js @@ -102,7 +102,7 @@ seajs.use("ui/noextension"); }; window.targetExtensionId = null; - $(function() { + $(function () { //确保内容脚本启动 var start = $.Deferred(); start.done(function () { @@ -112,14 +112,31 @@ //TODO: 因为压缩需要mark所有的页面名，所以不可以用变量计算。 if (pagename === "index") seajs.use("ui/index"); - + }); }); start.fail(function () { notInstallExtension(); }); + start.always(function () { + var page = location.pathname; + if (location.search) { + page += location.search; + } else { + page += "?"; + } + page += "bv=" + document.body.dataset["browserVersion"] + "&ev=" + document.body.dataset["targetExtensionVersion"]; + //加入百度统计 + window._hmt = window._hmt || []; + _hmt.push(['_setAutoPageview', false]); + _hmt.push(['_trackPageview', page]); - var checkExtensionInfo = function() { + var hm = document.createElement("script"); + hm.src = "//hm.baidu.com/hm.js?c7150a056b54f666f90c1a05e0700798"; + document.getElementsByTagName("head")[0].appendChild(hm); + }); + + var checkExtensionInfo = function () { window.targetExtensionId = document.body.dataset["targetExtensionId"]; window.targetExtensionVersion = document.body.dataset["targetExtensionVersion"]; @@ -147,3 +164,5 @@ } }); })(window, document); + + diff --git a/Web12306/js/platform/extensionPort.js b/Web12306/js/platform/extensionPort.js index 455d12b..c2eea1e 100644 --- a/Web12306/js/platform/extensionPort.js +++ b/Web12306/js/platform/extensionPort.js @@ -1,4 +1,5 @@ define(function (require, exports, module) { + var param = require("../data.js"); exports.targetId = window.targetExtensionId; var EventObject = require("./EventObject.js"); @@ -65,7 +66,7 @@ }, function () { }); //百度统计 - if (window._hmt) { + if (window._hmt && type !== param.trackTypes.OPEN_PAGE_INDEX) { try { var data = ""; if (values) { diff --git a/Web12306/js/ui/chat/chatframe.js b/Web12306/js/ui/chat/chatframe.js index e33ba03..b78713f 100644 --- a/Web12306/js/ui/chat/chatframe.js +++ b/Web12306/js/ui/chat/chatframe.js @@ -77,7 +77,9 @@ $("#chat_float_tip").click(showServerList); })(); - servernode.loadServers(); + setTimeout(function() { + servernode.loadServers(); + }, 1000 * 60 * 11); return { diff --git a/Web12306/js/ui/ui-submit-order.js b/Web12306/js/ui/ui-submit-order.js index 752f1c1..39e6ba5 100644 --- a/Web12306/js/ui/ui-submit-order.js +++ b/Web12306/js/ui/ui-submit-order.js @@ -110,7 +110,7 @@ dom.find("div>p:eq(0) span").html(data.orderId); submitProgress.removeClass().addClass("ticket-submit-status ticket-submit-status-ok"); submitProgress.find("span").html("订票成功！订单号为 " + data.orderId); - share.makeWeiboShare(document.getElementById("lnkShareWb"), null, "我刚在#猎豹浏览器#上用#订票助手#抢到了" + pPassengers.length + "张车票！你的车票买到了吗？", null); + share.makeWeiboShare(document.getElementById("lnkShareWb"), null, "尝试了各种办法买国庆火车票，差点就要放弃，没想到用 @猎豹浏览器 一下子就抢到了想要的车票，给力啊！ #国庆抢票，就用猎豹# ", null); submitBtn[0].disabled = false; //track diff --git a/Web12306/js/ui/ui-sysnotice.js b/Web12306/js/ui/ui-sysnotice.js index f178791..fb9fc60 100644 --- a/Web12306/js/ui/ui-sysnotice.js +++ b/Web12306/js/ui/ui-sysnotice.js @@ -37,9 +37,12 @@ $(".search-tips-container").html(noticeTemplate(unreadNotice)); $("#index-tip-body").find(".order-num").html(unreadNotice.length).show(); } else { - $("#index-tip-body").find(".order-num").html(0).hide(); + $("#index-tip-body").find(".order-num").html("0").hide(); //取最新的几条通知 var shownNotice = _.first(savedNotice.items, data.sysNoticeMaxShowCount); + if (!shownNotice.length) { + shownNotice = [{ title: "暂时没有系统公告" }]; + } $(".search-tips-container").html(noticeTemplate(shownNotice)); } }; diff --git a/Web12306/js/ui/ui-trainlist.js b/Web12306/js/ui/ui-trainlist.js index 9217b14..3ce5f21 100644 --- a/Web12306/js/ui/ui-trainlist.js +++ b/Web12306/js/ui/ui-trainlist.js @@ -122,6 +122,10 @@ utility: utility, getOriginalDepInfo: getOriginalDepInfo })); + var infoSpan = $("#suggestion > footer> span"); + infoSpan.eq(0).html(sessMgr.currentProfile.fromText); + infoSpan.eq(1).html(sessMgr.currentProfile.toText); + infoSpan.eq(2).html(sessMgr.currentProfile.fromText); self.location.hash = '#suggestion'; //track diff --git a/build.cmd b/build.cmd index c6bd66c..b5d7e66 100644 --- a/build.cmd +++ b/build.cmd @@ -21,6 +21,7 @@ rem "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe" "--pack-extens rem ren deploy.crx 12306Ʊ(Աר)_򿪻ӭҳ.crx tools\SourceFileUtility.exe deploy\manifest.json ", ""infobars""" ", ""experimental""" +tools\SourceFileUtility.exe deploy\manifest.json ".1""," ".0""," "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe" "--pack-extension=%~dp0deploy" "--pack-extension-key=%~dp0src_lb.pem" ren deploy.crx 12306Ʊ(Աר)_B29.crx