Skip to content

Commit 3400ad9

Browse files
manageryzymanageryzy
committedNov 26, 2014
修改了项目升级到了flex sdk4.6
Signed-off-by: manageryzy <[email protected]>
1 parent ae4ca0c commit 3400ad9

File tree

5 files changed

+79
-75
lines changed

5 files changed

+79
-75
lines changed
 

‎.actionScriptProperties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<actionScriptProperties analytics="false" mainApplicationPath="ABPlayer.mxml" projectUUID="ca33d8ac-f011-44c1-925d-82bd4cdcb8e7" version="10">
3-
<compiler additionalCompilerArguments="-locale en_US" autoRSLOrdering="true" copyDependentFiles="true" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderLocation="//cxl-PC/htdocs/ABPlayer" outputFolderPath="bin-debug" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
3+
<compiler additionalCompilerArguments="-locale en_US" autoRSLOrdering="true" copyDependentFiles="true" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderLocation="C:/www/ABPlayer" outputFolderPath="bin-debug" removeUnusedRSL="true" rootURL="" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
44
<compilerSourcePath/>
55
<libraryPath defaultLinkType="1">
66
<libraryPathEntry kind="4" path=""/>

‎.flexProperties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<flexProperties enableServiceManager="false" flexServerFeatures="0" flexServerType="16" serverContextRoot="" serverRoot="//cxl-PC/htdocs" serverRootURL="http://192.168.1.2/" toolCompile="true" useServerFlexSDK="false" version="1"/>
2+
<flexProperties enableServiceManager="false" flexServerFeatures="0" flexServerType="16" serverContextRoot="" serverRoot="C:/www" serverRootURL="http://localhost/" toolCompile="true" useServerFlexSDK="false" version="1"/>

‎.project

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
<link>
3030
<name>bin-debug</name>
3131
<type>2</type>
32-
<location>//cxl-PC/htdocs/ABPlayer</location>
32+
<location>C:/www/ABPlayer</location>
3333
</link>
3434
<link>
3535
<name>bin-release</name>
3636
<type>2</type>
37-
<location>//cxl-PC/htdocs/ABPlayer</location>
37+
<location>C:/www/ABPlayer</location>
3838
</link>
3939
</linkedResources>
4040
</projectDescription>

‎src/ABPlayer.mxml

