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

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

@@ -2,22 +2,20 @@
 
 * [Back to Home Page](/product/all/en-us/README.md)
 * [Home](README.md)
-  [ Device Configuration](device.md)
+* [ Device Configuration](device.md)
 * App
-  * [App Installation](app.md)
-* Desktop Program
-  * [Updated Description](version.md)
+  * [Offline Version App](app.md)
+* Software
+  * [Download](download.md)
+  * [Version History](version.md)
   * [Installation and Licensing](install.md)
-  * [Sync Scenes](syncScene.md)
-  * [Scene Management](scene.md)
   * [Camera Management](camera.md)
+  * [Sync Scene](syncScene.md)
+  * [Scene Management](scene.md)
   * [Setting](settings.md)
   * [Other Tutorials](otherManual.md)
 * FAQ
-  * [caveat](note.md)
-  * [How Security Software Excludes Virus Checks?](securitySoftware.md)
-  * [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)
-
- 
+  * [Precautions](note.md)
+  * [Files are detected as viruses by Windows](winSetting.md)
+  * [How to set Never Sleep?](sleepSetting.md)
+  * [Program flashbacks during calculations](flashback.md)

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

@@ -1,23 +1,23 @@
 ## App Installation
-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/>
+The same App is used for the 4DKankan Minion, 4DKankan Mega and 4DKankan Meta. The installation links for the V1.3.5 app are provided below.<br/>
 iOS App Download Link:<br/>
-http://fir.4dage.com/wfxr?release_id=661733a20d81cc53e7caadf1
+http://fir.4dage.com/wfxr?release_id=667e823ff945483e9ead5e20
 
 Android Download Link:<br/>
-http://fir.4dage.com/9d5s?release_id=66166a8c23389f6bc963b846
+http://fir.4dage.com/9d5s?release_id=667e825623389f490e71fd91
 
-## Camera Firmware 
+## Firmware Requirement
 The 4DKankan Offline Version needs to specify the camera firmware version.<br/>
 4D KanKan Minion: V1.1.2<br/>
 4D KanKan Mega: V1.2.0<br/>
-4D KanKan Meta: V1.0.4<br/>
+4D KanKan Meta: V1.0.6<br/>
 
 ## Firmware Upgrade
-Copy the firmware package to a dedicated USB drive. <br/>
-Connect the camera using the app and mount the USB drive. <br/>
-Enter My -> More Settings -> Update Firmware.<br/>
+Copy the firmware package to the dedicated USB drive. <br/>
+Connect the camera using the app and plug in the USB drive. <br/>
+Go to Me -> More Settings -> Update Firmware.<br/>
 
 ## Upload Logs
-Connect the camera using the app and mount the USB drive. <br/>
-Enter My -> More Settings -> Upload Logs. Upload to the USB drive. <br/>
+Connect the camera using the app and plug in the USB drive. <br/>
+Go to Me -> More Settings -> Upload Logs <br/>
 Extract logs from the USB drive.<br/>

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

@@ -1,14 +1,18 @@
+# Camera Management
+To transfer and process the data captured by the camera, you need to bind it in the software.<br/>
+
 ## 1. Camera Authorization
-Find the camera authorization portal, copy the machine code and contact the official channel of 4DAGE to get the camera authorization key, after verification, you can synchronize the data of this camera with the computer.<br/>
+In Camera Management, click Camera Authorization, copy the machine code, and contact 4DAGE for the camera authorization key. After verification, you can synchronize the camera data with the computer.<br/>
 ![](src/local/xj-1.png)
+![](src/local/xj-2.png)
 
-## 2. Viewing Cameras
-After the camera's SN code is verified, it is displayed in the camera list. In this list, you can view the SN code, the number of scenes that are synchronized with the computer, and the time when the scenes were last synchronized. <br/>
+## 2. View Cameras
+Once the camera's serial number is verified, it is displayed in the camera list. This list shows the SN code, the number of scenes synchronized with the computer, and when they were last synchronized. <br/>
 ![](src/local/xj-3.png)
 
 ## 3. Camera Replacement
-If you need to replace the camera, you can contact the official channel of 4DAGE and provide the SN code of the camera you need to replace to get the camera replacement key. After the replacement, the scene data that has been synchronized with the original camera will remain unchanged, but you cannot continue to synchronize the scene data of the original camera.<br/>
-![](src/local/xj-2.png)
+If you need to replace the camera, you can contact 4DAGE and provide the SN code of the camera to be replaced to obtain the camera replacement key. After the replacement, the scene data synchronized with the original camera will remain unchanged, but you cannot continue to synchronize the scene data of the original camera. <br/>
+![](src/local/xj-4.png)
 
 ## 4. Search
 Enter the SN code to search for the corresponding camera. <br/>

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

