Merge branch 'master' of git.beswell.com:duanchangpeng/flyLong

# Conflicts:
#	hbuild/online/unpackage/res/icons/1024x1024.png
#	hbuild/online/unpackage/res/icons/120x120.png
#	hbuild/online/unpackage/res/icons/144x144.png
#	hbuild/online/unpackage/res/icons/152x152.png
#	hbuild/online/unpackage/res/icons/167x167.png
#	hbuild/online/unpackage/res/icons/180x180.png
#	hbuild/online/unpackage/res/icons/192x192.png
#	hbuild/online/unpackage/res/icons/20x20.png
#	hbuild/online/unpackage/res/icons/29x29.png
#	hbuild/online/unpackage/res/icons/40x40.png
#	hbuild/online/unpackage/res/icons/58x58.png
#	hbuild/online/unpackage/res/icons/60x60.png
#	hbuild/online/unpackage/res/icons/72x72.png
#	hbuild/online/unpackage/res/icons/76x76.png
#	hbuild/online/unpackage/res/icons/80x80.png
#	hbuild/online/unpackage/res/icons/87x87.png
#	hbuild/online/unpackage/res/icons/96x96.png

hbuild/GoAllOutTv/GoAllOutTv/manifest.json

@@ -6,7 +6,7 @@
         "name" : "1.3.19", /*应用版本名称*/
         "code" : 48
     },
-    "description" : "小飞龙TV平台 outdoor", /*应用描述信息*/
+    "description" : "小飞龙TV平台  演示版", /*应用描述信息*/
     "icons" : {
         "72" : "icon.png"
     },

hbuild/online/manifest.json

@@ -103,14 +103,14 @@
                         "spotlight-retina7" : "", /*iPhone iOS7高分屏Spotlight搜索程序图标，分辨率：80x80*/
                         "settings-normal" : "", /*iPhone设置页面程序图标，分辨率：29x29*/
                         "settings-retina" : "",
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                        "app@2x" : "D:\\wwwroot\\flyong\\icon\\online/120x120.png",
+                        "app@3x" : "D:\\wwwroot\\flyong\\icon\\online/180x180.png",
+                        "notification@2x" : "D:\\wwwroot\\flyong\\icon\\online/40x40.png",
+                        "notification@3x" : "D:\\wwwroot\\flyong\\icon\\online/60x60.png",
+                        "settings@2x" : "D:\\wwwroot\\flyong\\icon\\online/58x58.png",
+                        "settings@3x" : "D:\\wwwroot\\flyong\\icon\\online/87x87.png",
+                        "spotlight@2x" : "D:\\wwwroot\\flyong\\icon\\online/80x80.png",
+                        "spotlight@3x" : "D:\\wwwroot\\flyong\\icon\\online/120x120.png"
                     },
                     "ipad" : {
                         "normal" : "", /*iPad普通屏幕程序图标，分辨率：72x72*/
@@ -123,25 +123,25 @@
                         "spotlight-retina7" : "", /*iPad iOS7高分屏Spotlight搜索程序图标，分辨率：80x80*/
                         "settings-normal" : "", /*iPad设置页面程序图标，分辨率：29x29*/
                         "settings-retina" : "",
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                        "app" : "D:\\wwwroot\\flyong\\icon\\online/76x76.png",
+                        "app@2x" : "D:\\wwwroot\\flyong\\icon\\online/152x152.png",
+                        "notification" : "D:\\wwwroot\\flyong\\icon\\online/20x20.png",
+                        "notification@2x" : "D:\\wwwroot\\flyong\\icon\\online/40x40.png",
+                        "proapp@2x" : "D:\\wwwroot\\flyong\\icon\\online/167x167.png",
+                        "settings" : "D:\\wwwroot\\flyong\\icon\\online/29x29.png",
+                        "settings@2x" : "D:\\wwwroot\\flyong\\icon\\online/58x58.png",
+                        "spotlight" : "D:\\wwwroot\\flyong\\icon\\online/40x40.png",
+                        "spotlight@2x" : "D:\\wwwroot\\flyong\\icon\\online/80x80.png"
                     },
-                    "appstore" : "unpackage/res/icons/1024x1024.png"
+                    "appstore" : "D:\\wwwroot\\flyong\\icon\\online/1024x1024.png"
                 },
                 "android" : {
                     "mdpi" : "", /*普通屏程序图标，分辨率：48x48*/
                     "ldpi" : "", /*大屏程序图标，分辨率：48x48*/
-                    "hdpi" : "unpackage/res/icons/72x72.png", /*高分屏程序图标，分辨率：72x72*/
-                    "xhdpi" : "unpackage/res/icons/96x96.png", /*720P高分屏程序图标，分辨率：96x96*/
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                    "hdpi" : "D:\\wwwroot\\flyong\\icon\\online/72x72.png", /*高分屏程序图标，分辨率：72x72*/
+                    "xhdpi" : "D:\\wwwroot\\flyong\\icon\\online/96x96.png", /*720P高分屏程序图标，分辨率：96x96*/
+                    "xxhdpi" : "D:\\wwwroot\\flyong\\icon\\online/144x144.png",
+                    "xxxhdpi" : "D:\\wwwroot\\flyong\\icon\\online/192x192.png"
                 }
             },
             "splashscreen" : {

tv/src/Global.js

@@ -6,9 +6,9 @@ companyInfo = {
 };
 
 // 当前版本   演示版
-// runVersion = 'test';
+runVersion = 'test';
 // 户外版本
-runVersion = 'outDoor';
+// runVersion = 'outDoor';
 // normal
 // runVersion = 'normal';