+74-69
Original file line numberDiff line numberDiff line change
@@ -442,13 +442,16 @@
442442
</mx:ArrayCollection>
443443
<fx:Boolean id="sidebarShow">true</fx:Boolean>
444444
<fx:Boolean id="updatePosition">true</fx:Boolean>
445-
<s:RadioButtonGroup id="CmntExtra" change="cmSettings.setGlow(String(CmntExtra.selectedValue));"/>
445+
<s:RadioButtonGroup id="CmntExtra"
446+
change="cmSettings.setGlow(String(CmntExtra.selectedValue));"/>
446447
</fx:Declarations>
447448
<mx:Canvas id="ABPVideoWrapper" left="0" right="350" top="0" bottom="70" click="togglePlay();"
448449
horizontalScrollPolicy="off" styleName="videoWrapper" verticalScrollPolicy="off">
449450
<local:NSComponent id="ABPVideo" left="0" right="0" top="0" bottom="0" smoothing="true"/>
450-
<mx:Canvas verticalScrollPolicy="off" horizontalScrollPolicy="off" id="commentStage1" left="0" right="0" top="0" bottom="0"/>
451-
<mx:Canvas verticalScrollPolicy="off" horizontalScrollPolicy="off" id="commentStage2" left="0" right="0" top="0" bottom="0"/>
451+
<mx:Canvas id="commentStage1" left="0" right="0" top="0" bottom="0"
452+
horizontalScrollPolicy="off" verticalScrollPolicy="off"/>
453+
<mx:Canvas id="commentStage2" left="0" right="0" top="0" bottom="0"
454+
horizontalScrollPolicy="off" verticalScrollPolicy="off"/>
452455
<mx:HRule id="AdvHRule" visible="false" width="100%" height="1" horizontalCenter="0"
453456
strokeColor="#1FF91F" verticalCenter="0"/>
454457
<mx:VRule id="AdvVRule" visible="false" width="1" height="100%" horizontalCenter="0"
@@ -458,50 +461,50 @@
458461
verticalScrollPolicy="off">
459462
<s:Label left="10" top="10" color="#FFFFFF" text="视频解析度"/>
460463
<s:Label id="infoLblProportions" left="83" right="10" top="10" color="#FFFFFF"
461-
text="0 x 0"/>
464+
text="0 x 0"/>
462465
<s:Label left="10" top="41" color="#FFFFFF" text="当前视频文件大小"/>
463466
<s:Label id="infoLblFilesize" left="119" right="10" top="41" color="#FFFFFF"
464-
text="0 bytes"/>
467+
text="0 bytes"/>
465468
</mx:Canvas>
466469
</mx:Canvas>
467470
<s:Group id="ABPController" left="0" right="0" bottom="0" height="40">
468471
<s:Button id="btnPlay" left="0" bottom="0" click="togglePlay();" enabled="false"
469-
styleName="playBtn" toolTip="播放/暂停"/>
472+
styleName="playBtn" toolTip="播放/暂停"/>
470473
<s:Button id="btnStop" left="50" bottom="0" click="this.ABPVideo.stop();" enabled="false"
471-
styleName="stopBtn" toolTip="停止"/>
474+
styleName="stopBtn" toolTip="停止"/>
472475
<s:Button id="btnFullScreen" right="0" bottom="0" click="toggleFullscreen(!isFullscreen);"
473-
styleName="fsBtn" toolTip="全屏幕"/>
476+
styleName="fsBtn" toolTip="全屏幕"/>
474477
<s:Button id="btnConfig" right="30" bottom="0"
475-
click="toggleSidebar(!sidebarOverlay.visible);" styleName="cfgSBtn"
476-
toolTip="设置弹幕"/>
478+
click="toggleSidebar(!sidebarOverlay.visible);" styleName="cfgSBtn" toolTip="设置弹幕"/>
477479
<s:SkinnableContainer left="80" right="120" bottom="0" height="25" styleName="Bar">
478480
<s:Label id="currentTime" left="5" text="00:00 / 00:00" verticalCenter="0"/>
479481
</s:SkinnableContainer>
480482
<s:Button id="btnVolume" right="60" bottom="0" styleName="volume" toolTip="音量"/>
481483
<s:Button id="btnCmnt" right="90" bottom="0" click="toggleCmnt();" styleName="cmntOn"
482-
toolTip="开启/关闭弹幕"/>
484+
toolTip="开启/关闭弹幕"/>
483485
<s:HSlider id="ABPTrack" left="10" right="10" top="2" height="10"
484-
dataTipFormatFunction="formatDataTip" mouseDown="updatePosition=false"
485-
mouseUp="ABPVideo.seek(ABPTrack.value);updatePosition=true;"/>
486+
dataTipFormatFunction="formatDataTip" mouseDown="updatePosition=false"
487+
mouseUp="ABPVideo.seek(ABPTrack.value);updatePosition=true;"/>
486488
</s:Group>
487489
<s:Group id="sidebarOverlay" right="0" top="0" bottom="40" width="350">
488490
<mx:TabNavigator id="ABPSidebar" left="0" right="0" top="0" bottom="0">
489491
<s:NavigatorContent id="frmCmntList" width="100%" height="100%" label="评论列表">
490492
<s:DataGrid id="CommentListGrid" left="0" right="0" top="0" bottom="0"
491-
dataProvider="{UICommentList}" doubleClick="onListDblClick(event);"
492-
doubleClickEnabled="true">
493+
dataProvider="{UICommentList}" doubleClick="onListDblClick(event);"
494+
doubleClickEnabled="true">
493495
<s:columns>
494496
<s:ArrayList>
495497
<s:GridColumn width="40" dataField="stime" headerText="时间"
496-
labelFunction="formatTime"/>
498+
labelFunction="formatTime"/>
497499
<s:GridColumn dataField="text" headerText="内容"/>
498500
<s:GridColumn width="100" dataField="date" headerText="发送时间"
499-
labelFunction="formatDate"/>
501+
labelFunction="formatDate"/>
500502
</s:ArrayList>
501503
</s:columns>
502504
</s:DataGrid>
503505
</s:NavigatorContent>
504-
<s:NavigatorContent id="frmSpecial" width="100%" height="100%" label="高级弹幕" enabled="false">
506+
<s:NavigatorContent id="frmSpecial" width="100%" height="100%" label="高级弹幕"
507+
enabled="false">
505508
<mx:Accordion id="AdvancedCmnt" left="0" right="0" top="0" bottom="0"
506509
selectedIndex="0">
507510
<s:NavigatorContent id="CmntAdvPosition" width="100%" height="100%" label="定位弹幕">
@@ -510,7 +513,7 @@
510513
<s:NavigatorContent width="100%" height="100%" label="绘图弹幕">
511514
<s:Label left="10" top="6" text="脚本绘图"/>
512515
<s:TextArea id="CmntAdvDraw" left="10" right="10" top="31" bottom="43"
513-
editable="true" enabled="true" text="//这里是脚本"/>
516+
editable="true" enabled="true" text="//这里是脚本"/>
514517
<s:Button id="CmntAdvTest" right="10" bottom="8" label="测试运行"/>
515518
</s:NavigatorContent>
516519
<s:NavigatorContent width="100%" height="100%" label="点阵图片弹幕">
@@ -521,15 +524,15 @@
521524
<mx:Accordion left="0" right="0" top="0" bottom="0">
522525
<s:NavigatorContent width="100%" height="100%" label="播放器设置">
523526
<s:HSlider id="CmntTransparency" left="10" right="10" top="30"
524-
change="cmSettings.setStyle('alpha',CmntTransparency.value);"
525-
enabled="true" maximum="1.0" minimum="0.0" snapInterval="0.1"
526-
value="1.0"/>
527+
change="cmSettings.setStyle('alpha',CmntTransparency.value);"
528+
enabled="true" maximum="1.0" minimum="0.0" snapInterval="0.1"
529+
value="1.0"/>
527530
<s:Label left="10" top="10" text="弹幕透明度"/>
528531
<s:CheckBox id="abpToggleDebug" left="10" top="56" label="显示视频调试信息"
529-
click="ABPVideoInfo.visible =abpToggleDebug.selected;"/>
532+
click="ABPVideoInfo.visible =abpToggleDebug.selected;"/>
530533
<s:DropDownList id="CmntFont" left="71" right="10" top="87"
531-
change="cmSettings.setStyle('font',CmntFont.selectedItem.data);"
532-
enabled="true" selectedIndex="2">
534+
change="cmSettings.setStyle('font',CmntFont.selectedItem.data);"
535+
enabled="true" selectedIndex="2">
533536
<mx:ArrayCollection>
534537
<fx:Object label="黑体" data="simhei"/>
535538
<fx:Object label="微软雅黑" data="Microsoft Yahei"/>
@@ -538,27 +541,27 @@
538541
</s:DropDownList>
539542
<s:Label left="10" top="89" text="弹幕字体"/>
540543
<s:Button id="btnReloadComments" right="10" top="56" label="重新载入弹幕列表"
541-
click="cl.reload();" toolTip="强制重新载入所有弹幕"/>
544+
click="cl.reload();" toolTip="强制重新载入所有弹幕"/>
542545
<s:CheckBox id="CmntBold" left="10" top="120" label="弹幕加粗"
543-
click="cmSettings.setStyle('bold',CmntBold.selected);"
544-
enabled="true" selected="true"/>
546+
click="cmSettings.setStyle('bold',CmntBold.selected);"
547+
enabled="true" selected="true"/>
545548