@@ -0,0 +1,6 @@
+# Download
+The 4DKanKan Offline Version on desktop includes the 4DKanKan Offline Version Software Installer and 4DKanKan License Manager. <br/>
+
+V1.8.1<br/>
+Please download the V1.8.1 4DKanKan Offline Version Software Installer and 4DKanKan License Manager in the following links:<br/>
+https://4dkankan.oss-cn-shenzhen.aliyuncs.com/propaganda/%E5%9B%9B%E7%BB%B4%E6%B7%B1%E6%97%B6%E6%9C%AC%E5%9C%B0%E7%89%88%E6%95%99%E7%A8%8B/%E5%9B%9B%E7%BB%B4%E7%9C%8B%E7%9C%8B%E6%9C%AC%E5%9C%B0%E7%89%88V1.8.1.zip

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

@@ -1,6 +1,8 @@
-When calculating the scene, if the computer configuration does not meet the conditions or the operation is improper, it may cause the program to flash back. The processing procedure is as follows:
+When you calculate the scene, if your computer configuration does not meet the conditions, or improper operation, it may cause the program to flash back. The solution is as follows:
 
 
 1.Restart the software；<br/>
-2.Check the progress of the calculation in the system tray, if there is no progress, the calculation is actually finished. <br/>
-3.Click "Pause" in the scene list, then click "Calculate". <br/>
+
+2.Check the progress of the calculation in the system tray, if there is no more progress, it means that the calculation has stopped. <br/>
+
+3.Click "Pause" in the scene list and then click "Calculate". <br/>

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

@@ -1,18 +1,21 @@
-1. It is recommended to add exclusions to Security on the computer where the offline version is installed to avoid the system mistakenly recognizing it as a virus. (For details, please refer to the operating instructions for adding exclusions). <br/>
+1. It is recommended to add exclusions to Security on the computer where the offline version is installed to prevent the system from mistakenly detecting it as a virus. (See the instructions for adding exclusions for details).  <br/>
 
 
-2. Disable security software to avoid mistakenly recognizing it as a virus and deleting or occupying files in the installation directory.<br/>
+2. Disable security software to prevent it from being mistakenly detected as a virus and deleting or occupying files in the installation directory.<br/>
+
 
 3. Normally, double-clicking the program will run it as administrator. If the computer you are using does not run as administrator by default, right-click to run as administrator.<br/>
-![](src/local/tips-1.png)
+![](src/local/tips-1.jpg)
+
 
-4. Do not disable the computer's Ethernet connection, which makes it impossible to know the authorization status. <br/>
-![](src/local/tips-2.png)
+4. Do not disable the computer's Ethernet connection, which will prevent it from obtaining the license status. <br/>
 
-5. Set Never Hibernate to avoid hibernating during calculations, which can cause failure of the calculation. (See the operating instructions for details)<br/>
+
+5. Set Never Sleep to prevent the computer from going to sleep during calculations, which may cause the calculation to fail. (See the manual for details) <br/>
 
 
 6. Please keep the power on during the calculation process to prevent the calculation from failing due to insufficient power. <br/>
 
-7. When adding new shooting points or replacing shooting points in the original scene, you can synchronize the scene from the camera to the software using a USB flash drive, provided that the original corresponding scene data has not been deleted from the camera.
+
+7. You can synchronize scenes from the computer to the camera via the USB drive for rescanning or continuing scanning. The corresponding scene data must not be deleted from the camera.
 <br/>

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

@@ -1,11 +1,12 @@
-Tutorial video for 4D KanKan Minion
-https://www.4dkankan.com/#/service/mVideo/Minion
 
-User manual for 4D KanKan Mega
-https://www.4dkankan.com/#/service/md/minion
+**Video tutorial for 4D KanKan Mega** <br/>
+https://eur.4dkankan.com/#/service/mVideo/Mega
 
-Tutorial video for 4D KanKan Minion
-https://www.4dkankan.com/#/service/mVideo/Mega
+**Video tutorial for 4D KanKan Minion** <br/>
+https://eur.4dkankan.com/#/service/mVideo/Minion
 
-User manual for 4D KanKan Mega
-https://www.4dkankan.com/#/service/md/mega
+**User manual for Mesh Editors** <br/>
+https://docs.4dkankan.com/#/product/4dkk/en-us/README
+
+**User manual for Point Cloud Editor** <br/>
+https://docs.4dkankan.com/#/product/laser/en-us/README

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

