From d674a839a1be653c97648b8e962922aa10813e89 Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Sat, 25 May 2024 14:47:51 +0800 Subject: [PATCH] Backup doc. --- doc/git_guide.md | 121 +++++++++++++++++++++++++++++++- middleware/AppManager/README.md | 13 ++-- 2 files changed, 127 insertions(+), 7 deletions(-) diff --git a/doc/git_guide.md b/doc/git_guide.md index 6afb8c6f..35e26f5c 100644 --- a/doc/git_guide.md +++ b/doc/git_guide.md @@ -18,23 +18,27 @@   当主干发生较大变化，例如：原厂更新sdk时，需要新建分支，划分界限。 -``` +```code $ git branch -a +---------------- * master remotes/origin/HEAD -> origin/master remotes/origin/app_test remotes/origin/master $ git checkout -b master-sdk-202405 origin/master +------------------------------------------------- M ipc-sdk Branch 'master-sdk-202405' set up to track remote branch 'master' from 'origin'. Switched to a new branch 'master-sdk-202405' $ git branch -a +---------------- master * master-sdk-202405 remotes/origin/HEAD -> origin/master remotes/origin/app_test remotes/origin/master $ git push origin master-sdk-202405:sdk-202405 +---------------------------------------------- Enumerating objects: 3, done. Counting objects: 100% (3/3), done. Delta compression using up to 8 threads @@ -47,6 +51,7 @@ remote: https://gitee.com/shenzhen-jiuyilian/ipc-rk1106/pull/new/shenzhen-ji To gitee.com:shenzhen-jiuyilian/ipc-rk1106.git * [new branch] master-sdk-202405 -> sdk-202405 $ git branch -a +--------------- master * master-sdk-202405 remotes/origin/HEAD -> origin/master @@ -55,6 +60,120 @@ $ git branch -a remotes/origin/sdk-202405 ``` +### 1.4.2. git获取远端分支 + +  当想知道远端是否新建了分支，可使用git fetch命令获取远端分支。 + +**git fetch示例：** + +```code +$ git fetch +------------ +remote: Enumerating objects: 21, done. +remote: Counting objects: 100% (21/21), done. +remote: Compressing objects: 100% (11/11), done. +remote: Total 14 (delta 8), reused 0 (delta 0), pack-reused 0 +Unpacking objects: 100% (14/14), 2.14 KiB | 156.00 KiB/s, done. +From gitee.com:shenzhen-jiuyilian/ipc-rk1106 + bf71a01..2b9b803 master -> origin/master + * [new branch] sdk-202402 -> origin/sdk-202402 // 此处发现远端新建了分支 +Fetching submodule ipc-sdk +From gitee.com:shenzhen-jiuyilian/ipc + 7c261bd..eec9fb4 master-develop -> origin/master-develop +``` + +**多个远端仓库git fetch示例：** + +```code +$ git remote -v +---------------- +dgiot git@gitee.com:shenzhen-jiuyilian/fastbootserver.git (fetch) +dgiot git@gitee.com:shenzhen-jiuyilian/fastbootserver.git (push) +rk https://gerrit.rock-chips.com:8443/linux/linux/ipc/app/fastboot_server (fetch) +rk https://gerrit.rock-chips.com:8443/linux/linux/ipc/app/fastboot_server (push) +$ git fetch dgiot // git fetch + 远端仓库名称 +--------------------------------------------- +remote: Enumerating objects: 9, done. +remote: Counting objects: 100% (9/9), done. +remote: Compressing objects: 100% (7/7), done. +remote: Total 9 (delta 3), reused 5 (delta 2), pack-reused 0 +Unpacking objects: 100% (9/9), 8.74 KiB | 746.00 KiB/s, done. +From gitee.com:shenzhen-jiuyilian/fastbootserver + * [new branch] sdk-202405 -> dgiot/sdk-202405 +``` + +### 1.4.3. git新增远端地址 + +  在一个git仓库中，可以同时管理多个远端地址，例如：在原厂的git仓库中，可以在仓库添加一个私人的git仓库，这样后续把修改提交到自己的仓库进行代码管理。 + +**git remote add示例：** + +命令格式： + +```code +git remote add +``` + +示例： + +```code +$ git remote add dgiot git@gitee.com:shenzhen-jiuyilian/fastbootserver.git +--------------------------------------------------------------------------- +$ git remote -v +---------------- +dgiot git@gitee.com:shenzhen-jiuyilian/fastbootserver.git (fetch) +dgiot git@gitee.com:shenzhen-jiuyilian/fastbootserver.git (push) +rk https://gerrit.rock-chips.com:8443/linux/linux/ipc/app/fastboot_server (fetch) +rk https://gerrit.rock-chips.com:8443/linux/linux/ipc/app/fastboot_server (push) +$ git fetch dgiot +------------------ +remote: Enumerating objects: 107, done. +remote: Counting objects: 100% (104/104), done. +remote: Compressing objects: 100% (45/45), done. +remote: Total 99 (delta 47), reused 89 (delta 42), pack-reused 0 +Unpacking objects: 100% (99/99), 29.55 KiB | 315.00 KiB/s, done. +From gitee.com:shenzhen-jiuyilian/fastbootserver + * [new branch] master -> dgiot/master + * [new branch] sdk-202405 -> dgiot/sdk-202405 +$ git branch -a +---------------- +* (HEAD detached at bf91101) + remotes/dgiot/master + remotes/dgiot/sdk-202405 + remotes/m/master + remotes/rk/master +$ git checkout -b sdk-202405 m/master +-------------------------------------- +Switched to a new branch 'sdk-202405' +$ git branch -a +---------------- +* sdk-202405 + remotes/dgiot/master + remotes/dgiot/sdk-202405 + remotes/m/master + remotes/rk/master +$ git pull dgiot sdk-202405 +--------------------------- +From gitee.com:shenzhen-jiuyilian/fastbootserver + * branch sdk-202405 -> FETCH_HEAD +Updating bf91101..dc76264 +Fast-forward + .clang-format | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + .gitmodules | 3 +++ + README.md | 30 ++++++++++++++++++++++++++++++ + rv1106_ipc_sdk | 1 + + 4 files changed, 170 insertions(+) + create mode 100644 .clang-format + create mode 100644 .gitmodules + create mode 100755 README.md + create mode 160000 rv1106_ipc_sdk +$ git submodule update --init +----------------------------- +Submodule 'rv1106_ipc_sdk' (git@gitee.com:shenzhen-jiuyilian/ipc-rk1106.git) registered for path 'rv1106_ipc_sdk' +Cloning into '/home/xiaojiazhu/project/rkipc/ipc_20240517/project/app/component/fastboot_server/rv1106_ipc_sdk'... +Submodule path 'rv1106_ipc_sdk': checked out 'ff8da760b201d365300aed78190de8564f0d2171' +``` + ## 1.5. 存疑 * 不同的分支之间如何同步某个文件？ diff --git a/middleware/AppManager/README.md b/middleware/AppManager/README.md index b05afefd..f41a057b 100644 --- a/middleware/AppManager/README.md +++ b/middleware/AppManager/README.md @@ -143,19 +143,20 @@ ## 1.3. APP定制整改总结 -  **基于公版基础，未修改原有协议，做界面显示定制和增量开发，方案可控。** +  **基于WiFi公版基础，未修改原有协议，做界面显示定制和增量开发，方案可控。** 1. “记录仪”统一修改为“相机”； -答：公版无法修改，需要定制。 +答：需要定制。 2. 本地相册-“紧急”分类，改为“PIR”； -3. APP连接设备后，自动录像，改为默认不录像，可手动录像； +3. **新增标准的设置项，见前面描述：打猎机参数需求列表；** +4. APP连接设备后，自动录像，改为默认不录像，可手动录像； 答：设备返回非记录仪即可，见能力集。 -4. APP上的“循环”改成“全部”，“拍照”改成“手动”，“紧急”改成“PIR”，“停车”改成“定时”，**全部包括手动/PIR/定时**； -5. **相机设置需要实现设备自定义设置项功能；** +5. APP上的“循环”改成“全部”，“拍照”改成“手动”，“紧急”改成“PIR”，“停车”改成“定时”，**全部包括手动/PIR/定时**； +6. **相机设置需要新增设备自定义设置项功能；** ## 1.4. 设置界面动态渲染方案设计 -  为了实现设置参数可自由定制，例如：可随意的增加/减少常见类型的参数设置。 +  为了实现设置参数可自由定制，例如：可随意的增加/减少常见类型的参数设置。**此功能APP无需多语言翻译，直接显示协议字符即可**。 ### 1.4.1. 常见设置类型