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

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

@@ -1,5 +1,5 @@
-## Welcome to 4D KanKan Local Edition
-The 4D KanKan Local Edition consists of four components: 4DKanKan Mega/4DKanKan Minion(cameras), a dedicated USB drive, 4DKanKan (App), and 4DKanKan Local Edition (desktop program).
+## Welcome to 4DKanKan Offline Version
+The 4D KanKan Offline Version consists of four components: 4DKanKan Mega/4DKanKan Minion(cameras), a dedicated USB drive, 4DKanKan (App), and 4DKanKan Offline Version (desktop program).
 
 
 ## 1. 4DKanKan Minion, 4DKanKan Mega, 4DKanKan Meta
@@ -8,11 +8,11 @@ The 4D KanKan Local Edition consists of four components: 4DKanKan Mega/4DKanKan
 4D KanKan Minion is a novel surveying device independently developed by the 4DAGE, achieving high-precision 3D reconstruction of space through artificial intelligence algorithms. With advantages such as high efficiency, high precision, and low cost, 4D KanKan Minion has become a symbol of domestically controllable products replacing imports in the field of new surveying.
 
 ## 2. Dedicated USB Drive
-The dedicated USB drive is used for data synchronization and transfer between the App and desktop program in the offline data collection process of 4D KanKan（是否要加PRO?) Local Edition.
+The dedicated USB drive is used for data synchronization and transfer between the App and desktop program in the offline data collection process of 4DKanKan Offline Version.
 
 ## 3. 4D KanKan (App)
 The 4D KanKan Local Edition App is the accompanying shooting App for 4D Mega, allowing control of the camera through the App. Refer to the built-in "4D Mega/Minion User Manual" for details.
 
-## 4. 4D KanKan Local Edition (Desktop Program)
-The 4D KanKan Local Edition is a desktop program installed on specified configuration computers. It can calculate and generate 3D laser scenes in an offline environment. It also allows stitching, adding hotspots, measurements, and other operations on local scenes. Refer to the user manual for detailed instructions.
+## 4. 4DKanKan Offline Version (Desktop Program)
+The 4DKanKan Offline Version is a desktop program installed on specified configuration computers. It can calculate and generate 3D laser scenes in an offline environment. It also allows stitching, adding hotspots, measurements, and other operations on local scenes. Refer to the user manual for detailed instructions.
 

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

@@ -1,6 +1,8 @@
 <!-- docs/_sidebar.md -->
 
+* [Back to Home Page](/product/all/en-us/README.md)
 * [Home](README.md)
+  [ Device Configuration](device.md)
 * App
   * [App Installation](app.md)
 * Desktop Program
@@ -17,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/en-us/winSetting.md

@@ -7,7 +7,7 @@ After installing the offline version, some of the files in the installation path
 ![](src/local/faq-2.png)
 
 2. If you do not see the threat alert, you can access it from the Windows Security. <br />
-![](src/local/faq-3.png)
+![](src/local/faq-6.png)
 
 3. Select Recovery at Windows threat prompt.<br />
 ![](src/local/faq-4.png)

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/>

product/4dkk/zh-cn/_sidebar.md

@@ -6,6 +6,7 @@
   * [部分功能说明](dataexpired.md)
   * [注销账号](accountcancellation.md)
   * [会员权益相关问题](membership.md)
+  * [SDK 开发文档](https://docs.4dkankan.com/#/zh-cn/)
 * 离线包
   * [如何展示关联场景](offlinefindassociatedpoint.md)
 * 场景美化

product/4dkk/zh-cn/addmoniter.md

@@ -5,12 +5,23 @@
 3. 视频格式：m3u8
 4. 示例：http://111.11.11.111:22222/rtp/xxxxxxxx/hls.m3u8
 
-注意，若您使用的是 http 协议的视频地址，在 https 的网络协议下无法打开。请按如下步骤操作：<br>
+#### 二、网络访问安全协议需知<!-- {docsify-ignore} -->
+若您使用的是 http 协议的视频地址，在 https 的网络协议下无法打开。请按如下步骤操作：<br>
 
 第一步，请使用您的账号登录网址：http://cam.4dkankan.com<br>
 第二步，登录成功后，查看页面也需要使用 http://cam 查看。例如：<br>
-            原网址：https://www.4dkankan.com/spg.html?m=KK-t-7YPpJH5GJ5U&lang=zh<br>
-            修改为：http://cam.4dkankan.com/spg.html?m=KK-t-7YPpJH5GJ5U&lang=zh
+            原网址：https://www.4dkankan.com/spg.html?m=KK-t-xxxxxxxxx&lang=zh<br>
+            修改为：http://cam.4dkankan.com/spg.html?m=KK-t-xxxxxxxxx&lang=zh<br>
+            同理，编辑页面如果需要预览监控视频也同样需要使用 http://cam 地址。
 
-#### 二、视频教程<!-- {docsify-ignore} -->
+#### 异常处理<!-- {docsify-ignore} -->
+如果监控出现无法显示，请在地址栏检查地址是否被搜索引擎篡改。如输入 http://cam.4dkankan.com，地址栏自动改为 https://www.4dkankan.com时，请按如下步骤图操作：<br>
+1. 找到浏览器设置项:<br>
+![](images/browser1.jpg)
+
+2. 将默认搜索引擎改为 Google：<br>
+![](images/browser2.jpg)
+
+
+#### 三、添加监控视频操作教程<!-- {docsify-ignore} -->
 [filename](videos/监控视频教程.mp4 ':include :type=video width=100% height=100% controls')

product/all/en-us/_sidebar.md

@@ -4,4 +4,4 @@
 * [App](/product/app/en-us/AppReady.md)
 * [Mesh scene editing platform](/product/4dkk/en-us/README.md)
 * [Point Cloud scene editing platform](/product/laser/en-us/README.md)
-* [Local Edition](/product/4dkk-local/en-us/README.md)
+* [4DKanKan Offline Version](/product/4dkk-local/en-us/README.md)

product/all/zh-cn/Technicalspecifications.md

@@ -4,8 +4,11 @@
 	color:blue !important;
 }
 </style>
-[四维深光技术参数说明书](https://docs.4dkankan.com//product/all/zh-cn/pdf/四维深光技术参数说明书.pdf ':ignore :class=download-color')
+[四维深光技术参数说明书](https://docs.4dkankan.com/product/all/zh-cn/pdf/四维深光技术参数说明书.pdf ':ignore :class=download-color')
 
-[四维深时技术参数说明书](https://docs.4dkankan.com//product/all/zh-cn/pdf/四维深时技术参数说明书.pdf ':ignore :class=download-color')
+[四维深时技术参数说明书](https://docs.4dkankan.com/product/all/zh-cn/pdf/四维深时技术参数说明书.pdf ':ignore :class=download-color')
+
+[四维看看&看见技术参数说明书](https://docs.4dkankan.com/product/all/zh-cn/pdf/四维看看-看见技术参数说明书.pdf ':ignore :class=download-color')
+
+[RTK技术参数说明书](https://docs.4dkankan.com/product/all/zh-cn/pdf/RTK技术参数说明书.pdf ':ignore :class=download-color')
 
-[RTK技术参数说明书](https://docs.4dkankan.com//product/all/zh-cn/pdf/RTK技术参数说明书.pdf ':ignore :class=download-color')