@@ -1,22 +0,0 @@
-After installing the offline version, some of the files in the installation path may be mistakenly detected as viruses by computer security software and deleted immediately. The Windows system will display the following threat prompt. <br/>
-
-## 1.Guanjia
-1. Open the Guanjia.<br/>
-![](src/local/security-1.png)
-
-2. Click Virus Detection -> Trust Zone -> Add Folder -> Add Camera Directory -> Click OK.<br/>
-![](src/local/security-2.png)
-
-## 2.360 Weishi
-1. Open the 360 Weishi. <br/>
-![](src/local/security-3.png)
-
-2. Click "Trojan Horse Detection" - "Trust Zone". <br/>
-
-![](src/local/security-4.png)
-
-3. After entering the Trust Zone, click "Add Trusted Directory" or "Add Trusted File". <br/>
-![](src/local/security-5.png)
-
-4. Add a trusted directory. <br/>
-5. A pop-up prompt will appear, click "OK". <br/>

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

@@ -1,10 +1,14 @@
 ## 1. File Management
-Click [Settings] to enter file management. You can view the storage path for the original resources and computation results of local scenes. Clicking on the path allows you to quickly open the folder. When the default storage space on the disk is insufficient, you can add a new path. After adding, the data will be stored in the new path. Deleting a path will not remove the data; you can manually delete it by entering the corresponding path.
+Click [Settings] to enter the Document Management. You can view the path for the raw resources and calculation results of local scenes. You can click the path to quickly open the folder. <br/>
+If storage of the default path is insufficient, you can add a new path. Once added, the data will be stored in the new path. Deleting the path will not remove the data; you can delete it manually by entering the corresponding path.
+![](src/local/sz-1.png)
 
 
-## 2. License Authorization
-If authorized, you can check the remaining validity period on this page.
+## 2. Authorization License
+On this page, you can check the remaining time on your license.
+![](src/local/sz-2.png)
 
 
 ## 3. Version Information
-You can view the software version number on this page.
+You can view the software version information on this page.
+![](src/local/sz-3.png)

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

@@ -1,13 +1,10 @@
-为保障场景计算全过程顺利进行，需设置电脑休眠模式为“从不休眠”。具体操作如下：<br/>
+To ensure that the whole process of scene calculation runs smoothly, you need to set your computer to "Never Sleep". The procedure is as follows:<br/>
 
-1. 进入控制面板<br/>
+1. Go to Windows Settings. <br/>
 ![](src/local/faq2-1.png)
 
-2. 进入系统和安全<br/>
+2. Go to Power & sleep. <br/>
 ![](src/local/faq2-2.png)
 
-3. 进入“更改计算机睡眠时间”<br/>
+3. Change Sleep into Never. <br/>
 ![](src/local/faq2-3.png)
-
-4. 将“关闭显示器”、“使计算机进入睡眠状态”设置为“从不”。<br/>
-![](src/local/faq2-4.png)

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

@@ -1,21 +1,30 @@
-## 1. Scenario One: Syncing Scenes to Computer After Shooting
+# Sync Scene
 
-1.1. Connect the USB Drive
-After shooting scenes using the "4D KanKan" App and uploading them to a USB drive (refer to the 4D Mega User Manual for details), connect the USB drive to the computer, as shown below. Once connected, the software will display the "Sync Scene" interface.
+## 1. Sync Scenes to Computer After Scanning
 
+**1.1. Plug in the USB Drive**<br/>
 
-1.2. Sync Scenes to Computer
-1) In the left list, scenes on the USB drive are displayed. Click [Sync] to synchronize/copy them to the computer, as shown below. After synchronization, you can [Resync] to overwrite scenes on the computer.
-2) To delete scenes on the USB drive, click the [Delete] button below the scene.
+After scanning with the 4D KanKan Offline Version App and uploading the project to the USB drive, you can see the Sync page when you plug in the USB drive to your computer.
+
+![](src/local/tb-1.png)
+
+**1.2. Sync Scenes to Computer**
+
+1) Select scenes you want to sync and click [Sync] to synchronize/copy them to the computer. For scene that has been synchronized, you can [Resync] to overwrite scenes on the computer.
+2) Click [Delete] to delete scenes on the USB drive.
 3) Multiple scenes can be selected for [Batch Sync] or [Batch Delete].<br/>
-![](src/local/tb-3.png)
 