546549
<s:RadioButton id="CmntGlow" left="91" top="120" label="文字阴影"
547-
groupName="CmntExtra" selected="false" value="highlight"/>
550+
groupName="CmntExtra" selected="false" value="highlight"/>
548551
<s:RadioButton id="CmntShadow" left="172" top="120" label="文字描边"
549-
groupName="CmntExtra" selected="true" value="border"/>
552+
groupName="CmntExtra" selected="true" value="border"/>
550553
<s:RadioButton id="CmntNone" left="253" top="120" label="无"
551-
groupName="CmntExtra" value="none"/>
554+
groupName="CmntExtra" value="none"/>
552555
<s:CheckBox id="cfgCPUfriendly" left="10" top="155" label="请对CPU善良些"
553-
click="toggleCPUMode();" toolTip="限制同时显示的弹幕数目"/>
556+
click="toggleCPUMode();" toolTip="限制同时显示的弹幕数目"/>
554557
<s:CheckBox id="cfgAvoidSubs" left="127" top="155" label="躲开内嵌字幕"
555-
click="toggleHardSubtitle();" toolTip="视频底部向上30像素内弹幕绕行通过"/>
558+
click="toggleHardSubtitle();" toolTip="视频底部向上30像素内弹幕绕行通过"/>
556559
<s:CheckBox id="showVideo" left="10" top="190" label="显示视频"
557-
click="ABPVideo.visible=showVideo.selected;" selected="true"
558-
toolTip="关闭视频部分，减少处理器压力"/>
560+
click="ABPVideo.visible=showVideo.selected;" selected="true"
561+
toolTip="关闭视频部分，减少处理器压力"/>
559562
<s:DropDownList id="videoFilter" left="91" right="10" top="189"
560-
change="ABPVideo.filterMode=String(videoFilter.selectedItem.data);"
561-
enabled="true" selectedIndex="0">
563+
change="ABPVideo.filterMode=String(videoFilter.selectedItem.data);"
564+
enabled="true" selectedIndex="0">
562565
<mx:ArrayCollection>
563566
<fx:Object label="无优化" data="default"/>
564567
<fx:Object label="增加对比度" data="contrastup"/>
@@ -570,56 +573,59 @@
570573
</mx:ArrayCollection>
571574
</s:DropDownList>
572575
<s:CheckBox id="videoQuality" left="232" top="155" label="高画质"
573-
click="ABPVideo.smoothing = videoQuality.selected;"
574-
selected="true" toolTip="一些高清视频关闭高画质可以减少处理器负荷同时提高画质"/>
576+
click="ABPVideo.smoothing = videoQuality.selected;"
577+
selected="true" toolTip="一些高清视频关闭高画质可以减少处理器负荷同时提高画质"/>
575578
</s:NavigatorContent>
576579
<s:NavigatorContent width="100%" height="100%" label="屏蔽设置">
577580
<s:CheckBox id="CmntShowScroll" left="10" top="10" label="滚动弹幕"
578-
click="filterMgr.filterMode(1,CmntShowScroll.selected);"
579-
enabled="true" selected="true"/>
581+
click="filterMgr.filterMode(1,CmntShowScroll.selected);"
582+
enabled="true" selected="true"/>
580583
<s:CheckBox id="CmntShowReverse" left="10" top="29" label="逆向弹幕"
581-
click="filterMgr.filterMode(6,CmntShowReverse.selected);"
582-
enabled="true" selected="true"/>
584+
click="filterMgr.filterMode(6,CmntShowReverse.selected);"
585+
enabled="true" selected="true"/>
583586
<s:CheckBox id="CmntShowTop" top="10" label="顶部弹幕"
584-
click="filterMgr.filterMode(5,CmntShowTop.selected);"
585-
enabled="true" horizontalCenter="0" selected="true"/>
587+
click="filterMgr.filterMode(5,CmntShowTop.selected);"
588+
enabled="true" horizontalCenter="0" selected="true"/>
586589
<s:CheckBox id="CmntShowBottom" top="29" label="底部弹幕"
587-
click="filterMgr.filterMode(4,CmntShowBottom.selected);"
588-
enabled="true" horizontalCenter="0" selected="true"/>
590+
click="filterMgr.filterMode(4,CmntShowBottom.selected);"
591+
enabled="true" horizontalCenter="0" selected="true"/>
589592
<s:CheckBox id="CmntShowCaptioning" right="10" top="10" label="字幕弹幕"
590-
click="filterMgr.filterMode(8,CmntShowCaptioning.selected);"
591-
enabled="true" selected="true"/>
593+
click="filterMgr.filterMode(8,CmntShowCaptioning.selected);"
594+
enabled="true" selected="true"/>
592595
<s:CheckBox id="CmntShowPositioned" right="10" top="30" label="定位弹幕"
593-
click="filterMgr.filterMode(7,CmntShowPositioned.selected);"
594-
selected="true"/>
595-
<mx:HRule left="10" right="10" top="59"/>
596+
click="filterMgr.filterMode(7,CmntShowPositioned.selected);"
597+
selected="true"/>
598+
<mx:HRule left="10" right="10" top="59"/>
596599
<s:CheckBox id="CmntFilterRemote" left="10" top="69" label="使用远程载入规则"
597-
enabled="true" selected="true"/>
600+
enabled="true" selected="true"/>
598601
<s:TextInput id="filterDef" left="10" right="123" top="104"/>
599602
<s:List id="lstRule" left="11" right="10" top="139" bottom="33"
600-
dataProvider="{UIFilterList}" selectedIndex="0">
603+
dataProvider="{UIFilterList}" selectedIndex="0">
601604
<s:itemRenderer>
602605
<fx:Component>
603606
<s:ItemRenderer>
604607
<s:states>
605-
<s:State name="normal" />
606-
<s:State name="hovered" />
607-
<s:State name="selected" />
608+
<s:State name="normal"/>
609+
<s:State name="hovered"/>
610+
<s:State name="selected"/>
608611
</s:states>
609612

