Merge branch 'master' of http://192.168.0.115:3000/4dkankan-docs/pro-docs

product/4dkk-local/en-us/_sidebar.md

@@ -2,6 +2,7 @@
 
 * [Back to Home Page](/product/all/en-us/README.md)
 * [Home](README.md)
+  [ Device Configuration](device.md)
 * App
   * [App Installation](app.md)
 * Desktop Program
@@ -18,3 +19,5 @@
   * [How to deal with files mistakenly recognized as viruses by Win10](winSetting.md)
   * [How do I set my computer to hibernate mode?](sleepSetting.md)
   * [How to deal with program flashbacks during calculations?](flashback.md)
+
+ 

product/4dkk-local/en-us/app.md

@@ -1,15 +1,16 @@
 ## App Installation
-Both the 4DKanKan pro ,4DKanKan Mega and 4DKanKan Meta cameras use the same app. The installation links for the V1.3.0 app are provided below.<br/>
+The same App is used for the 4DKankan Minion, 4DKankan Mega and 4DKankan Meta. The installation links for the V1.3.4 app are provided below.<br/>
 iOS App Download Link:<br/>
-http://fir.4dage.com/wfxr?release_id=657bab20b2eb46786b6ad4a3
+http://fir.4dage.com/wfxr?release_id=661733a20d81cc53e7caadf1
 
 Android Download Link:<br/>
-http://fir.4dage.com/9d5s?release_id=6581118823389f719e6de2ae
+http://fir.4dage.com/9d5s?release_id=66166a8c23389f6bc963b846
 
-## Camera Firmware
+## Camera Firmware 
+The 4DKankan Offline Version needs to specify the camera firmware version.<br/>
 4D KanKan Minion: V1.1.2<br/>
-4D KanKan Mega: V1.1.0<br/>
-4D KanKan Meta: V1.0.2<br/>
+4D KanKan Mega: V1.2.0<br/>
+4D KanKan Meta: V1.0.4<br/>
 
 ## Firmware Upgrade
 Copy the firmware package to a dedicated USB drive. <br/>

product/4dkk-local/en-us/device.md

@@ -0,0 +1,8 @@
+Device Configuration<br/>
+Laptop workstation<br/>
+
+CPU: Intel Core i9-13900h<br/>
+Memory: DDR5 32G*2<br/>
+Storage: 2TB SSD<br/>
+Graphics card: RTX 3060<br/>
+Operating system: Windows 10 Pro<br/>

product/4dkk-local/en-us/scene.md

@@ -5,7 +5,12 @@
 4）The computation process is divided into stages. If paused during the process, the unsaved stages will need to be recomputed in the next iteration
 
 ## 2.Edit Scene
-1）After the scene computation is complete, click [Edit] to open the editing window. Refer to the Scene Editing Operation Instructions for details.
+1）After the scene computation is complete, click [Edit] to open the editing window. Refer to the Scene Editing Operation Instructions for details.<br/>
+Mesh scene editing tutorial<br/>
+https://www.4dkankan.com/#/service/md/minion<br/>
+
+Point Cloud Scene Editing Tutorial<br/>
+https://www.4dkankan.com/#/service/md/mega<br/>
 
 ## 3.Other Operations
 1）Refresh: Refresh the scene list data;<br/>

product/4dkk-local/en-us/version.md

@@ -1,4 +1,23 @@
 
+##  Version Number V1.7.1
+Release Date: June 24, 2024<br/>
+Updates:<br/>
+1. The installation process has multiple languages, supporting Chinese, English, and Japanese;<br/>
+2. A prompt is added to the installation interface;<br/>
+3. English version of the installation agreement;<br/>
+4. The language of the system main interface is the language selected during installation, and the language after switching is the switched language;<br/>
+5. Download the offline package of the corresponding language according to the current language;<br/>
+6. Multiple languages, Japanese is added;<br/>
+7. In the two modules of geographic registration and coordinates, Singapore coordinates SVY21 are added;<br/>
+8. The latest algorithm supports E57 bubble view display and optimizes calculation speed;<br/>
+9. After closing the software, it prompts to run in the background;<br/>
+
+##  Version Number V1.6.0
+Release Date: April 08, 2024<br/>
+Updates:<br/>
+1. The point cloud scene is merged into V2.7.1 (supporting e57);<br/>
+2. The algorithm of the offline version is updated;<br/>
+
 ##  Version Number V1.5.0
 Release Date: December 15, 2023<br/>
 Updates:<br/>

product/4dkk-local/zh-cn/README.md