-## 2. Scenario Two: Obtaining Scenes for Additional Shooting from the Computer <br/>
-![](src/local/tb-4.png)
+![](src/local/tb-2.png)
+
+## 2. Download Scenes for Rescanning or Continued Scanning from the Computer <br/>
+
+**2.1. Plug in the USB Drive**
+
+**2.2. Sync Scenes to USB Drive**
+
+1) Go to the Local Scene on Computer page. <br/>
+If the current scene is only saved on the computer, click [Sync] to copy it to the USB drive. <br/>
+If the scene is svaed on both the USB drive and the computer, click [Resync] to overwrite the scene on the USB drive.<br/>
+2) After synchronization, plug in the USB drive to the camera, and you can use the 4DKanKan Offline Version App to download scenes from the USB drive to rescan or continue scanning. (**The corresponding scene data must not be deleted from the camera**).<br/>
 
-2.1. Connect the USB Drive
-Same as in Scenario One.
-2.2. Sync Scenes to USB Drive
-1) In the right list, computer-local scenes are displayed. If the current scene only exists on the computer, click [Sync] to copy it to the USB drive. If the scene exists on both the USB drive and the computer, click [Resync] to overwrite the scene on the USB drive.
-2) After synchronization, connect the USB drive to the camera, and you can use the "4D KanKan" app to download scenes for additional shooting from the USB drive (**provided that the corresponding scene data is not deleted in the camera**).<br/>
-![](src/local/tb-5.png)
+![](src/local/tb-3.png)

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

@@ -1,3 +1,36 @@
+##  Version Number V1.8.1
+Release Date: July 1, 2024<br/>
+Updates:
+1. Modify the prompt to close the software;
+
+##  Version Number V1.8.0
+Release Date: June 28, 2024<br/>
+Updates:
+1. Multiple data sources: add smart3D (drone modeling) and ireal3d (small object modeling);
+2. Licensing process optimization: remove installation authorization;
+3. Mesh scene, based on version 4.10.7, add displaying panoramas taken by the app in the form of scene association;
+4. Point cloud scene, keep V2.7.1, no new requirements;
+
+## Version Number V1.8.2
+Release Date: July 9, 2024<br/>
+Updates:<br/>
+Fusion version:
+1. When importing multiple fusion functions into MESH, choose the highest definition version;<br/>
+
+## Version Number V1.8.1
+Release Date: July 1, 2024<br/>
+Updates:<br/>
+1. Modify the software shutdown prompt language;<br/>
+
+## Version Number V1.8.0
+Release Date: June 28, 2024<br/>
+Updates:<br/>
+Standard version:<br/>
+1.Optimize the installation authorization process;<br/>
+2.Based on Mesh scene V4.10.7, display the panoramic image captured by the app in the form of scene association;<br/>
+3.In point cloud scenarios, maintain V2.7.1 without any new requirements;<br/>
+Fusion version:<br/>
+1.Add Smart3D for drone modeling and ireal3D for small object modeling;<br/>
 
 ##  Version Number V1.7.1
 Release Date: June 24, 2024<br/>

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

@@ -2,7 +2,7 @@
 After installing the offline version, some of the files in the installation path may be mistakenly detected as viruses by computer security software and deleted immediately. The Windows system will display the following threat prompt. <br />
 ![](src/local/faq-1.png)
 
-## 1.Processing step
+## 1. Solutions
 1. Click to view threats.<br />
 ![](src/local/faq-2.png)
 
@@ -13,21 +13,22 @@ After installing the offline version, some of the files in the installation path
 ![](src/local/faq-4.png)
 
 
-## 2.Preventive programs 1：Shutdown protection (for use in offline environments)
-1. Go to Security<br />
+## 2. Preventive Approach 1：Disable protection (for use in offline environments)
+1. Go to Windows Security<br />
 ![](src/local/faq-5.png)
 
-2. Go to "Virus and Threat Protection"<br />
+2. Go to "Virus & Threat Protection"<br />
 ![](src/local/faq-6.png)
 
-3. Go to "Management Settings" under "Virus and Threat Protection" settings.<br />
+3. Go to "Manage Settings" under "Virus & Threat Protection" settings.<br />
 ![](src/local/faq-7.png)
 
-4. Turn off real-time protection. (Turning it off is temporary; the system will turn it on automatically). <br />
+4. Disable real-time protection. (Turning it off is temporary, the system will turn it on automatically). <br />
 ![](src/local/faq-8.png)
 
-## 3.Preventive programs 2：Add exclusions (to exclude the installation directory).
+## 3.Preventive Approach 2：Add exclusions (to exclude the installation path).
 You can set up exclusions to prevent accidental deletion before it happens. The procedure is as follows.<br/>