610-
<s:Label id="filterLabel" text="{data.filter}" top="5" left="5" right="5" bottom="5"/>
613+
<s:Label id="filterLabel" left="5" right="5" top="5"
614+
bottom="5" text="{data.filter}"/>
611615
</s:ItemRenderer>
612616
</fx:Component>
613617
</s:itemRenderer>
614618
</s:List>
615619
<s:Button id="btnSaveFilter" right="10" top="69" label="保存过滤器规则"/>
616620
<s:CheckBox id="CmntAutoblock" left="11" bottom="10" label="智能阻止刷屏"/>
617-
<s:Button id="btnAddRule" right="66" top="104" width="50" label="添加" click="fltaddFilter(filterDef.text);"/>
618-
<s:Button id="btnDelRule" right="10" top="104" width="50" label="删除" click="deleteFilter();"/>
621+
<s:Button id="btnAddRule" right="66" top="104" width="50" label="添加"
622+
click="fltaddFilter(filterDef.text);"/>
623+
<s:Button id="btnDelRule" right="10" top="104" width="50" label="删除"
624+
click="deleteFilter();"/>
619625
</s:NavigatorContent>
620626
<s:NavigatorContent width="100%" height="100%" label="关于播放器">
621627
<s:Label left="10" right="10" top="10" fontWeight="bold"
622-
text="ABPlayer 弹幕播放器 (Spark)" textDecoration="underline"/>
628+
text="ABPlayer 弹幕播放器 (Spark)" textDecoration="underline"/>
623629
<s:Label left="10" right="10" top="32" text="版本：1.0.11 (Yasai Build 13)"/>
624630
<s:Label left="10" right="10" top="53" text="作者：Jabbany (CQZ) @ Kanoha.org"/>
625631
</s:NavigatorContent>
@@ -637,13 +643,12 @@
637643
</s:NavigatorContent>
638644
</mx:TabNavigator>
639645
</s:Group>
640-
<s:Group id="ABPCommentform" left="0" right="350" bottom="40" height="30"
641-
enabled="false" styleName="Bar">
646+
<s:Group id="ABPCommentform" left="0" right="350" bottom="40" height="30" enabled="false"
647+
styleName="Bar">
642648
<s:Button id="CmntSend" right="4" width="63" height="25" label="发送..." click="cmntSend();"
643-
styleName="dmButton" verticalCenter="0"/>
649+
styleName="dmButton" verticalCenter="0"/>
644650
<s:DropDownList id="CmntType" left="4" width="96" height="25" change="onCommentTypeChange();"
645-
enabled="true" selectedIndex="0"
646-
styleName="dmCombo" verticalCenter="0">
651+
enabled="true" selectedIndex="0" styleName="dmCombo" verticalCenter="0">
647652
<mx:ArrayCollection>
648653
<fx:Object label="滚动" data="1"/>
649654
<fx:Object label="顶部" data="5"/>
@@ -656,9 +661,9 @@
656661
<mx:ColorPicker id="CmntColor" left="104" width="25" height="25" enabled="true"
657662
selectedColor="#FFFFFF" verticalCenter="0"/>
658663
<s:TextInput id="CmntText" left="200" right="70" height="25"
659-
keyDown="onCommentformKey(event);" verticalCenter="0"/>
660-
<s:DropDownList id="CmntSize" left="134" width="62" height="25" enabled="true"
661-
selectedIndex="2" verticalCenter="0">
664+
keyDown="onCommentformKey(event);" verticalCenter="0"/>
665+
<s:DropDownList id="CmntSize" left="134" width="62" height="25" enabled="true"
666+
selectedIndex="2" verticalCenter="0">
662667
<mx:ArrayCollection>
663668
<fx:Object label="特大" data="35"/>
664669
<fx:Object label="大" data="30"/>

‎src/org/kanoha/util/CommentListParser.as

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.kanoha.util
22
{
3-
import com.adobe.serialization.json.JSON;
43
public class CommentListParser
54
{
65
public function CommentListParser()
@@ -35,7 +34,7 @@ package org.kanoha.util
3534
}else{
3635
if(obj.mode==7){
3736
try{
38-
var json:Object = JSON.decode(text,false);
37+
var json:Object = JSON.parse(text);
3938
obj.x = Number(json[0]);
4039
obj.y = Number(json[1]);
4140
obj.text = String(json[4]).replace(/(\/n|\\n|\n|\r\n)/g, "\r");

0 commit comments

Comments
 (0)
Please sign in to comment.