@@ -3,7 +3,6 @@
 四维看看本地版由四维看见、四维深时、四维深光（相机）；专用U盘；四维看看（App）；四维看看本地版（桌面程序）4个部分构成。<br/>
 ![](src/local/sc-1.png)
 
-<<<<<<< HEAD
 ### 1.  四维看见、四维深时、四维深光
 四维看见是四维时代自主研发的实景三维新型测绘设备，依托人工智能算法对空间实现高精度三维重建。凭借高效率、高精度和低成本等优势，四维看见成为国产自主可控，在新型测绘领域实现进口替代的标志性产品。<br/>
 
@@ -16,23 +15,8 @@
 
 ### 3. 四维看看（App）
 四维看看本地版App是相机的配套拍摄App，通过App连接相机控制拍摄。详见App内置《使用说明》。<br/>
-=======
-### 1.  四维看见、四维深时、四维深光<!-- {docsify-ignore} -->
 
-四维深时是国产自研实景三维激光相机。结合905nm激光雷达的超高精度扫描，单点位最高可捕获260m建模范围，输出16K高清实景影像和高精度点云，点云精度可达厘米级，已广泛应用于建筑、水利、消防、应急、能源、博物馆、BIM、地下空间可视化等行业。<br/>
-
-四维看见是四维时代自主研发的实景三维新型测绘设备，依托人工智能算法对空间实现高精度三维重建。凭借高效率、高精度和低成本等优势，四维看见成为国产自主可控，在新型测绘领域实现进口替代的标志性产品。<br/>
-
-### 2. 专用U盘<!-- {docsify-ignore} -->
-
-四维看见本地版数据采集制作采用全离线过程进行，专用U盘用于App与桌面程序之间的数据同步和传输。<br/>
-
-### 3. 四维看看（App）<!-- {docsify-ignore} -->
-
-四维看看本地版App是四维深时的配套拍摄App，通过App连接相机控制拍摄。详见App内置《四维深时/看见使用说明》。<br/>
->>>>>>> 4214f8e3fe4e4cea69c87c753af4d140e7882c22
-
-### 4. 四维看看本地版（桌面程序<!-- {docsify-ignore} -->
+### 4. 四维看看本地版（桌面程序）<!-- {docsify-ignore} -->
 
 四维看看本地版是一款桌面程序，安装在指定配置电脑上，可在离线环境下计算生成三维激光场景。也可以对电脑本地场景进行拼接、加热点、测量等。详见操作手册。
 

product/4dkk-local/zh-cn/device.md

@@ -2,7 +2,8 @@
    
 笔记本工作站
 
-1. CPU：英特尔酷睿i9-13900h；
+1. CPU：英特尔酷睿i9-13900h
 2. 内存：DDR5 32G*2
 3. 存储：2TB SSD
-4. 显卡：RTX 3060
+4. 显卡：RTX 3060
+5. 操作系统：Windows 10 Pro 专业版

product/4dkk-local/zh-cn/scene.md

@@ -7,12 +7,12 @@
 ![](src/local/cj-2.png)
 
 ## 2.编辑场景
-1）场景计算完成，点击【编辑】，可打开编辑窗口。详见场景编辑操作说明。
-Mesh场景编辑教程
-https://www.4dkankan.com/#/service/md/minion
+1）场景计算完成，点击【编辑】，可打开编辑窗口。详见场景编辑操作说明。<br/>
+Mesh场景编辑教程<br/>
+https://www.4dkankan.com/#/service/md/minion<br/>
 
-点云场景编辑教程
-https://www.4dkankan.com/#/service/md/mega
+点云场景编辑教程<br/>
+https://www.4dkankan.com/#/service/md/mega<br/>
 ![](src/local/cj-3.png)
 
 ## 3.其它操作

product/4dkk-local/zh-cn/version.md

@@ -1,4 +1,17 @@
 
+## 版本号 V1.7.1
+更新日期：2024年06月24日<br/>
+更新内容：<br/>
+1、安装过程多语言版本，支持中文，英文，日文；<br/>
+2、安装界面增加提示语；<br/>
+3、安装协议英文版；<br/>
+4、系统主界面按安装时选择的语言、切换后按切换的语言；<br/>
+5、离线包，根据当前语言下载对应语言的离线包；<br/>
+6、多语言，增加日语；<br/>
+7、地理注册、坐标，增加新加坡坐标SVY21;<br/>
+8、算法：支持E57气泡展示、优化计算速度；<br/>
+9、关闭软件后，提示后台运行；<br/>
+
 ## 版本号 V1.6.0
 更新日期：2024年04月08日<br/>
 更新内容：<br/>