Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp

app/build.gradle

@@ -5,7 +5,7 @@ plugins {
 // 10,00,000 major-minor-build
 def AppMajorVersion = 1
 def AppMinorVersion = 3
-def AppBuildNumber = 146
+def AppBuildNumber = 147
 
 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber
 def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber

app/src/main/cpp/CMakeLists.txt

@@ -356,6 +356,7 @@ add_library( # Sets the name of the library.
         netcamera/VendorCtrl.cpp
         netcamera/YuShiCtrl.cpp
         netcamera/HangYuCtrl.cpp
+        netcamera/HikonCtrl.cpp
 
         ${STREAMING_SRCS}