From 6d7962698475ae0042ed642730713a74546cdffb Mon Sep 17 00:00:00 2001 From: SnickerSun Date: Thu, 25 Apr 2024 20:52:25 +0800 Subject: [PATCH] =?utf8?q?=E5=88=A0=E9=99=A4=E5=B8=A6=E7=A9=BA=E6=A0=BC?= =?utf8?q?=E7=9A=84=E5=9B=BE=E7=89=87=20=E6=B7=BB=E5=8A=A0gen=5Ffs=5Fotapk?= =?utf8?q?g.sh=20=E7=94=9F=E6=88=90=E9=92=88=E5=AF=B9=E6=9F=90=E4=B8=AA?= =?utf8?q?=E7=89=88=E6=9C=AC=E5=88=B0=E5=BD=93=E5=89=8D=E7=89=88=E6=9C=AC?= =?utf8?q?=E7=9A=84=E4=BF=AE=E6=94=B9=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/message/src/MessageCardView.cpp | 4 +- .../nativeui/message/src/MessageView.cpp | 4 +- .../fs/user/res/Phone/21-avatar-outline 1.bin | Bin 15224 -> 0 bytes .../user/res/message/{Line 1.bin => Line.bin} | Bin gen_fs_otapkg.sh | 74 ++++++++++++++++++ 5 files changed, 78 insertions(+), 4 deletions(-) delete mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Phone/21-avatar-outline 1.bin rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/message/{Line 1.bin => Line.bin} (100%) create mode 100644 gen_fs_otapkg.sh diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageCardView.cpp index be2c8baa4..69a76e729 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageCardView.cpp @@ -11,8 +11,8 @@ namespace OHOS { - static constexpr char *lineimagePath = "/user/res/message/Line 1.bin"; - static constexpr char *messageimagePath = "/user/res/message//message.bin"; + static constexpr char *lineimagePath = "/user/res/message/Line.bin"; + static constexpr char *messageimagePath = "/user/res/message/message.bin"; MessageCardView::MessageCardView() { diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp index 0c1a6d4ba..0e36e8f3d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp @@ -8,8 +8,8 @@ #include "uicomponents/UIComponents.h" namespace OHOS { - static constexpr char *lineimagePath = "/user/res/message/Line 1.bin"; - static constexpr char *messageimagePath = "/user/res/message//message.bin"; + static constexpr char *lineimagePath = "/user/res/message/Line.bin"; + static constexpr char *messageimagePath = "/user/res/message/message.bin"; static const uint32_t BACK_GROUND_COLOR = 0xfff6f6f6; static constexpr uint8_t NUM_2 = 2; diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Phone/21-avatar-outline 1.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Phone/21-avatar-outline 1.bin deleted file mode 100644 index f123d8b8fa33455e0ec9ccdd4671fb984e2c37cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15224 zcmeHNeQXp(6#wn+UEAv|ZK0qjeypWnYtS5=5;UlLccRvyw6|&$B&-Ci)gy9XM8(*Z zR_G~`!w(Erld}{;3EpbT?B<1BE?dwp*X(1L;loUx>$<)E@?Bn zGxOg3-kbL^v+x0{=*NVdRrdwQ;BV?X#Zr`RGiJAKJWK>^doU5O_k-;ZY=2<;1KS_k z@xYD;c04@$`9Q$+8)DCW>dxV^Qd{m59^Xg3mD^XJY`PFUz!f&?zbx0cB}EiWfBu6R z^!|(JgthOz6y#&|9147U-v_iS#TXakP?7^XerFcHgJreQW z-%UZ}BNj;P2U^>5Awf4s+4}is{V1hFk<=dFH!&o{SL?G8=&XlY+a^Lr4xZCq$rL|- zhZ|~RLqofWaujxnN@BG3g7eK?3@kr-GxldX-}&C3>~};y2-P&dzUXxo8*KB9 zZVo`YqCJ!l9dO_v3fo%^bS*uK>aw#BdlJEXQ(D}B|PEqGESv+7hzlzAmYMZE<$@9CO@>{bjhBm-} z@lZ;F+>zy0^BZjQQG9(MwHwTEI)wZc<)_D(dk;IR_qL$N^7DViRi?k~j2@pDs_)#i zVx zE4GmT11bb0DKg!PkuGD*l2_|8o$vqF-`}(X^8QZBxQI9%O4(vy!c#NCq57@!-0#i{ z^7xA0+#+H_jCp6@ciHK?eBU6W#1rX%t_(rKry~7>4TbGN1jc0g#z!-BYntCl%D~IyYmW8 zavi*B|0V^m8C$fnE?D{jG<8i{zZ%B&R~~!(KiBg%KGx#H6|N*()`WFA$fA-1OM(&d zCx~^r!4CX>bgIIe&C<2C1%A`$(cktLhimmFI$Z?RQ9U#tr|g4Do2`}737&S{`L16d zhign6Q$#2zO&%=Q;;i~qWyPBs2PJZ+ymZ9su8y>ttNg#zQrCwG8N9KDi11JOpXkER zQav(l&q~GbH2Z^njB!c?>r?&>TV3)B3|02&Q#L1)v7G4S@3f_L6n}2K-s_dF^P;4K z429&sDm|M1N`qftfn&psHmpgEyMD}#a|A!(ABK8M9Fib^eyEx;%6Dd;Sudo<|Jpu@ z|MWBb4S>$;zwe^`;zncAyWr(%kUu@}qP z4|*@diF3}r{41}9B$c=&fgl$=@c%JE-nL+z7AujRU(3!DnXdm_?;nV4k#>kW*1L)m*{c7c7wDO^y!BkiH&gk% zr7x>>d9hp!#~#Qtpj6!iO>4$hLC&N4v@g^7tnNRndn0)vI*)Lnx974V_=gsO(xyWj zhJcSE>%2RkYn@-C%VX%ak;oC(g*&$}x*s3}LI-n=Uw;_zd^y;a(nn|m-KgHhJE3@H z#@16ct&+St_-Cxv|3J?-YhevtpjDaia4e_qyWxyJk`XroI|p1JfzBGl)Lmi;eNE8F zzlvdrh(4#yJikbhRDs=7lk_uNa&>jqU~kj+6Z&@3KNE>mL;9M#AsxK^k<^ot<(A(M zWNLquztgGSX)-u$E4s8e&$Y~veo_=U-`hR`lmA{m{ok1>es+Ir&wFe $tmpfile_changelist +export count=`wc $tmpfile_changelist -l|awk '{print $1}'` +echo $TARGETDIR $count +if [ "$count" == "0" ] ; then + echo $TARGETDIR no change +else + + echo $version >$tmpfile_git_commit_file + + git diff $version --name-status . |awk ' ($1 != "D" ) {print $2 }'|awk '{gsub(/code\/sdk\/build\/config\/target_config\/brandy\/mk_fs_image\/fd230\/fs\//,"") ;print $0 }' >$tmpfile_modified_or_new_files + git diff $version --name-status . |awk ' ($1 == "D" ) {print $2 }'|awk '{gsub(/code\/sdk\/build\/config\/target_config\/brandy\/mk_fs_image\/fd230\/fs\//,"") ;print $0 }' >$tmpfile_removedfiles + + mkdir -p $BACKUPDIR + mkdir -p $BACKUPDIR_DIFF + mv $tmpfile_git_commit_file $BACKUPDIR_DIFF + + if ! [ $(wc -l $tmpfile_modified_or_new_files|awk '{print $1}' ) == "0" ] ; then + mv $tmpfile_modified_or_new_files $BACKUPDIR_DIFF + cat $BACKUPDIR_DIFF/$(basename $tmpfile_modified_or_new_files)|xargs tar czf $BACKUPDIR/changefiles.tar.gz + tar xzf $BACKUPDIR/changefiles.tar.gz -C $BACKUPDIR + rm $BACKUPDIR/changefiles.tar.gz + else + echo $tmpfile_modified_or_new_files $(wc -l $tmpfile_modified_or_new_files |awk '{print $1}') , skip copy. + fi + + if ! [ $(wc -l $tmpfile_removedfiles|awk '{print $1}') == "0" ] ; then + mv $tmpfile_removedfiles $BACKUPDIR_DIFF + else + echo $tmpfile_removedfiles $(wc -l $tmpfile_removedfiles|awk '{print $1}') , skip copy. + fi +fi +cd $HOMEDIR + +} + +genpatch $PWD +echo done + + + -- 2.17.1