From 29df6e16a30bd0454a8e55266fd1a600350a5c8e Mon Sep 17 00:00:00 2001 From: xuchang Date: Sat, 11 Oct 2025 14:13:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E9=B8=BF=E8=92=99?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=94=AF=E6=8C=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xuchang --- example/ohos/.gitignore | 19 + example/ohos/AppScope/app.json5 | 10 + .../resources/base/element/string.json | 8 + .../resources/base/media/app_icon.png | Bin 0 -> 6790 bytes example/ohos/build-profile.json5 | 27 ++ example/ohos/entry/.gitignore | 7 + example/ohos/entry/build-profile.json5 | 15 + example/ohos/entry/hvigorfile.ts | 3 + example/ohos/entry/oh-package.json5 | 11 + .../main/ets/entryability/EntryAbility.ets | 10 + .../ohos/entry/src/main/ets/pages/Index.ets | 24 ++ .../ets/plugins/GeneratedPluginRegistrant.ets | 26 ++ example/ohos/entry/src/main/module.json5 | 49 +++ .../main/resources/base/element/color.json | 8 + .../main/resources/base/element/string.json | 20 ++ .../src/main/resources/base/media/icon.png | Bin 0 -> 6790 bytes .../resources/base/profile/main_pages.json | 5 + .../main/resources/en_US/element/string.json | 20 ++ .../main/resources/zh_CN/element/string.json | 20 ++ .../src/ohosTest/ets/test/Ability.test.ets | 35 ++ .../entry/src/ohosTest/ets/test/List.test.ets | 5 + .../ohosTest/ets/testability/TestAbility.ets | 48 +++ .../ohosTest/ets/testability/pages/Index.ets | 36 ++ .../ets/testrunner/OpenHarmonyTestRunner.ts | 50 +++ example/ohos/entry/src/ohosTest/module.json5 | 37 ++ .../resources/base/element/color.json | 8 + .../resources/base/element/string.json | 16 + .../ohosTest/resources/base/media/icon.png | Bin 0 -> 6790 bytes .../resources/base/profile/test_pages.json | 5 + example/ohos/hvigor/hvigor-config.json5 | 6 + example/ohos/hvigorfile.ts | 7 + example/ohos/oh-package.json5 | 20 ++ ohos/.gitignore | 9 + ohos/build-profile.json5 | 10 + ohos/hvigorfile.ts | 2 + ohos/index.ets | 4 + ohos/local.properties | 1 + ohos/oh-package.json5 | 12 + .../fijkplayer/common/AssetsCopyUtil.ets | 85 +++++ .../fijkplayer/common/Constants.ets | 52 +++ .../fijkplayer/common/HostOption.ets | 35 ++ .../fijkplayer/common/SystemUtil.ets | 98 +++++ .../components/fijkplayer/core/FIjkPlayer.ets | 337 ++++++++++++++++++ .../fijkplayer/plugin/FIjkPlayerPlugin.ets | 181 ++++++++++ ohos/src/main/module.json5 | 10 + pubspec.yaml | 2 + 46 files changed, 1393 insertions(+) create mode 100644 example/ohos/.gitignore create mode 100644 example/ohos/AppScope/app.json5 create mode 100644 example/ohos/AppScope/resources/base/element/string.json create mode 100644 example/ohos/AppScope/resources/base/media/app_icon.png create mode 100644 example/ohos/build-profile.json5 create mode 100644 example/ohos/entry/.gitignore create mode 100644 example/ohos/entry/build-profile.json5 create mode 100644 example/ohos/entry/hvigorfile.ts create mode 100644 example/ohos/entry/oh-package.json5 create mode 100644 example/ohos/entry/src/main/ets/entryability/EntryAbility.ets create mode 100644 example/ohos/entry/src/main/ets/pages/Index.ets create mode 100644 example/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets create mode 100644 example/ohos/entry/src/main/module.json5 create mode 100644 example/ohos/entry/src/main/resources/base/element/color.json create mode 100644 example/ohos/entry/src/main/resources/base/element/string.json create mode 100644 example/ohos/entry/src/main/resources/base/media/icon.png create mode 100644 example/ohos/entry/src/main/resources/base/profile/main_pages.json create mode 100644 example/ohos/entry/src/main/resources/en_US/element/string.json create mode 100644 example/ohos/entry/src/main/resources/zh_CN/element/string.json create mode 100644 example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets create mode 100644 example/ohos/entry/src/ohosTest/ets/test/List.test.ets create mode 100644 example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets create mode 100644 example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets create mode 100644 example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts create mode 100644 example/ohos/entry/src/ohosTest/module.json5 create mode 100644 example/ohos/entry/src/ohosTest/resources/base/element/color.json create mode 100644 example/ohos/entry/src/ohosTest/resources/base/element/string.json create mode 100644 example/ohos/entry/src/ohosTest/resources/base/media/icon.png create mode 100644 example/ohos/entry/src/ohosTest/resources/base/profile/test_pages.json create mode 100644 example/ohos/hvigor/hvigor-config.json5 create mode 100644 example/ohos/hvigorfile.ts create mode 100644 example/ohos/oh-package.json5 create mode 100644 ohos/.gitignore create mode 100644 ohos/build-profile.json5 create mode 100644 ohos/hvigorfile.ts create mode 100644 ohos/index.ets create mode 100644 ohos/local.properties create mode 100644 ohos/oh-package.json5 create mode 100644 ohos/src/main/ets/components/fijkplayer/common/AssetsCopyUtil.ets create mode 100644 ohos/src/main/ets/components/fijkplayer/common/Constants.ets create mode 100644 ohos/src/main/ets/components/fijkplayer/common/HostOption.ets create mode 100644 ohos/src/main/ets/components/fijkplayer/common/SystemUtil.ets create mode 100644 ohos/src/main/ets/components/fijkplayer/core/FIjkPlayer.ets create mode 100644 ohos/src/main/ets/components/fijkplayer/plugin/FIjkPlayerPlugin.ets create mode 100644 ohos/src/main/module.json5 diff --git a/example/ohos/.gitignore b/example/ohos/.gitignore new file mode 100644 index 00000000..6ca13b31 --- /dev/null +++ b/example/ohos/.gitignore @@ -0,0 +1,19 @@ +/node_modules +/oh_modules +/local.properties +/.idea +**/build +/.hvigor +.cxx +/.clangd +/.clang-format +/.clang-tidy +**/.test +*.har +**/BuildProfile.ets +**/oh-package-lock.json5 + +**/src/main/resources/rawfile/flutter_assets/ +**/libs/arm64-v8a/libapp.so +**/libs/arm64-v8a/libflutter.so +**/libs/arm64-v8a/libvmservice_snapshot.so diff --git a/example/ohos/AppScope/app.json5 b/example/ohos/AppScope/app.json5 new file mode 100644 index 00000000..473ae6e2 --- /dev/null +++ b/example/ohos/AppScope/app.json5 @@ -0,0 +1,10 @@ +{ + "app": { + "bundleName": "com.befovy.fijkplayer.fijkplayer_example", + "vendor": "example", + "versionCode": 1000000, + "versionName": "0.8.5", + "icon": "$media:app_icon", + "label": "$string:app_name" + } +} \ No newline at end of file diff --git a/example/ohos/AppScope/resources/base/element/string.json b/example/ohos/AppScope/resources/base/element/string.json new file mode 100644 index 00000000..34d3ca6f --- /dev/null +++ b/example/ohos/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string": [ + { + "name": "app_name", + "value": "fijkplayer_example" + } + ] +} diff --git a/example/ohos/AppScope/resources/base/media/app_icon.png b/example/ohos/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c GIT binary patch literal 6790 zcmX|G1ymHk)?T_}Vd;>R?p|tHQo6fg38|$UVM!6BLrPFWk?s;$LOP{GmJpBl$qoSA!PUg~PA65-S00{{S`XKG6NkG0RgjEntPrmV+?0|00mu7;+5 zrdpa{2QLqPJ4Y{j7=Mrl{BaxrkdY69+c~(w{Fv-v&aR%aEI&JYSeRTLWm!zbv;?)_ ziZB;fwGbbeL5Q}YLx`J$lp~A09KK8t_z}PZ=4ZzgdeKtgoc+o5EvN9A1K1_<>M?MBqb#!ASf&# zEX?<)!RH(7>1P+j=jqG(58}TVN-$psA6K}atCuI!KTJD&FMmH-78ZejBm)0qc{ESp z|LuG1{QnBUJRg_E=h1#XMWt2%fcoN@l7eAS!Es?Q+;XsRNPhiiE=@AqlLkJzF`O18 zbsbSmKN=aaq8k3NFYZfDWpKmM!coBU0(XnL8R{4=i|wi{!uWYM2je{U{B*K2PVdu&=E zTq*-XsEsJ$u5H4g6DIm2Y!DN`>^v|AqlwuCD;w45K0@eqauiqWf7l&o)+YLHm~|L~ z7$0v5mkobriU!H<@mVJHLlmQqzQ3d6Rh_-|%Yy2li*tHO>_vcnuZ7OR_xkAIuIU&x z-|8Y0wj|6|a6_I(v91y%k_kNw6pnkNdxjqG8!%Vz_d%c_!X+6-;1`GC9_FpjoHev5fEV7RhJ>r=mh-jp$fqbqRJ=obwdgLDVP5+s zy1=_DWG0Y-Jb3t^WXmkr(d9~08k-|#Ly zaNOmT(^9tIb&eb4%CzIT zAm3CUtWSr1t4?h1kk#NBi{U|pJslvME{q|_eS^3En>SOqSxyuN1x;Is@8~m?*>}** znrRFArP!K_52RpX*&JHMR<^lVdm8ypJ}0R(SD(51j;6@ni$6bQ+2XL+R^|NnSp5}(kzvMZ^(@4fD_{QVu$(&K6H|C37TG1Am9Re{<<3gd zh@`>;BqkXMW&p0T6rt|iB$)~CvFe(XC)F9WgAZn*0@t$oZo;!*}r@_`h?KKH&6A@3= zISXoQB+~`op>NP-buiA*^0n{@i{_?MRG)&k)c)k_F+-2Lud!S9pc+i`s74NpBCaGF zXN+pHkubw*msGBTY27BKHv)RRh3;nMg4&$fD_6X9Vt~;_4D+5XPH~#Kn-yjcy!$}1 zigv#FNY>TqMhtIBb@UoF!cE~Q8~;!Pek>SQQwHnHuWKoVBosAiOr}q>!>aE*Krc)V zBUMEcJ5NU0g8}-h6i1zpMY9>m4ne?=U2~`w7K7Q0gB_=p@$5K7p6}thw z-~3dMj?YNX2X$lZ+7ngQ$=s}3mizNN@kE%OtB)?c&i~2L55z8^=yz;xMHLmlY>&Q# zJj?!)M#q_SyfkQh)k?j8IfLtB)ZCp|*vf4_B zos?73yd^h-Ac+;?E4*bpf=o*^3x3-`TVjbY4n6!EN10K6o@fxdyps05Vo3PU)otB} z`3kR+2w7_C#8Z!q`J)p{Vh!+m9-UP!$STp+Hb}}#@#_u^SsUQg<}59< zTvH3%XS4G+6FF^(m6bVF&nSUIXcl;nw{=H$%fgeJ>CgDYiLdpDXr{;-AnG z8dvcrHYVMI&`R6;GWekI@Ir3!uo)oz4^{6q0m^}@f2tM9&=YHNi6-?rh0-{+k@cQm zdp`g#YdQn%MDVg2GR>wZ`n2<0l4)9nx1Wfr&!Dvz=bPwU!h2S?ez6MVc5APE4-xLB zi&W9Q8k2@0w!C53g?iAIQ}~p*3O(@zja6KQ=M3zfW*_6o5SwR-)6VBh~m7{^-=MC-owYH5-u40a}a0liho3QZZ5L{bS_xM1)4}19)zTU$$MY zq3eZML1WC{K%YFd`Be0M-rkO^l?h{kM{$2oK1*A@HVJ57*yhDkUF!2WZ&oA4Y-sK( zCY69%#`mBCi6>6uw(x4gbFaP0+FD*JKJ-q!F1E?vLJ+d35!I5d7@^eU?(CS|C^tmI5?lv@s{{*|1F zFg|OzNpZ0hxljdjaW%45O0MOttRrd(Z?h{HYbB-KFUx&9GfFL3b8NwZ$zNu)WbBD` zYkj$^UB5%3Pj1MDr>S2Ejr9pUcgA!;ZG!@{uAy12)vG=*^9-|dNQBc8&`oxBlU~#y zs!anJX&T?57Jdr^sb>e+V`MVfY>Y0ESg7MG<7W0g&bR-ZYzzZ%2H&Etcp zcd6QeXO1D!5A#zM0lx*GH}`M)2~ZFLE;sP^RSB5wVMNfiZXPd(cmO>j=OSA3`o5r& zna(|^jGXbdN7PK)U8b7^zYtYkkeb%<%F~=OqB~kXMQkq}ii|skh@WSRt>5za;cjP0 zZ~nD%6)wzedqE}BMLt~qKwlvTr33))#uP~xyw#*Eaa|DbMQ_%mG0U8numf8)0DX`r zRoG2bM;#g|p-8gWnwRV5SCW0tLjLO&9Z?K>FImeIxlGUgo0Zk`9Qzhj1eco~7XZy+hXc@YF&ZQ=? zn*^1O56yK^x{y}q`j7}blGCx%dydV!c7)g~tJzmHhV=W~jbWRRR{1<^oDK+1clprm zz$eCy7y9+?{E|YgkW~}}iB#I4XoJ*xr8R?i_Hv$=Cof5bo-Nj~f`-DLebH}&0% zfQj9@WGd4;N~Y?mzQsHJTJq6!Qzl^-vwol(+fMt#Pl=Wh#lI5Vmu@QM0=_r+1wHt` z+8WZ~c2}KQQ+q)~2Ki77QvV&`xb|xVcTms99&cD$Zz4+-^R4kvUBxG8gDk7Y`K*)JZ^2rL(+ZWV~%W(@6 z)0bPArG#BROa_PHs~&WplQ_UIrpd)1N1QGPfv!J(Z9jNT#i%H?CE6|pPZb9hJ1JW4 z^q;ft#!HRNV0YgPojzIYT`8LuET2rUe-J|c!9l4`^*;4WtY@Ew@pL>wkjmMgGfN7 ze}}GtmU0@<_#08~I-Suk=^*9GLW=H4xhsml;vAV{%hy5Eegl@!6qKqbG024%n2HHw zCc@ivW_$@5ZoHP70(7D+(`PvgjW1Pd`wsiuv-aCukMrafwDm)B!xXVy*j2opohhoU zcJz%ADmj>i3`-3-$7nQKBQQuGY;2Qt&+(L~C>vSGFj5{Mlv?T_^dql;{zkpe4R1}R z%XfZyQ}wr*sr>jrKgm*PWLjuVc%6&&`Kbf1SuFpHPN&>W)$GmqC;pIoBC`=4-hPY8 zT*>%I2fP}vGW;R=^!1be?ta2UQd2>alOFFbVl;(SQJ4Jk#)4Z0^wpWEVvY4=vyDk@ zqlModi@iVPMC+{?rm=4(n+<;|lmUO@UKYA>EPTS~AndtK^Wy^%#3<;(dQdk3WaUkRtzSMC9}7x2||CNpF#(3T4C)@ z$~RWs`BNABKX|{cmBt>Q=&gkXl&x!!NK_%5hW0LS)Z4PB>%sV?F-{Wyj#s7W%$F{D zXdK^Fp3wvy+48+GP6F_|^PCRx=ddcTO3sG;B23A49~Qaw31SZ0Rc~`r4qqt%#OGW{ zCA_(LG5^N>yzUn&kAgVmxb=EA8s&tBXC}S1CZ(KoW)(%^JjLTPo^fs`Va;`=YlVPgmB$!yB}<(4ym6OeZ3xAJJ#;)2+B%p3P1Wt+d$eo`vz`T zXfUP2))kBDPoscH;Jc7I3NU<({|@wM$&GaDt`n7WLgIY3IA7A6-_R?z8N3mz|}*i z(zl5ot--Oq@f2-nv{X(ujT2T(k1vY_qh93pK@>H-qc%2Xta)IP0Q%zt%bqYgI`o!wv!0QerB`nCN^1n|@$sVOQ!V0teVG!I z_fD%JvfDeT1cK#-{o6Gv7}& zY0#NWin~kVaf$aufV&;63Hbs|`QVZWpDX6IMk1Hj2G}fiH9e-^6u2zf^FIr^BwD<6zjw63+{yUe8PUFvk8v{sJ=R{d#`O!sz`Q13~< zPT$JS(w=yQfU2`zPCNfSw=&zup@DXc(98afjhv@1w_f!m2Z>rMJ19AB&dB%P#Ls3b z=lK7OILM+SQ&VEd=1GN6o&>YVVtIzoZ%=Z_SdqJN2}E43{bE`>w+A;=y->@^k{oCC z$F*WTY&?34;kfyFV?b*Xb1Pq`Z=%OgwEg)Rz)tx=`f%5#w_INP=x&z5!jI;#;N$ma zhO)+MDm;SxOEVL15; zGq(v2pL3&P1Sl)8P*;G-fd{l1QJsv@e@d8)1PK4w2m*M%V3j-V~L^$i|&C@b?D?9tfwE{B^}Z$k8e5FmQ>v7Xz)sG32g9t}YBt zyR$+*_00RmPx+0mW+vVG4mxd(n$(eQf3-w>JPl2UJpafrPaL5@2j}%{VE-) zBI%6Qpj*dsdH<;g!S!avA~bv^0E+ zfyJbSjPb+j;J52U)<|cIcntQBI2T#>2;tOxu{%D?kML476AErF(qN9hPva5Nkc@BF zC-tLF@3ZFb%Kpj)M<{)x*l|*Ia@ECeXo2E4h2f!aV=cHAhi_E_mfUth(sM4^hJq7B zQsGWqdZUm9S%F`$nQ*_#NcuD`&)Ek%_s{&^78{9Hm ztri&rYLOxgFdG>O@+XHy z9#;|&vBCPXH5Mon^I`jSuR$&~ZWtyB67ujzFSj!51>#C}C17~TffQ{c-!QFQkTQ%! zIR^b1`zHx|*1GU?tbBx23weFLz5H?y_Q%N&t$}k?w+``2A=aotj0;2v$~AL z{scF-cL{wsdrmPvf#a9OHyYLcwQD4Kcm)`LLwMh4WT~p29f7M!iafJSU`IV}QY5Wa z(n44-9oA}?J{a+ah*@31WTs#&J#o1`H98#6IQf;Wv0N_!);f&9g7o-k(lW5rWnDUR zQBFIRG+X=6NnsI@mxnwm;tf5;_Uxg?jZ8m-m0}&6+DA!qam(p$mN5R})yA_7m$q@| zFEd|dpS595rxQr-n#GjI5i-AhnUE>Cr;jpCqSrD~EwK_DqI^7%3#p5)%T_od!t3SOmH9MyXeeGO2(UQL;ax|x?Ncixmeo1=$ z{-);Au{*tfzOG?KQ~K|ak8-HQ?`Pekhe2WM(8s{xv-p>Zmu_6{G!-oE$7$mY`MOJorI=+mMx?H;`pr!;fVYz?5~yXBACruWB`Ph zZM}90_<^OBxIhyZ9BW$`>6JvO;%VFpqVr8|7t3~AmxYak6?`Pp#c;**_SYmi`&z23 z`p6_~ePvH)C6x-G9$hgL=eVALq`-AiamN>!3~Lxw&{H(b{B(7xSRm6<3<{%{yXiH# zos5Rv1L+8fUKJLo%P>4I&$}yR?p|tHQo6fg38|$UVM!6BLrPFWk?s;$LOP{GmJpBl$qoSA!PUg~PA65-S00{{S`XKG6NkG0RgjEntPrmV+?0|00mu7;+5 zrdpa{2QLqPJ4Y{j7=Mrl{BaxrkdY69+c~(w{Fv-v&aR%aEI&JYSeRTLWm!zbv;?)_ ziZB;fwGbbeL5Q}YLx`J$lp~A09KK8t_z}PZ=4ZzgdeKtgoc+o5EvN9A1K1_<>M?MBqb#!ASf&# zEX?<)!RH(7>1P+j=jqG(58}TVN-$psA6K}atCuI!KTJD&FMmH-78ZejBm)0qc{ESp z|LuG1{QnBUJRg_E=h1#XMWt2%fcoN@l7eAS!Es?Q+;XsRNPhiiE=@AqlLkJzF`O18 zbsbSmKN=aaq8k3NFYZfDWpKmM!coBU0(XnL8R{4=i|wi{!uWYM2je{U{B*K2PVdu&=E zTq*-XsEsJ$u5H4g6DIm2Y!DN`>^v|AqlwuCD;w45K0@eqauiqWf7l&o)+YLHm~|L~ z7$0v5mkobriU!H<@mVJHLlmQqzQ3d6Rh_-|%Yy2li*tHO>_vcnuZ7OR_xkAIuIU&x z-|8Y0wj|6|a6_I(v91y%k_kNw6pnkNdxjqG8!%Vz_d%c_!X+6-;1`GC9_FpjoHev5fEV7RhJ>r=mh-jp$fqbqRJ=obwdgLDVP5+s zy1=_DWG0Y-Jb3t^WXmkr(d9~08k-|#Ly zaNOmT(^9tIb&eb4%CzIT zAm3CUtWSr1t4?h1kk#NBi{U|pJslvME{q|_eS^3En>SOqSxyuN1x;Is@8~m?*>}** znrRFArP!K_52RpX*&JHMR<^lVdm8ypJ}0R(SD(51j;6@ni$6bQ+2XL+R^|NnSp5}(kzvMZ^(@4fD_{QVu$(&K6H|C37TG1Am9Re{<<3gd zh@`>;BqkXMW&p0T6rt|iB$)~CvFe(XC)F9WgAZn*0@t$oZo;!*}r@_`h?KKH&6A@3= zISXoQB+~`op>NP-buiA*^0n{@i{_?MRG)&k)c)k_F+-2Lud!S9pc+i`s74NpBCaGF zXN+pHkubw*msGBTY27BKHv)RRh3;nMg4&$fD_6X9Vt~;_4D+5XPH~#Kn-yjcy!$}1 zigv#FNY>TqMhtIBb@UoF!cE~Q8~;!Pek>SQQwHnHuWKoVBosAiOr}q>!>aE*Krc)V zBUMEcJ5NU0g8}-h6i1zpMY9>m4ne?=U2~`w7K7Q0gB_=p@$5K7p6}thw z-~3dMj?YNX2X$lZ+7ngQ$=s}3mizNN@kE%OtB)?c&i~2L55z8^=yz;xMHLmlY>&Q# zJj?!)M#q_SyfkQh)k?j8IfLtB)ZCp|*vf4_B zos?73yd^h-Ac+;?E4*bpf=o*^3x3-`TVjbY4n6!EN10K6o@fxdyps05Vo3PU)otB} z`3kR+2w7_C#8Z!q`J)p{Vh!+m9-UP!$STp+Hb}}#@#_u^SsUQg<}59< zTvH3%XS4G+6FF^(m6bVF&nSUIXcl;nw{=H$%fgeJ>CgDYiLdpDXr{;-AnG z8dvcrHYVMI&`R6;GWekI@Ir3!uo)oz4^{6q0m^}@f2tM9&=YHNi6-?rh0-{+k@cQm zdp`g#YdQn%MDVg2GR>wZ`n2<0l4)9nx1Wfr&!Dvz=bPwU!h2S?ez6MVc5APE4-xLB zi&W9Q8k2@0w!C53g?iAIQ}~p*3O(@zja6KQ=M3zfW*_6o5SwR-)6VBh~m7{^-=MC-owYH5-u40a}a0liho3QZZ5L{bS_xM1)4}19)zTU$$MY zq3eZML1WC{K%YFd`Be0M-rkO^l?h{kM{$2oK1*A@HVJ57*yhDkUF!2WZ&oA4Y-sK( zCY69%#`mBCi6>6uw(x4gbFaP0+FD*JKJ-q!F1E?vLJ+d35!I5d7@^eU?(CS|C^tmI5?lv@s{{*|1F zFg|OzNpZ0hxljdjaW%45O0MOttRrd(Z?h{HYbB-KFUx&9GfFL3b8NwZ$zNu)WbBD` zYkj$^UB5%3Pj1MDr>S2Ejr9pUcgA!;ZG!@{uAy12)vG=*^9-|dNQBc8&`oxBlU~#y zs!anJX&T?57Jdr^sb>e+V`MVfY>Y0ESg7MG<7W0g&bR-ZYzzZ%2H&Etcp zcd6QeXO1D!5A#zM0lx*GH}`M)2~ZFLE;sP^RSB5wVMNfiZXPd(cmO>j=OSA3`o5r& zna(|^jGXbdN7PK)U8b7^zYtYkkeb%<%F~=OqB~kXMQkq}ii|skh@WSRt>5za;cjP0 zZ~nD%6)wzedqE}BMLt~qKwlvTr33))#uP~xyw#*Eaa|DbMQ_%mG0U8numf8)0DX`r zRoG2bM;#g|p-8gWnwRV5SCW0tLjLO&9Z?K>FImeIxlGUgo0Zk`9Qzhj1eco~7XZy+hXc@YF&ZQ=? zn*^1O56yK^x{y}q`j7}blGCx%dydV!c7)g~tJzmHhV=W~jbWRRR{1<^oDK+1clprm zz$eCy7y9+?{E|YgkW~}}iB#I4XoJ*xr8R?i_Hv$=Cof5bo-Nj~f`-DLebH}&0% zfQj9@WGd4;N~Y?mzQsHJTJq6!Qzl^-vwol(+fMt#Pl=Wh#lI5Vmu@QM0=_r+1wHt` z+8WZ~c2}KQQ+q)~2Ki77QvV&`xb|xVcTms99&cD$Zz4+-^R4kvUBxG8gDk7Y`K*)JZ^2rL(+ZWV~%W(@6 z)0bPArG#BROa_PHs~&WplQ_UIrpd)1N1QGPfv!J(Z9jNT#i%H?CE6|pPZb9hJ1JW4 z^q;ft#!HRNV0YgPojzIYT`8LuET2rUe-J|c!9l4`^*;4WtY@Ew@pL>wkjmMgGfN7 ze}}GtmU0@<_#08~I-Suk=^*9GLW=H4xhsml;vAV{%hy5Eegl@!6qKqbG024%n2HHw zCc@ivW_$@5ZoHP70(7D+(`PvgjW1Pd`wsiuv-aCukMrafwDm)B!xXVy*j2opohhoU zcJz%ADmj>i3`-3-$7nQKBQQuGY;2Qt&+(L~C>vSGFj5{Mlv?T_^dql;{zkpe4R1}R z%XfZyQ}wr*sr>jrKgm*PWLjuVc%6&&`Kbf1SuFpHPN&>W)$GmqC;pIoBC`=4-hPY8 zT*>%I2fP}vGW;R=^!1be?ta2UQd2>alOFFbVl;(SQJ4Jk#)4Z0^wpWEVvY4=vyDk@ zqlModi@iVPMC+{?rm=4(n+<;|lmUO@UKYA>EPTS~AndtK^Wy^%#3<;(dQdk3WaUkRtzSMC9}7x2||CNpF#(3T4C)@ z$~RWs`BNABKX|{cmBt>Q=&gkXl&x!!NK_%5hW0LS)Z4PB>%sV?F-{Wyj#s7W%$F{D zXdK^Fp3wvy+48+GP6F_|^PCRx=ddcTO3sG;B23A49~Qaw31SZ0Rc~`r4qqt%#OGW{ zCA_(LG5^N>yzUn&kAgVmxb=EA8s&tBXC}S1CZ(KoW)(%^JjLTPo^fs`Va;`=YlVPgmB$!yB}<(4ym6OeZ3xAJJ#;)2+B%p3P1Wt+d$eo`vz`T zXfUP2))kBDPoscH;Jc7I3NU<({|@wM$&GaDt`n7WLgIY3IA7A6-_R?z8N3mz|}*i z(zl5ot--Oq@f2-nv{X(ujT2T(k1vY_qh93pK@>H-qc%2Xta)IP0Q%zt%bqYgI`o!wv!0QerB`nCN^1n|@$sVOQ!V0teVG!I z_fD%JvfDeT1cK#-{o6Gv7}& zY0#NWin~kVaf$aufV&;63Hbs|`QVZWpDX6IMk1Hj2G}fiH9e-^6u2zf^FIr^BwD<6zjw63+{yUe8PUFvk8v{sJ=R{d#`O!sz`Q13~< zPT$JS(w=yQfU2`zPCNfSw=&zup@DXc(98afjhv@1w_f!m2Z>rMJ19AB&dB%P#Ls3b z=lK7OILM+SQ&VEd=1GN6o&>YVVtIzoZ%=Z_SdqJN2}E43{bE`>w+A;=y->@^k{oCC z$F*WTY&?34;kfyFV?b*Xb1Pq`Z=%OgwEg)Rz)tx=`f%5#w_INP=x&z5!jI;#;N$ma zhO)+MDm;SxOEVL15; zGq(v2pL3&P1Sl)8P*;G-fd{l1QJsv@e@d8)1PK4w2m*M%V3j-V~L^$i|&C@b?D?9tfwE{B^}Z$k8e5FmQ>v7Xz)sG32g9t}YBt zyR$+*_00RmPx+0mW+vVG4mxd(n$(eQf3-w>JPl2UJpafrPaL5@2j}%{VE-) zBI%6Qpj*dsdH<;g!S!avA~bv^0E+ zfyJbSjPb+j;J52U)<|cIcntQBI2T#>2;tOxu{%D?kML476AErF(qN9hPva5Nkc@BF zC-tLF@3ZFb%Kpj)M<{)x*l|*Ia@ECeXo2E4h2f!aV=cHAhi_E_mfUth(sM4^hJq7B zQsGWqdZUm9S%F`$nQ*_#NcuD`&)Ek%_s{&^78{9Hm ztri&rYLOxgFdG>O@+XHy z9#;|&vBCPXH5Mon^I`jSuR$&~ZWtyB67ujzFSj!51>#C}C17~TffQ{c-!QFQkTQ%! zIR^b1`zHx|*1GU?tbBx23weFLz5H?y_Q%N&t$}k?w+``2A=aotj0;2v$~AL z{scF-cL{wsdrmPvf#a9OHyYLcwQD4Kcm)`LLwMh4WT~p29f7M!iafJSU`IV}QY5Wa z(n44-9oA}?J{a+ah*@31WTs#&J#o1`H98#6IQf;Wv0N_!);f&9g7o-k(lW5rWnDUR zQBFIRG+X=6NnsI@mxnwm;tf5;_Uxg?jZ8m-m0}&6+DA!qam(p$mN5R})yA_7m$q@| zFEd|dpS595rxQr-n#GjI5i-AhnUE>Cr;jpCqSrD~EwK_DqI^7%3#p5)%T_od!t3SOmH9MyXeeGO2(UQL;ax|x?Ncixmeo1=$ z{-);Au{*tfzOG?KQ~K|ak8-HQ?`Pekhe2WM(8s{xv-p>Zmu_6{G!-oE$7$mY`MOJorI=+mMx?H;`pr!;fVYz?5~yXBACruWB`Ph zZM}90_<^OBxIhyZ9BW$`>6JvO;%VFpqVr8|7t3~AmxYak6?`Pp#c;**_SYmi`&z23 z`p6_~ePvH)C6x-G9$hgL=eVALq`-AiamN>!3~Lxw&{H(b{B(7xSRm6<3<{%{yXiH# zos5Rv1L+8fUKJLo%P>4I&$}y { + if (err.code) { + hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? ''); + return; + } + hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', + JSON.stringify(data) ?? ''); + }); + } + + onWindowStageDestroy() { + hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onWindowStageDestroy'); + } + + onForeground() { + hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onForeground'); + } + + onBackground() { + hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onBackground'); + } +} \ No newline at end of file diff --git a/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets new file mode 100644 index 00000000..545843d3 --- /dev/null +++ b/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -0,0 +1,36 @@ + + +import hilog from '@ohos.hilog'; + +@Entry +@Component +struct Index { + aboutToAppear() { + hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility index aboutToAppear'); + } + @State message: string = 'Hello World' + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(20) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .width('35%') + .height('5%') + .onClick(()=>{ + }) + } + .width('100%') + } + .height('100%') + } + } \ No newline at end of file diff --git a/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts new file mode 100644 index 00000000..47fc89b4 --- /dev/null +++ b/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,50 @@ + +import hilog from '@ohos.hilog'; +import TestRunner from '@ohos.application.testRunner'; +import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; + +var abilityDelegator = undefined +var abilityDelegatorArguments = undefined + +async function onAbilityCreateCallback() { + hilog.info(0x0000, 'testTag', '%{public}s', 'onAbilityCreateCallback'); +} + +async function addAbilityMonitorCallback(err: any) { + hilog.info(0x0000, 'testTag', 'addAbilityMonitorCallback : %{public}s', JSON.stringify(err) ?? ''); +} + +export default class OpenHarmonyTestRunner implements TestRunner { + constructor() { + } + + onPrepare() { + hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner OnPrepare '); + } + + async onRun() { + hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun run'); + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var testAbilityName = abilityDelegatorArguments.bundleName + '.TestAbility' + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) + var cmd = 'aa start -d 0 -a TestAbility' + ' -b ' + abilityDelegatorArguments.bundleName + var debug = abilityDelegatorArguments.parameters['-D'] + if (debug == 'true') + { + cmd += ' -D' + } + hilog.info(0x0000, 'testTag', 'cmd : %{public}s', cmd); + abilityDelegator.executeShellCommand(cmd, + (err: any, d: any) => { + hilog.info(0x0000, 'testTag', 'executeShellCommand : err : %{public}s', JSON.stringify(err) ?? ''); + hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', d.stdResult ?? ''); + hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', d.exitCode ?? ''); + }) + hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun end'); + } +} \ No newline at end of file diff --git a/example/ohos/entry/src/ohosTest/module.json5 b/example/ohos/entry/src/ohosTest/module.json5 new file mode 100644 index 00000000..3b02a75a --- /dev/null +++ b/example/ohos/entry/src/ohosTest/module.json5 @@ -0,0 +1,37 @@ + +{ + "module": { + "name": "entry_test", + "type": "feature", + "description": "$string:module_test_desc", + "mainElement": "TestAbility", + "deviceTypes": [ + "phone" + ], + "deliveryWithInstall": true, + "installationFree": false, + "pages": "$profile:test_pages", + "abilities": [ + { + "name": "TestAbility", + "srcEntry": "./ets/testability/TestAbility.ets", + "description": "$string:TestAbility_desc", + "icon": "$media:icon", + "label": "$string:TestAbility_label", + "exported": true, + "startWindowIcon": "$media:icon", + "startWindowBackground": "$color:start_window_background", + "skills": [ + { + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } + ] + } + ] + } +} diff --git a/example/ohos/entry/src/ohosTest/resources/base/element/color.json b/example/ohos/entry/src/ohosTest/resources/base/element/color.json new file mode 100644 index 00000000..3c712962 --- /dev/null +++ b/example/ohos/entry/src/ohosTest/resources/base/element/color.json @@ -0,0 +1,8 @@ +{ + "color": [ + { + "name": "start_window_background", + "value": "#FFFFFF" + } + ] +} \ No newline at end of file diff --git a/example/ohos/entry/src/ohosTest/resources/base/element/string.json b/example/ohos/entry/src/ohosTest/resources/base/element/string.json new file mode 100644 index 00000000..65d8fa5a --- /dev/null +++ b/example/ohos/entry/src/ohosTest/resources/base/element/string.json @@ -0,0 +1,16 @@ +{ + "string": [ + { + "name": "module_test_desc", + "value": "test ability description" + }, + { + "name": "TestAbility_desc", + "value": "the test ability" + }, + { + "name": "TestAbility_label", + "value": "test label" + } + ] +} \ No newline at end of file diff --git a/example/ohos/entry/src/ohosTest/resources/base/media/icon.png b/example/ohos/entry/src/ohosTest/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c GIT binary patch literal 6790 zcmX|G1ymHk)?T_}Vd;>R?p|tHQo6fg38|$UVM!6BLrPFWk?s;$LOP{GmJpBl$qoSA!PUg~PA65-S00{{S`XKG6NkG0RgjEntPrmV+?0|00mu7;+5 zrdpa{2QLqPJ4Y{j7=Mrl{BaxrkdY69+c~(w{Fv-v&aR%aEI&JYSeRTLWm!zbv;?)_ ziZB;fwGbbeL5Q}YLx`J$lp~A09KK8t_z}PZ=4ZzgdeKtgoc+o5EvN9A1K1_<>M?MBqb#!ASf&# zEX?<)!RH(7>1P+j=jqG(58}TVN-$psA6K}atCuI!KTJD&FMmH-78ZejBm)0qc{ESp z|LuG1{QnBUJRg_E=h1#XMWt2%fcoN@l7eAS!Es?Q+;XsRNPhiiE=@AqlLkJzF`O18 zbsbSmKN=aaq8k3NFYZfDWpKmM!coBU0(XnL8R{4=i|wi{!uWYM2je{U{B*K2PVdu&=E zTq*-XsEsJ$u5H4g6DIm2Y!DN`>^v|AqlwuCD;w45K0@eqauiqWf7l&o)+YLHm~|L~ z7$0v5mkobriU!H<@mVJHLlmQqzQ3d6Rh_-|%Yy2li*tHO>_vcnuZ7OR_xkAIuIU&x z-|8Y0wj|6|a6_I(v91y%k_kNw6pnkNdxjqG8!%Vz_d%c_!X+6-;1`GC9_FpjoHev5fEV7RhJ>r=mh-jp$fqbqRJ=obwdgLDVP5+s zy1=_DWG0Y-Jb3t^WXmkr(d9~08k-|#Ly zaNOmT(^9tIb&eb4%CzIT zAm3CUtWSr1t4?h1kk#NBi{U|pJslvME{q|_eS^3En>SOqSxyuN1x;Is@8~m?*>}** znrRFArP!K_52RpX*&JHMR<^lVdm8ypJ}0R(SD(51j;6@ni$6bQ+2XL+R^|NnSp5}(kzvMZ^(@4fD_{QVu$(&K6H|C37TG1Am9Re{<<3gd zh@`>;BqkXMW&p0T6rt|iB$)~CvFe(XC)F9WgAZn*0@t$oZo;!*}r@_`h?KKH&6A@3= zISXoQB+~`op>NP-buiA*^0n{@i{_?MRG)&k)c)k_F+-2Lud!S9pc+i`s74NpBCaGF zXN+pHkubw*msGBTY27BKHv)RRh3;nMg4&$fD_6X9Vt~;_4D+5XPH~#Kn-yjcy!$}1 zigv#FNY>TqMhtIBb@UoF!cE~Q8~;!Pek>SQQwHnHuWKoVBosAiOr}q>!>aE*Krc)V zBUMEcJ5NU0g8}-h6i1zpMY9>m4ne?=U2~`w7K7Q0gB_=p@$5K7p6}thw z-~3dMj?YNX2X$lZ+7ngQ$=s}3mizNN@kE%OtB)?c&i~2L55z8^=yz;xMHLmlY>&Q# zJj?!)M#q_SyfkQh)k?j8IfLtB)ZCp|*vf4_B zos?73yd^h-Ac+;?E4*bpf=o*^3x3-`TVjbY4n6!EN10K6o@fxdyps05Vo3PU)otB} z`3kR+2w7_C#8Z!q`J)p{Vh!+m9-UP!$STp+Hb}}#@#_u^SsUQg<}59< zTvH3%XS4G+6FF^(m6bVF&nSUIXcl;nw{=H$%fgeJ>CgDYiLdpDXr{;-AnG z8dvcrHYVMI&`R6;GWekI@Ir3!uo)oz4^{6q0m^}@f2tM9&=YHNi6-?rh0-{+k@cQm zdp`g#YdQn%MDVg2GR>wZ`n2<0l4)9nx1Wfr&!Dvz=bPwU!h2S?ez6MVc5APE4-xLB zi&W9Q8k2@0w!C53g?iAIQ}~p*3O(@zja6KQ=M3zfW*_6o5SwR-)6VBh~m7{^-=MC-owYH5-u40a}a0liho3QZZ5L{bS_xM1)4}19)zTU$$MY zq3eZML1WC{K%YFd`Be0M-rkO^l?h{kM{$2oK1*A@HVJ57*yhDkUF!2WZ&oA4Y-sK( zCY69%#`mBCi6>6uw(x4gbFaP0+FD*JKJ-q!F1E?vLJ+d35!I5d7@^eU?(CS|C^tmI5?lv@s{{*|1F zFg|OzNpZ0hxljdjaW%45O0MOttRrd(Z?h{HYbB-KFUx&9GfFL3b8NwZ$zNu)WbBD` zYkj$^UB5%3Pj1MDr>S2Ejr9pUcgA!;ZG!@{uAy12)vG=*^9-|dNQBc8&`oxBlU~#y zs!anJX&T?57Jdr^sb>e+V`MVfY>Y0ESg7MG<7W0g&bR-ZYzzZ%2H&Etcp zcd6QeXO1D!5A#zM0lx*GH}`M)2~ZFLE;sP^RSB5wVMNfiZXPd(cmO>j=OSA3`o5r& zna(|^jGXbdN7PK)U8b7^zYtYkkeb%<%F~=OqB~kXMQkq}ii|skh@WSRt>5za;cjP0 zZ~nD%6)wzedqE}BMLt~qKwlvTr33))#uP~xyw#*Eaa|DbMQ_%mG0U8numf8)0DX`r zRoG2bM;#g|p-8gWnwRV5SCW0tLjLO&9Z?K>FImeIxlGUgo0Zk`9Qzhj1eco~7XZy+hXc@YF&ZQ=? zn*^1O56yK^x{y}q`j7}blGCx%dydV!c7)g~tJzmHhV=W~jbWRRR{1<^oDK+1clprm zz$eCy7y9+?{E|YgkW~}}iB#I4XoJ*xr8R?i_Hv$=Cof5bo-Nj~f`-DLebH}&0% zfQj9@WGd4;N~Y?mzQsHJTJq6!Qzl^-vwol(+fMt#Pl=Wh#lI5Vmu@QM0=_r+1wHt` z+8WZ~c2}KQQ+q)~2Ki77QvV&`xb|xVcTms99&cD$Zz4+-^R4kvUBxG8gDk7Y`K*)JZ^2rL(+ZWV~%W(@6 z)0bPArG#BROa_PHs~&WplQ_UIrpd)1N1QGPfv!J(Z9jNT#i%H?CE6|pPZb9hJ1JW4 z^q;ft#!HRNV0YgPojzIYT`8LuET2rUe-J|c!9l4`^*;4WtY@Ew@pL>wkjmMgGfN7 ze}}GtmU0@<_#08~I-Suk=^*9GLW=H4xhsml;vAV{%hy5Eegl@!6qKqbG024%n2HHw zCc@ivW_$@5ZoHP70(7D+(`PvgjW1Pd`wsiuv-aCukMrafwDm)B!xXVy*j2opohhoU zcJz%ADmj>i3`-3-$7nQKBQQuGY;2Qt&+(L~C>vSGFj5{Mlv?T_^dql;{zkpe4R1}R z%XfZyQ}wr*sr>jrKgm*PWLjuVc%6&&`Kbf1SuFpHPN&>W)$GmqC;pIoBC`=4-hPY8 zT*>%I2fP}vGW;R=^!1be?ta2UQd2>alOFFbVl;(SQJ4Jk#)4Z0^wpWEVvY4=vyDk@ zqlModi@iVPMC+{?rm=4(n+<;|lmUO@UKYA>EPTS~AndtK^Wy^%#3<;(dQdk3WaUkRtzSMC9}7x2||CNpF#(3T4C)@ z$~RWs`BNABKX|{cmBt>Q=&gkXl&x!!NK_%5hW0LS)Z4PB>%sV?F-{Wyj#s7W%$F{D zXdK^Fp3wvy+48+GP6F_|^PCRx=ddcTO3sG;B23A49~Qaw31SZ0Rc~`r4qqt%#OGW{ zCA_(LG5^N>yzUn&kAgVmxb=EA8s&tBXC}S1CZ(KoW)(%^JjLTPo^fs`Va;`=YlVPgmB$!yB}<(4ym6OeZ3xAJJ#;)2+B%p3P1Wt+d$eo`vz`T zXfUP2))kBDPoscH;Jc7I3NU<({|@wM$&GaDt`n7WLgIY3IA7A6-_R?z8N3mz|}*i z(zl5ot--Oq@f2-nv{X(ujT2T(k1vY_qh93pK@>H-qc%2Xta)IP0Q%zt%bqYgI`o!wv!0QerB`nCN^1n|@$sVOQ!V0teVG!I z_fD%JvfDeT1cK#-{o6Gv7}& zY0#NWin~kVaf$aufV&;63Hbs|`QVZWpDX6IMk1Hj2G}fiH9e-^6u2zf^FIr^BwD<6zjw63+{yUe8PUFvk8v{sJ=R{d#`O!sz`Q13~< zPT$JS(w=yQfU2`zPCNfSw=&zup@DXc(98afjhv@1w_f!m2Z>rMJ19AB&dB%P#Ls3b z=lK7OILM+SQ&VEd=1GN6o&>YVVtIzoZ%=Z_SdqJN2}E43{bE`>w+A;=y->@^k{oCC z$F*WTY&?34;kfyFV?b*Xb1Pq`Z=%OgwEg)Rz)tx=`f%5#w_INP=x&z5!jI;#;N$ma zhO)+MDm;SxOEVL15; zGq(v2pL3&P1Sl)8P*;G-fd{l1QJsv@e@d8)1PK4w2m*M%V3j-V~L^$i|&C@b?D?9tfwE{B^}Z$k8e5FmQ>v7Xz)sG32g9t}YBt zyR$+*_00RmPx+0mW+vVG4mxd(n$(eQf3-w>JPl2UJpafrPaL5@2j}%{VE-) zBI%6Qpj*dsdH<;g!S!avA~bv^0E+ zfyJbSjPb+j;J52U)<|cIcntQBI2T#>2;tOxu{%D?kML476AErF(qN9hPva5Nkc@BF zC-tLF@3ZFb%Kpj)M<{)x*l|*Ia@ECeXo2E4h2f!aV=cHAhi_E_mfUth(sM4^hJq7B zQsGWqdZUm9S%F`$nQ*_#NcuD`&)Ek%_s{&^78{9Hm ztri&rYLOxgFdG>O@+XHy z9#;|&vBCPXH5Mon^I`jSuR$&~ZWtyB67ujzFSj!51>#C}C17~TffQ{c-!QFQkTQ%! zIR^b1`zHx|*1GU?tbBx23weFLz5H?y_Q%N&t$}k?w+``2A=aotj0;2v$~AL z{scF-cL{wsdrmPvf#a9OHyYLcwQD4Kcm)`LLwMh4WT~p29f7M!iafJSU`IV}QY5Wa z(n44-9oA}?J{a+ah*@31WTs#&J#o1`H98#6IQf;Wv0N_!);f&9g7o-k(lW5rWnDUR zQBFIRG+X=6NnsI@mxnwm;tf5;_Uxg?jZ8m-m0}&6+DA!qam(p$mN5R})yA_7m$q@| zFEd|dpS595rxQr-n#GjI5i-AhnUE>Cr;jpCqSrD~EwK_DqI^7%3#p5)%T_od!t3SOmH9MyXeeGO2(UQL;ax|x?Ncixmeo1=$ z{-);Au{*tfzOG?KQ~K|ak8-HQ?`Pekhe2WM(8s{xv-p>Zmu_6{G!-oE$7$mY`MOJorI=+mMx?H;`pr!;fVYz?5~yXBACruWB`Ph zZM}90_<^OBxIhyZ9BW$`>6JvO;%VFpqVr8|7t3~AmxYak6?`Pp#c;**_SYmi`&z23 z`p6_~ePvH)C6x-G9$hgL=eVALq`-AiamN>!3~Lxw&{H(b{B(7xSRm6<3<{%{yXiH# zos5Rv1L+8fUKJLo%P>4I&$}y = context.resourceManager.getRawFileListSync(parentPath); + for (let i = list.length - 1; i >= 0; i--) { + const filePath = parentPath + SEPARATOR_CHAR + list[i]; + if (context.resourceManager.isRawDir(filePath)) { + copyFiles(context, filePath); + } else { + copyToFile(context, filePath, parentPath); + } + } +} + +function hasRawDir(context: Context, dir: string, parentPath?: string) { + const list: Array = context.resourceManager.getRawFileListSync(parentPath ? parentPath : ''); + if (list.indexOf(dir) == -1) { + return false; + } + return context.resourceManager.isRawDir(parentPath ? (parentPath + SEPARATOR_CHAR) : '' + dir); +} + +/** + * + * @param origin rawFile下路径 + * @param target + */ +async function copyToFile(context: Context, origin: string, parentPath: string) { + try { + let originFile = await context.resourceManager.getRawFileContent(origin); + const targetParent = context.filesDir + SEPARATOR_CHAR + parentPath; + const targetPath = context.filesDir + SEPARATOR_CHAR + origin; + if (!fs.accessSync(targetParent)) { + fs.mkdirSync(targetParent, true); + } + if (fs.accessSync(targetPath)) { + log('file is exist,path=' + origin); + return; + } + let targetFile = fs.openSync(targetPath, fs.OpenMode.READ_WRITE | fs.OpenMode.CREATE); + fs.writeSync(targetFile.fd, originFile.buffer); + log('copy file success,path=' + targetPath); + } catch (e) { + log('failed:origin=' + origin + ",parentPath=" + parentPath); + log(JSON.stringify(e)); + } +} + +function log(msg: string) { + Log.d(TAG, msg); +} + +/** + * 路径转换 + * @param assetsPath assets下相对路径 + * @returns 拷贝资源的沙箱路径 + */ +export function getFilePathByAssetsPath(context: Context, assetsPath: string): string { + if (assetsPath.indexOf('/assets') != -1) { + return context.filesDir + SEPARATOR_CHAR + 'flutter_assets' + assetsPath; + } else { + return context.filesDir + SEPARATOR_CHAR + FILE_PREFIX + SEPARATOR_CHAR + assetsPath; + } +} + diff --git a/ohos/src/main/ets/components/fijkplayer/common/Constants.ets b/ohos/src/main/ets/components/fijkplayer/common/Constants.ets new file mode 100644 index 00000000..23d094ed --- /dev/null +++ b/ohos/src/main/ets/components/fijkplayer/common/Constants.ets @@ -0,0 +1,52 @@ +/** + * 参考：ijkplayer/src/main/cpp/ijkplayer/ijkplayer_android_def.h + */ +export class MediaInfoType { + static readonly MEDIA_INFO_UNKNOWN = 1; + static readonly MEDIA_INFO_STARTED_AS_NEXT = 2; + static readonly MEDIA_INFO_VIDEO_RENDERING_START = 3; + static readonly MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; + static readonly MEDIA_INFO_BUFFERING_START = 701; + static readonly MEDIA_INFO_BUFFERING_END = 702; + static readonly MEDIA_INFO_NETWORK_BANDWIDTH = 703; + static readonly MEDIA_INFO_BAD_INTERLEAVING = 800; + static readonly MEDIA_INFO_NOT_SEEKABLE = 801; + static readonly MEDIA_INFO_METADATA_UPDATE = 802; + static readonly MEDIA_INFO_TIMED_TEXT_ERROR = 900; + static readonly MEDIA_INFO_VIDEO_ROTATION_CHANGED = 10001; + static readonly MEDIA_INFO_AUDIO_RENDERING_START = 10002; + static readonly MEDIA_INFO_AUDIO_DECODED_START = 10003; + static readonly MEDIA_INFO_VIDEO_DECODED_START = 10004; + static readonly MEDIA_INFO_OPEN_INPUT = 10005; + static readonly MEDIA_INFO_FIND_STREAM_INFO = 10006; + static readonly MEDIA_INFO_COMPONENT_OPEN = 10007; + static readonly MEDIA_INFO_VIDEO_SEEK_RENDERING_START = 10008; + static readonly MEDIA_INFO_AUDIO_SEEK_RENDERING_START = 10009; + static readonly MEDIA_INFO_MEDIA_ACCURATE_SEEK_COMPLETE = 10100; +} + + +/** + * 播放器的状态 + */ +export enum PlayerState { + unkown = -1, + idle = 0, + initialized = 1, + asyncPreparing = 2, + prepared = 3, + started = 4, + paused = 5, + completed = 6, + stopped = 7, + error = 8, + end = 9, +} + + +export class OptionsCategory { + static readonly OPT_CATEGORY_FORMAT = 1; + static readonly OPT_CATEGORY_CODEC = 2; + static readonly OPT_CATEGORY_SWS = 3; + static readonly OPT_CATEGORY_PLAYER = 4; +} \ No newline at end of file diff --git a/ohos/src/main/ets/components/fijkplayer/common/HostOption.ets b/ohos/src/main/ets/components/fijkplayer/common/HostOption.ets new file mode 100644 index 00000000..d923ff1d --- /dev/null +++ b/ohos/src/main/ets/components/fijkplayer/common/HostOption.ets @@ -0,0 +1,35 @@ +import { HashMap } from "@kit.ArkTS"; + + +export default class HostOption{ + static readonly REQUEST_AUDIOFOCUS = "request-audio-focus"; + static readonly RELEASE_AUDIOFOCUS = "release-audio-focus"; + static readonly REQUEST_SCREENON = "request-screen-on"; + static readonly ENABLE_SNAPSHOT = "enable-snapshot"; + + private mNumberOption:HashMap = new HashMap(); + private mStrOption:HashMap = new HashMap(); + + addNumberOption(key:string,value:number){ + this.mNumberOption.set(key,value); + } + + addStrOption(key:string,value:string){ + this.mStrOption.set(key,value); + } + + getNumberOption(key:string,defaultValue:number):number{ + if(this.mNumberOption.hasKey(key)){ + return this.mNumberOption.get(key); + } + return defaultValue; + } + + getStrOption(key:string,defaultValue:string):string{ + if(this.mStrOption.hasKey(key)){ + return this.mStrOption.get(key); + } + return defaultValue; + } + +} \ No newline at end of file diff --git a/ohos/src/main/ets/components/fijkplayer/common/SystemUtil.ets b/ohos/src/main/ets/components/fijkplayer/common/SystemUtil.ets new file mode 100644 index 00000000..e2753903 --- /dev/null +++ b/ohos/src/main/ets/components/fijkplayer/common/SystemUtil.ets @@ -0,0 +1,98 @@ +import window from '@ohos.window'; +import { common } from '@kit.AbilityKit'; +import { Log } from '@ohos/flutter_ohos'; +import { audio } from '@kit.AudioKit'; + +const TAG = 'SystemUtil' + +export async function setOrientation(context: common.Context, orientation: ScreenOrientation): Promise { + try { + Log.d(TAG, 'setOrientationLandscape()'); + const windowInstance: window.Window = await window.getLastWindow(context); + if (windowInstance) { + await windowInstance.setPreferredOrientation(getOrientationParams(orientation)); + return true; + } + } catch (e) { + Log.e(TAG, JSON.stringify(e)); + if (e['code'] == 1300002) { + return true; + } + } + return false; +} + +export async function setScreenLock(context: common.Context, isLock: boolean): Promise { + try { + const windowInstance: window.Window = await window.getLastWindow(context); + await windowInstance.setWindowKeepScreenOn(isLock); + return true; + } catch (e) { + Log.e(TAG, JSON.stringify(e)); + } + return false; +} + +export async function setBrightness(context: common.Context, brightness: number): Promise { + try { + const windowInstance: window.Window = await window.getLastWindow(context); + await windowInstance.setWindowBrightness(brightness); + return true; + } catch (e) { + Log.e(TAG, JSON.stringify(e)); + } + return false; +} + +/** + * 获取系统媒体音量 + * @returns + */ +export async function getSystemVolume(): Promise { + const value: audio.AudioVolumeGroupManager | undefined = await getAudioVolumeGroupManager(); + if (value) { + return value.getVolumeSync(audio.AudioVolumeType.MEDIA); + } else { + return 0; + } +} + +export async function isMute(): Promise { + const value: audio.AudioVolumeGroupManager | undefined = await getAudioVolumeGroupManager(); + if (value) { + return await value.isMute(audio.AudioVolumeType.MEDIA); + } else { + return false; + } +} + +async function getAudioVolumeGroupManager(): Promise { + let groupId: number = audio.DEFAULT_VOLUME_GROUP_ID; + let audioManager = audio.getAudioManager(); + let audioVolumeManager = audioManager.getVolumeManager(); + try { + const value: audio.AudioVolumeGroupManager = await audioVolumeManager.getVolumeGroupManager(groupId); + return value; + } catch (e) { + Log.e(TAG, JSON.stringify(e)); + return undefined; + } +} + + +function getOrientationParams(orientation: ScreenOrientation): window.Orientation { + switch (orientation) { + case ScreenOrientation.Portrait: + return window.Orientation.PORTRAIT; + case ScreenOrientation.Landscape: + return window.Orientation.LANDSCAPE; + case ScreenOrientation.Auto: + return window.Orientation.AUTO_ROTATION; + } +} + +export enum ScreenOrientation { + Portrait, + Landscape, + Auto, +} \ No newline at end of file diff --git a/ohos/src/main/ets/components/fijkplayer/core/FIjkPlayer.ets b/ohos/src/main/ets/components/fijkplayer/core/FIjkPlayer.ets new file mode 100644 index 00000000..11f3dee3 --- /dev/null +++ b/ohos/src/main/ets/components/fijkplayer/core/FIjkPlayer.ets @@ -0,0 +1,337 @@ +import { + EventChannel, + EventSink, + FlutterInjector, + FlutterManager, + FlutterPluginBinding, + Log, + MethodCall, + MethodCallHandler, + MethodChannel, + MethodResult, + StreamHandler +} from '@ohos/flutter_ohos'; +import { IjkMediaPlayer, MessageType, OnMessageCallback } from '@zaiohos/ijkplayer-surface'; +import { HashMap, uri } from '@kit.ArkTS'; +import { MediaInfoType, OptionsCategory, PlayerState } from '../common/Constants'; +import HostOption from '../common/HostOption'; +import { getFilePathByAssetsPath } from '../common/AssetsCopyUtil'; + +const TAG = "FIjkPlayerTag"; +const DEFAULT_WIDTH = 500; +const DEFAULT_HEIGHT = 500; + +export class FIjkPlayer implements MethodCallHandler, StreamHandler, OnMessageCallback { + private channel: MethodChannel | null = null; + private eventChannel: EventChannel | null = null; + private eventSink: EventSink | null = null; + private binding: FlutterPluginBinding; + private id: number; + private textureId?: number; + private surfaceId?: number; + private player?: IjkMediaPlayer; + private currentPlayerState: number = PlayerState.unkown; + private mWidth: number = 0; + private mHeight: number = 0; + private mRotate: number = 0; + private hasReset: boolean = false; + private mHostOption: HostOption = new HostOption(); + + constructor(id: number, binding: FlutterPluginBinding) { + this.id = id; + this.binding = binding; + this.channel = new MethodChannel(binding.getBinaryMessenger(), "befovy.com/fijkplayer/" + this.id); + this.channel.setMethodCallHandler(this); + this.eventChannel = new EventChannel(binding.getBinaryMessenger(), "befovy.com/fijkplayer/event/" + this.id); + this.eventChannel.setStreamHandler(this); + this.initPlayer(); + } + + onListen(args: ESObject, events: EventSink): void { + this.eventSink = events; + } + + onCancel(args: ESObject): void { + this.eventSink?.endOfStream(); + } + + initPlayer() { + this.player = new IjkMediaPlayer(); + //surface模式下，其它方法都依赖surfaceId，需要先设置surfaceId + this.setSurfaceId(); + this.player.setDebug(true); + this.setUpPlayer(); + this.player.setOnMessageCallback(this); + this.player.setMessageListener(); + } + + setUpPlayer() { + if (!this.player) { + return; + } + this.player.native_setup(); + this.player.setOption(OptionsCategory.OPT_CATEGORY_PLAYER.toString(), "enable-position-notify", '1'); + this.player.setOption(OptionsCategory.OPT_CATEGORY_PLAYER.toString(), "start-on-prepared", '0'); + } + + /** + * 纹理导出模式下，需更新bufferSize配置 + * @param width + * @param height + */ + updateSurfaceWH(width: number, height: number) { + this.binding.getTextureRegistry().setTextureBufferSize(this.textureId, width, height); + } + + setSurfaceId() { + this.textureId = this.binding.getTextureRegistry().getTextureId(); + this.surfaceId = this.binding.getTextureRegistry().registerTexture(this.textureId).getSurfaceId(); + this.player?.setSurfaceId(this.surfaceId); + } + + onMethodCall(call: MethodCall, result: MethodResult): void { + const methodName = call.method; + Log.d(TAG, 'onMethodCall=' + methodName); + switch (methodName) { + case "setupSurface": + result.success(this.textureId); + break; + case "setOption": + const category: number = call.argument('cat'); + const key: string = call.argument("key"); + if (call.hasArgument('long')) { + const value: number = call.argument('long'); + this.setOption(category, key, value); + } else if (call.hasArgument('str')) { + const value: string = call.argument('str'); + this.setOption(category, key, value); + } + result.success(null); + break; + case "applyOptions": + if (call.args instanceof Map) { + const map: Map = call.args as Map; + map.forEach((key: ESObject, value: ESObject) => { + if (typeof key === 'number' && value instanceof Map) { + const category = key as number; + const valueMap: Map = value as Map; + valueMap.forEach((key: ESObject, value: ESObject) => { + if (typeof key === 'string') { + const keyStr = key as string; + this.setOption(category, keyStr, value); + } + }) + } + }) + } + result.success(null); + break; + case "setDataSource": + if(this.hasReset){ + this.setUpPlayer(); + this.hasReset = false; + } + const url: string = call.argument('url'); + const uriObj = new uri.URI(url); + if (uriObj.scheme === 'asset') { + const filePath = uriObj.path; + this.player?.setDataSource(getFilePathByAssetsPath(this.binding.getApplicationContext(),filePath)); + } else { + this.player?.setDataSource(url); + } + this.handleEvent(MessageType.MEDIA_PLAYBACK_STATE_CHANGED, PlayerState.initialized, PlayerState.unkown, null); + result.success(null); + break; + case "prepareAsync": + if (this.player) { + this.player.prepareAsync(); + this.handleEvent(MessageType.MEDIA_PLAYBACK_STATE_CHANGED, PlayerState.asyncPreparing, + this.currentPlayerState, + null); + } + result.success(null); + break; + case "start": + if (this.player) { + this.player.start(); + } + result.success(null); + break; + case "pause": + if (this.player) { + this.player.pause(); + } + result.success(null); + break; + case "stop": + if (this.player) { + this.player.stop(); + this.handleEvent(MessageType.MEDIA_PLAYBACK_STATE_CHANGED, PlayerState.stopped, this.currentPlayerState, + null); + } + result.success(null); + break; + case "reset": + if (this.player) { + this.player.reset(); + this.handleEvent(MessageType.MEDIA_PLAYBACK_STATE_CHANGED, PlayerState.idle, this.currentPlayerState, null); + this.hasReset = true; + } + result.success(null); + break; + case "getCurrentPosition": + const position: number | undefined = this.player?.getCurrentPosition(); + result.success(position ? position : 0); + break; + case "setVolume": + const volume: number = call.argument('volume'); + const volumeStr = volume == undefined ? '1.0' : volume.toString(); + this.player?.setVolume(volumeStr, volumeStr); + result.success(null); + break; + case "seekTo": + const msec: number = call.argument('msec'); + if (this.currentPlayerState == PlayerState.completed) { + this.handleEvent(MessageType.MEDIA_PLAYBACK_STATE_CHANGED, PlayerState.paused, this.currentPlayerState, null); + } + const msecStr = msec == undefined ? '0' : msec.toString(); + this.player?.seekTo(msecStr); + result.success(null); + break; + case "setLoop": + const loop: number = call.argument('loop'); + const loopLocal = loop == undefined ? 1 : loop; + this.player?.setLoopCountNum(loopLocal); + result.success(null); + break; + case "setSpeed": + const speed: number = call.argument('speed'); + const speedLocal = speed == undefined ? 1 : speed; + this.player?.setSpeed(speedLocal.toString()); + result.success(null); + break; + case "snapshot": + result.notImplemented; + break; + + } + } + + onPlayerStateChangeLocal(newState: number, oldState: number) { + + } + + onMessage(what: number, arg1: number, arg2: number, obj: string) { + this.handleEvent(what, arg1, arg2, obj); + } + + handleEvent(what: number, arg1: number, arg2: number, extra: ESObject) { + Log.d(TAG, 'handleEvent(),what' + what); + const event: HashMap = new HashMap(); + switch (what) { + case MessageType.MEDIA_PREPARED: + event.set('event', 'prepared'); + event.set('duration', this.player?.getDuration()); + this.eventSink?.success(event); + break; + case MessageType.MEDIA_PLAYBACK_STATE_CHANGED: + this.currentPlayerState = arg1; + Log.d(TAG, `state_change(),new=${arg1},old=${arg2}`); + event.set("event", "state_change"); + event.set("new", arg1); + event.set("old", arg2); + this.onPlayerStateChangeLocal(arg1, arg2); + this.eventSink?.success(event) + break; + case MessageType.MEDIA_INFO: + switch (arg1) { + case MediaInfoType.MEDIA_INFO_VIDEO_RENDERING_START: + case MediaInfoType.MEDIA_INFO_AUDIO_RENDERING_START: + event.set("event", "rendering_start"); + event.set("type", arg1 === MediaInfoType.MEDIA_INFO_VIDEO_RENDERING_START ? 'video' : 'audio'); + this.eventSink?.success(event) + break; + case MediaInfoType.MEDIA_INFO_BUFFERING_START: + case MediaInfoType.MEDIA_INFO_BUFFERING_END: + event.set("event", "freeze"); + event.set("value", arg1 == MediaInfoType.MEDIA_INFO_BUFFERING_START); + this.eventSink?.success(event) + break; + case MediaInfoType.MEDIA_INFO_VIDEO_ROTATION_CHANGED: + event.set("event", "rotate"); + event.set("degree", arg2); + this.mRotate = arg2; + this.eventSink?.success(event); + if (this.mWidth > 0 && this.mWidth > 0) { + this.handleEvent(MessageType.MEDIA_SET_VIDEO_SIZE, this.mWidth, this.mHeight, null); + } + break; + } + break; + case MessageType.MEDIA_CURRENT_POSITION_UPDATE: + event.set("event", "pos"); + event.set("pos", arg1); + this.eventSink?.success(event); + break; + case MessageType.MEDIA_BUFFERING_UPDATE: + event.set("event", "buffering"); + event.set("head", arg1); + event.set("percent", arg2); + this.eventSink?.success(event); + break; + case MessageType.MEDIA_SET_VIDEO_SIZE: + event.set("event", "size_changed"); + if (this.mRotate == 0 || this.mRotate == 180) { + event.set('width', arg1); + event.set('height', arg2); + } else { + event.set('width', arg2); + event.set('height', arg1); + } + this.eventSink?.success(event); + this.mWidth = arg1; + this.mHeight = arg2; + this.updateSurfaceWH(this.mWidth, this.mHeight); + break; + case MessageType.MEDIA_SEEK_COMPLETE: + event.set("event", "seek_complete"); + event.set("pos", arg1); + event.set("err", arg2); + this.eventSink?.success(event); + break; + case MessageType.MEDIA_ERROR: + this.eventSink?.error(arg1.toString(), arg2.toString(), extra); + break; + } + } + + setOption(category: number | undefined, key: string, value: ESObject) { + if (typeof value === 'number') { + if (category != undefined && category != 0) { + this.player?.setOption(category.toString(), key, (value != undefined ? value : 0).toString()); + Log.d(TAG, `setOption1,category=${category},key=${key},value=${value}`); + } else if (category != undefined) { + // cat == 0, hostCategory + this.mHostOption.addNumberOption(key, value); + } + } else if (typeof value === 'string') { + if (category != undefined && category != 0) { + this.player?.setOption(category.toString(), key, value != undefined ? value : '0'); + Log.d(TAG, `setOption2,category=${category},key=${key},value=${value}`); + } else if (category != undefined) { + // cat == 0, hostCategory + this.mHostOption.addStrOption(key, value); + } else { + Log.d(TAG, "error arguments for setOptions"); + } + } + } + + getPlayId() { + return this.id; + } + + release() { + + } +} \ No newline at end of file diff --git a/ohos/src/main/ets/components/fijkplayer/plugin/FIjkPlayerPlugin.ets b/ohos/src/main/ets/components/fijkplayer/plugin/FIjkPlayerPlugin.ets new file mode 100644 index 00000000..fc23d2d0 --- /dev/null +++ b/ohos/src/main/ets/components/fijkplayer/plugin/FIjkPlayerPlugin.ets @@ -0,0 +1,181 @@ +import { + FlutterPlugin, + FlutterPluginBinding, + Log, + MethodCall, + MethodCallHandler, + MethodChannel, + MethodResult +} from '@ohos/flutter_ohos'; +import { HashMap } from '@kit.ArkTS'; +import { FIjkPlayer } from '../core/FIjkPlayer'; +import { BusinessError, deviceInfo } from '@kit.BasicServicesKit'; +import { getSystemVolume, ScreenOrientation, setBrightness, setOrientation, setScreenLock } from '../common/SystemUtil'; +import { audio } from '@kit.AudioKit'; +import { copyAssets } from '../common/AssetsCopyUtil'; + +const TAG = "FijkplayerPlugin"; + +/** FIjkPlayerPlugin **/ +export default class FIjkPlayerPlugin implements FlutterPlugin, MethodCallHandler { + private channel: MethodChannel | null = null; + private playerMap: HashMap = new HashMap(); + private nextPlayId = 0; + private binding?: FlutterPluginBinding; + private isScreenLock: boolean = false; + private windowBrightness: number = -1.0; + audioManager = audio.getAudioManager(); + // 创建音频会话管理器。 + audioSessionManager: audio.AudioSessionManager = this.audioManager.getSessionManager(); + // 设置音频并发模式。 + strategy: audio.AudioSessionStrategy = { + concurrencyMode: audio.AudioConcurrencyMode.CONCURRENCY_DEFAULT + }; + + getUniqueClassName(): string { + return "FIjkPlayerPlugin" + } + + onAttachedToEngine(binding: FlutterPluginBinding): void { + this.binding = binding; + this.channel = new MethodChannel(binding.getBinaryMessenger(), "befovy.com/fijk"); + this.channel.setMethodCallHandler(this) + + //拷贝flutter assets资源 + copyAssets(this.binding.getApplicationContext()); + } + + + onDetachedFromEngine(binding: FlutterPluginBinding): void { + if (this.channel != null) { + this.channel.setMethodCallHandler(null) + } + } + + private getNextPlayId(): number { + return this.nextPlayId++; + } + + + onMethodCall(call: MethodCall, result: MethodResult): void { + const methodName = call.method; + Log.d(TAG, 'onMethodCall=' + methodName); + switch (methodName) { + case "createPlayer": + if (!this.binding) { + return; + } + const player: FIjkPlayer = new FIjkPlayer(this.getNextPlayId(), this.binding); + this.playerMap.set(player.getPlayId(), player); + result.success(player.getPlayId()); + break; + case "releasePlayer": + const pid: number = call.argument('pid'); + const playerFind: FIjkPlayer = this.playerMap.get(pid); + if (playerFind) { + playerFind.release(); + this.playerMap.remove(pid); + } + result.success(null); + break; + case "getPlatformVersion": + result.success("OpenHarmony " + deviceInfo.sdkApiVersion); + break; + case "init": + result.success(null); + break; + case "logLevel": + break; + case "setOrientationPortrait": + if (this.binding) { + setOrientation(this.binding.getApplicationContext(), ScreenOrientation.Portrait).then((isChanged) => { + result.success(isChanged); + }); + } + break; + case "setOrientationLandscape": + Log.d(TAG, 'setOrientationLandscape()'); + if (this.binding) { + setOrientation(this.binding.getApplicationContext(), ScreenOrientation.Landscape).then((isChanged) => { + result.success(isChanged); + }); + } + break; + case "setOrientationAuto": + if (this.binding) { + setOrientation(this.binding.getApplicationContext(), ScreenOrientation.Auto).then((isChanged) => { + result.success(isChanged); + }); + } + break; + case "setScreenOn": + if (call.hasArgument('on') && this.binding) { + const isOn: boolean = call.argument('on'); + this.isScreenLock = isOn; + setScreenLock(this.binding.getApplicationContext(), isOn); + } + result.success(null); + break; + case "isScreenKeptOn": + result.success(this.isScreenLock); + break; + case "brightness": + result.success(this.windowBrightness); + break; + case "setBrightness": + if (call.hasArgument('brightness') && this.binding) { + const brightness: number = call.argument('brightness'); + this.windowBrightness = brightness; + setBrightness(this.binding.getApplicationContext(), brightness); + } + result.success(null); + break; + case "requestAudioFocus": + this.audioSessionManager.activateAudioSession(this.strategy).then(() => { + Log.d(TAG, 'activateAudioSession SUCCESS'); + }).catch((err: BusinessError) => { + Log.e(TAG, `ERROR: ${err}`); + }); + result.success(null); + break; + case "releaseAudioFocus": + this.audioSessionManager.deactivateAudioSession().then(() => { + Log.d(TAG, 'deactivateAudioSession SUCCESS'); + }).catch((err: BusinessError) => { + Log.e(TAG, `ERROR: ${err}`); + }); + result.success(null); + break; + case "volumeDown": + //ohos api仅系统应用支持设置音量 + break; + case "volumeUp": + //ohos api不支持 + break; + case "volumeMute": + //ohos api不支持 + break; + case "systemVolume": + getSystemVolume().then((volume: number) => { + result.success(volume); + }) + break; + case "volumeSet": + //ohos api不支持 + break; + case "volUiMode": + //设置音量ui相关 + break; + case "onLoad": + result.success(null); + break; + case "onUnload": + result.success(null); + break; + default: + Log.d(TAG, 'notImplemented(),method=' + methodName); + result.notImplemented(); + break; + } + } +} \ No newline at end of file diff --git a/ohos/src/main/module.json5 b/ohos/src/main/module.json5 new file mode 100644 index 00000000..3fb65562 --- /dev/null +++ b/ohos/src/main/module.json5 @@ -0,0 +1,10 @@ +{ + "module": { + "name": "fijkplayer", + "type": "har", + "deviceTypes": [ + "default", + "tablet" + ] + } +} diff --git a/pubspec.yaml b/pubspec.yaml index 19c99b7c..75bfe9a0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -29,6 +29,8 @@ flutter: pluginClass: FijkPlugin ios: pluginClass: FijkPlugin + ohos: + pluginClass: FijkPlugin # To add assets to your plugin package, add an assets section, like this: # assets: