无用优化

home-coder · home-coder · commit 6250365417cc · 2017-09-02T14:14:34.000+08:00
diff --git a/edit_util.sh b/edit_util.sh
@@ -136,7 +136,7 @@ function write_kl_file()
 				debug_info "change "key $key_num  $key_value_1 $key_value_2" -->"key $key_num  $param_value_1""
 				retflag=1
 			else
-				debug_info "same code, skip"
+				debug_info "same code, skip 666"
 			fi
 		elif [[ $# -eq 4 ]]; then
 			param_value_1="$3"
@@ -147,7 +147,7 @@ function write_kl_file()
 				debug_info "change "key $key_num  $key_value_1 $key_value_2" -->"key $key_num  $param_value_1 $param_value_2""
 				retflag=1
 			else
-				debug_info "same code, skip"
+				debug_info "same code, skip 666"
 			fi
 		else
 			debug_error "undefined kl inner format, just support like 1 'POWER' or 2 'POWER WAKE', this case maybe 3 'POWER WAKE HELLO', exit (-1)"
@@ -206,25 +206,30 @@ function write_fex_file()
 	while read line; do
 		let num=num+1
 
+		#块区[ ]开始标志
 		if [ X"$line" = X"[$param_section]" ];then
 			has_section=1
 			begin_section=1
 			continue
 		fi
 
 		if [ $begin_section -eq 1 ];then
+			#块区[ ]结束标志
 			end_section=$(echo $line | awk 'BEGIN{ret=0} /^\[.*\]$/{ret=1} END{print ret}')
 			if [ $end_section -eq 1 ];then
 				break
 			fi
 
+			#跳过 ; 开头的注释行
 			need_ignore=$(echo $line | awk 'BEGIN{ret=0} /^;/{ret=1} /^$/{ret=1} END{print ret}')
 			if [ $need_ignore -eq 1 ];then
 				continue
 			fi
+			#获取过程
 			item=$(echo $line | awk -F= '{gsub(" |\t","",$1); print $1}')
 			value=$(echo $line | awk -F= '{gsub(" |\t","",$2); print $2}')
 
+			#匹配过程
 			if [ "$param_item"x == "$item"x ];then
 				has_item=1
 				debug_import "fex modify line num = $num, section[$param_section], item[$param_item], value[$param_value]"
@@ -237,6 +242,7 @@ function write_fex_file()
 
 	#sed -i '99s/'"port:PA15<1><default><default><1>"'/'"port:PA12<1><default><default><1>"'/' $param_file
 
+	#业务逻辑
 	if [[ ($has_section -ne 0)&&($has_item -ne 0)&&("$value"x != "$param_value"x) ]]; then
 		sed -i "${num}s/$value/$param_value/" $param_file
 		debug_import "$num: $param_item = $param_value"
diff --git a/include.sh b/include.sh
@@ -55,7 +55,7 @@ function creat_manifest_map()
 }
 
 #
-#@PARM:以字符串形式对应map， @FUNC: 根据名称分别dump。 此方法有重复代码，未优化
+#@PARM:以字符串形式对应map， @FUNC: 根据名称分别dump。XXX:可以简化吗
 #
 function dump_map()
 {
diff --git a/r-config/mstar638_register b/r-config/mstar638_register
@@ -1,14 +1,15 @@
-#manifest字段                 本地对应字段                    本地修改地址
+#manifest所有字段                 本地对应字段                    本地修改地址
 
-AAA							 inside_model                     ./test_data/env.cfg
-BBB							 launcher_channelid               ./test_data/env.cfg
-CCC							 product_company                  ./test_data/external_product.txt
-DDD							  product_hotline                 ./test_data/external_product.txt
-EEE							 product_email                    ./test_data/external_product.txt
+AAA							 inside_model                     ./test_data/external_product.txt
+BBB							 launcher_channelid					xxx
+CCC							 product_company                  xxx
+DDD							  product_hotline                 xxx
+EEE							 product_email                    xxx
 FFF							 PRODUCT_MANUFACTURER             ./test_data/dolphin_cantv_h2.mk
-GGG							customer_code                     ./test_data/custom_ir
+GGG							customer_code                     ./test_data
 HHH							gpio1                             ./test_data/sys_config.fex
 JJJ
 KKK                         business_model                    ./test_data/env.cfg
 LLL                         fake_flash                        ./test_data/env.cfg
 
+#keyboad layout

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ function creat_manifest_map()`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`#`
`58`		`-#@PARM:以字符串形式对应map， @FUNC: 根据名称分别dump。此方法有重复代码，未优化`
	`58`	`+#@PARM:以字符串形式对应map， @FUNC: 根据名称分别dump。XXX:可以简化吗`
`59`	`59`	`#`
`60`	`60`	`function dump_map()`
`61`	`61`	`{`