合并分支 'dev_00.00.00.08' 到 'master'

Dev 00.00.00.08



查看合并请求 !2

+#!/bin/bash
+#1、输入分支名，账号，密码，描述信息
+branch_name="dev_00.00.00.08"
+Account="PanHaoBin"
+PassWord="ookk3866"
+Message="这是一个上传脚本测试"
+ProjectName="114.132.166.25:8099/PanHaoBin/SerialPorject.git"
+
+
+# 检查分支是否存在
+if git rev-parse --verify "$branch_name" >/dev/null 2>&1; then
+    echo "分支 $branch_name 存在"
+else
+    echo "分支 $branch_name 不存在"
+    # 创建新分支
+    git branch "$branch_name"
+fi
+
+
+
+
+# 切换到新创建的分支
+git checkout "$branch_name"
+
+# 写入描述/注释
+git add .
+git commit -m "$Message"
+
+# 设置远程仓库的URL
+remote_url="http://$Account:$PassWord@$ProjectName"
+
+# 上传到远程仓库
+git push "$remote_url" "$branch_name"

@@ -200,9 +200,7 @@ static void *UartDeal_rece(void *arg)
             memset(getbuf,0,sizeof(getbuf)); 				//清空接收数组
             memset(getbuf,0,sizeof(getbuf)); 				//清空接收数组
 			ret = read(Uart_fd,getbuf,sizeof(getbuf));
 			ret = read(Uart_fd,getbuf,sizeof(getbuf));
 
 
-			USER_LOG_INFO("RecvLen:%d\n",ret);
-
-			//UartDeal_Recv_interface(Uart_fd, getbuf, ret);
+			UartDeal_Recv_interface(Uart_fd, getbuf, ret);
 
 
 		}
 		}
 	}
 	}