删除带空格的图片

添加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 be2c8ba..69a76e7 100644 (file)
--- 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 0c1a6d4..0e36e8f 100644 (file)
--- 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 (file)
index f123d8b..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Phone/21-avatar-outline 1.bin and /dev/null differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/message/Line 1.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/message/Line.bin
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/message/Line 1.bin
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/message/Line.bin

diff --git a/gen_fs_otapkg.sh b/gen_fs_otapkg.sh
new file mode 100644 (file)
index 0000000..9a5b3e8
--- /dev/null
+++ b/gen_fs_otapkg.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+#set -e
+version=HEAD
+DATE=$(date  +%Y%m%d.%H%M%S)
+HOMEDIR=$PWD
+TMPDIR=/tmp/${USER}_${DATE}
+FSDATADIR=code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs
+
+
+
+if ! [ "$1" = "" ] 
+then
+
+version=$1
+
+fi
+echo $version
+
+BACKUPDIR_HOME=$HOMEDIR/../PATCHES/$(basename $HOMEDIR)_FSOTA_${DATE}
+
+
+genpatch() {
+TARGETDIR=$1
+tmpfile_changelist=/$TMPDIR/changelist.txt
+tmpfile_removedfiles=/$TMPDIR/deletedfiles.sh
+tmpfile_modified_or_new_files=/$TMPDIR/modified_or_new_files.txt
+tmpfile_git_commit_file=/$TMPDIR/commit.txt
+BACKUPDIR=$BACKUPDIR_HOME/
+BACKUPDIR_DIFF=$BACKUPDIR_HOME/diff/
+
+rm -rf $TMPDIR
+mkdir -p $TMPDIR
+cd $TARGETDIR/$FSDATADIR
+git config core.filemode false
+git diff $version --name-status . |awk '{gsub(/code\/sdk\/build\/config\/target_config\/brandy\/mk_fs_image\/fd230\/fs\//,"") ;print $0 }' > $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
+
+
+