+
 1. In the "Virus and Threat Protection", add "Exclusions". <br />
 ![](src/local/faq-9.png)
 

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

@@ -1,17 +1,17 @@
 
 ## 安装App
-四维看看、四维深时、四维深光三款相机使用同一个App，V1.3.4App安装地址如下。<br/>
+四维看看、四维深时、四维深光三款相机使用同一个App，V1.3.5App安装地址如下。<br/>
 iosApp下载地址<br/>
-http://fir.4dage.com/wfxr?release_id=661733a20d81cc53e7caadf1
+http://fir.4dage.com/wfxr?release_id=667e823ff945483e9ead5e20
 
 android下载地址<br/>
-http://fir.4dage.com/9d5s?release_id=66166a8c23389f6bc963b846
+http://fir.4dage.com/9d5s?release_id=667e825623389f490e71fd91
 
 
 ## 相机固件（本地版指定相机固件版本使用）
 1、四维看见：V1.1.2<br/>
 2、四维深时：V1.2.0<br/>
-3、四维深光：V1.0.4<br/>
+3、四维深光：V1.0.6<br/>
 
 ## 固件升级
 1、将固件包拷贝至专用U盘；<br/>

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

@@ -1,4 +1,24 @@
 
+## 版本号 V1.8.2
+更新日期：2024年7月9日<br/>
+更新内容：<br/>
+1.多元融合功能导入MESH时，拿最高清晰度的版本；<br/>
+
+## 版本号 V1.8.1
+更新日期：2024年7月1日<br/>
+更新内容：<br/>
+1.修改关闭软件提示语；<br/>
+
+## 版本号 V1.8.0
+更新日期：2024年6月28日<br/>
+更新内容：<br/>
+标准版：<br/>
+1.多数据源：增加smart3D（无人机建模）、ireal3d（小物体建模）；<br/>
+2.授权流程优化：去掉安装授权；<br/>
+3.Mesh场景，基于4.10.7版本，增加以场景关联的形式显示App拍摄的全景图；<br/>
+融合版：<br/>
+4.点云场景，保持V2.7.1，无新增需求；<br/>
+
 ## 版本号 V1.7.1
 更新日期：2024年06月24日<br/>
 更新内容：<br/>

product/laser/en-us/createfloor.md

@@ -1,2 +1,4 @@
 ### How to create a floor?<!-- {docsify-ignore} -->
-<video src="https://4dkk.4dage.com/创建楼层.mp4" style="width: 100%; height: 100%;" controls="controls"></video>
+
+[filename](videos/createafloor.mp4 ':include :type=video width=100% height=100% controls')
+

product/laser/en-us/createroom.md

@@ -1,2 +1,3 @@
 ### How to create a room?<!-- {docsify-ignore} -->
-<video src="https://4dkk.4dage.com/创建房间.mp4" style="width: 100%; height: 100%;" controls="controls"></video>
+
+[filename](videos/createaroom.mp4 ':include :type=video width=100% height=100% controls')

product/laser/en-us/disorderedpoints.md

@@ -2,4 +2,5 @@
 As shown below：
 ![](images/disorder.png)
 Adjust in sequence beginning with the first point bearing serial number 1. Check video tutorial.
-<video src="https://4dkankan.oss-cn-shenzhen.aliyuncs.com/propaganda/%E5%9B%9B%E7%BB%B4%E6%B7%B1%E6%97%B6%E7%BA%BF%E4%B8%8A%E7%89%88%E6%95%99%E7%A8%8B/%E7%82%B9%E4%BD%8D%E9%94%99%E4%B9%B1.mp4" style="width: 100%; height: 100%;" controls="controls"></video>
+
+[filename](videos/Correcttheerrantpoints.mp4 ':include :type=video width=100% height=100% controls')

product/laser/en-us/floorplan.md

@@ -1,4 +1,4 @@
 ### How to modify the floor plan?<!-- {docsify-ignore} -->
 Please check the video
 
-<video src="https://4dkk.4dage.com/修改平面图.mp4" style="width: 100%; height: 100%;" controls="controls"></video>
+[filename](videos/FloorplanModify.mp4 ':include :type=video width=100% height=100% controls')

product/laser/en-us/splicing.md

@@ -1,3 +1,5 @@
 ### How to stitch scenes?<!-- {docsify-ignore} -->
 Please check the video.
-<video src="https://4dkk.4dage.com/数据集校准.mp4" style="width: 100%; height: 100%;" controls="controls"></video>
+
+[filename](videos/Stichscenes.mp4 ':include :type=video width=100% height=100% controls')
+