update...

潘钊
1 parent 440454e4
Showing 3 changed files with 46 additions and 30 deletions
src/main/resources/fatso/handle_real_ctl.js
src/main/resources/fatso/parse.js
src/main/resources/fatso/start.js
@@ -11,32 +11,34 @@ var fs = require(&#39;fs&#39;)
 var platform = process.platform;
 var iswin = platform=='win32';
-var separator = platform=='win32'?'\\':'/';
+var sp = platform=='win32'?'\\':'/';
 //不参与的目录
 var pName = 'bsth_control'
     , path = process.cwd()
     //根目录
-    , root = path.substr(0, path.indexOf(separator + 'src'+separator+'main'))
-    , workspace = root.substr(0, root.lastIndexOf(separator + pName))
+    , root = path.substr(0, path.indexOf(sp + 'src'+sp+'main'))
+    , workspace = root.substr(0, root.lastIndexOf(sp + pName))
     //临时目录
-    , dest = (workspace + separator + pName + '@fatso_copy')//.replace(/\//g, '\\')
-    , _static = separator + 'src'+separator+'main'+separator+'resources'+separator+'static';
+    , dest = (workspace + sp + pName + '@fatso_copy')//.replace(/\//g, '\\')
+    , _static = sp + 'src'+sp+'main'+sp+'resources'+sp+'static';
-var mainFile = dest + _static + separator + 'real_control_v2'+separator+'main.html';
-var mapFile = dest + _static + separator + 'real_control_v2'+separator+'mapmonitor'+separator+'real.html';
+var mainFile = dest + _static + sp + 'real_control_v2'+sp+'main.html';
+var aloneMapWrapFile = dest + _static + sp + 'real_control_v2'+sp+'alone_page'+sp+'map'+sp+'alone_wrap.html';
+var mapFile = dest + _static + sp + 'real_control_v2'+sp+'mapmonitor'+sp+'real.html';
 var realCtl = {
     /**
      * 处理线调首页
      */
     handleMain: function (cb) {
-        //读取文件
-        var data = fs.readFileSync(mainFile, 'utf-8')
-            , $ = cheerio.load(data);
-
+        //处理main.html
+        var data = fs.readFileSync(mainFile, 'utf-8'),
+            $ = cheerio.load(data);
         handleCss($, function () {
             handleJs($, mainFile, cb);
         });
+
+
     },
     /**
      * 处理地图模块
@@ -50,6 +52,17 @@ var realCtl = {
         handleCss($, function () {
             handleJs($, mapFile, cb);
         });
+    },
+    /**
+     * 处理单屏地图页面
+     * @param cb
+     */
+    handleAlonePage: function (cb) {
+        var data = fs.readFileSync(aloneMapWrapFile, 'utf-8');
+        var $ = cheerio.load(data);
+        handleCss($, function () {
+            handleJs($, aloneMapWrapFile, cb);
+        });
     }
 };
@@ -84,7 +97,7 @@ var handleCss = function ($, cb) {
             var data = out.styles;
             var fName = (k + '_' + md5(data)) + '.css';
             //写入 assets css 目录下
-            var descFile = dest + _static + separator + 'real_control_v2'+separator+'assets'+separator+'css' + separator + fName;
+            var descFile = dest + _static + sp + 'real_control_v2'+sp+'assets'+sp+'css' + sp + fName;
             fs.open(descFile, 'a', function (err, fd) {
                 fs.write(fd, data, function () {
@@ -138,7 +151,7 @@ var handleJs = function ($, file, cb) {
         var data = result.code;
         var fName = (k + '_' + md5(data)) + '.js';
         //写入 assets js 目录下
-        var descFile = dest + _static + separator + 'real_control_v2'+separator+'assets'+separator+'js' + separator + fName;
+        var descFile = dest + _static + sp + 'real_control_v2'+sp+'assets'+sp+'js' + sp + fName;
         fs.open(descFile, 'a', function (err, fd) {
             fs.write(fd, data, function () {
@@ -64,7 +64,7 @@ function write(file, text){
 		  console.log(err.toString().red);
 		  process.exit();
 	  }
-	  console.log(file.green); 
+	  //console.log(file.green);
 	});
 }
@@ -14,19 +14,19 @@ var fs = require(&#39;fs&#39;)
 var platform = process.platform;
 var iswin = platform=='win32';
-var separator = platform=='win32'?'\\':'/';
+var sp = platform=='win32'?'\\':'/';
 //不参与的目录
-var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission'+separator+'authorize_all', 'summary']
+var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission'+sp+'authorize_all', 'summary', 'report'+sp+'oil']
 	,ep = new EventProxy()
 	,pName = 'bsth_control'
 	,path = process.cwd()
 	//根目录
-	,root = path.substr(0, path.indexOf(separator + 'src'+separator+'main'))
-	,workspace = root.substr(0, root.lastIndexOf(separator + pName))
+	,root = path.substr(0, path.indexOf(sp + 'src'+sp+'main'))
+	,workspace = root.substr(0, root.lastIndexOf(sp + pName))
 	//临时目录
-	,dest = (workspace + separator + pName+'@fatso_copy')
-	,_static = separator + 'src'+separator+'main'+separator+'resources'+separator+'static'
-	,_pages = dest + _static + separator + 'pages';
+	,dest = (workspace + sp + pName+'@fatso_copy')
+	,_static = sp + 'src'+sp+'main'+sp+'resources'+sp+'static'
+	,_pages = dest + _static + sp + 'pages';
 //创建临时目录
@@ -45,7 +45,7 @@ ep.tail(&#39;mvn-clean&#39;,function(){
 	//ep.emit('copy-project');
 	//清理target
 	logInfo('mvn clean...');
-	cProcess = child_process.exec("mvn clean",{cwd: workspace + separator + pName},function(error){
+	cProcess = child_process.exec("mvn clean",{cwd: workspace + sp + pName},function(error){
 		if(error)
 			logError(error);
@@ -88,7 +88,7 @@ ep.tail(&#39;minifier-js&#39;, function(){
 	//再处理首页
 	ep.emit('handle-index', function(){
 		//递归处理片段
-		walk(dest + _static + separator + 'pages', function(item){
+		walk(dest + _static + sp + 'pages', function(item){
 			ep.emit('handle-fragment', item);
 		},
 		function(){
@@ -96,7 +96,10 @@ ep.tail(&#39;minifier-js&#39;, function(){
 			handle_real_ctl.handleMain(function () {
 				//处理线调地图
 				handle_real_ctl.handleMap(function () {
-					ep.emit('package-jar');
+					//处理单屏页面
+					handle_real_ctl.handleAlonePage(function () {
+						ep.emit('package-jar');
+					});
 				});
 			});
 		});
@@ -112,7 +115,7 @@ ep.tail(&#39;package-jar&#39;, function(file){
 		logSuccess('mvn package success');
-		console.log(('成功打包在 ' + dest + separator + 'target 目录下').cyan);
+		console.log(('成功打包在 ' + dest + sp + 'target 目录下').cyan);
 	});
 	output(cProcess);
@@ -122,7 +125,7 @@ ep.tail(&#39;package-jar&#39;, function(file){
 ep.tail('handle-fragment', function(file){
 	//要排除的文件
 	for(var i = 0, ex; ex = excludes[i++];){
-		if(file.indexOf(_pages + separator + ex) != -1)
+		if(file.indexOf(_pages + sp + ex) != -1)
 			return false;
 	}
 	handleJavascript(file, function(mini, $){
@@ -139,12 +142,12 @@ ep.tail(&#39;handle-fragment&#39;, function(file){
 //处理首页
 ep.tail('handle-index', function(cb){
-	var index = dest + _static + separator + 'index.html';
+	var index = dest + _static + sp + 'index.html';
 	handleJavascript(index, function(mini, $){
 		var jsMiniText = mini.inside + mini.outside;
 		var code = md5(jsMiniText);
-		fs.open( dest + _static + separator + 'assets'+separator+'js' + separator + code + '.js', 'a',  function(err, fd){
+		fs.open( dest + _static + sp + 'assets'+sp+'js' + sp + code + '.js', 'a',  function(err, fd){
 			if(err)
 		    	logError(err);
@@ -204,7 +207,7 @@ function write(file, text){
 		  console.log(err.toString().red);
 		  process.exit();
 	  }
-	  console.log(file.green); 
+	  //console.log(file.green);
 	});
 }
@@ -219,7 +222,7 @@ function walk(path ,handleFile, over) {
             console.log('read dir error'.red);  
         } else {  
             files.forEach(function(item) {
-                var tmpPath = path + separator + item;
+                var tmpPath = path + sp + item;
                 fs.stat(tmpPath, function(err1, stats) {  
                     if (err1) {  
                         console.log('stat error');