feat: 新增地图版本号接口

ExportQBGISCtrlClass.cpp

@@ -437,3 +437,12 @@ extern "C" void WINAPI SetBindLine14Coordinate(int uavID,double lon,double lat)
 		g_mapShowDlg.SetBindLine14Coordinate(uavID,lon,lat);
 	}
 }
+
+//获取地图版本号
+extern "C" CString WINAPI GetMapVersion() {
+	AFX_MANAGE_STATE(AfxGetAppModuleState());
+	if (g_bCreateMap)
+	{
+		return g_mapShowDlg.GetMapVersion();
+	}
+}

ExportQBGISCtrlClass.h

@@ -119,4 +119,7 @@ extern "C" _declspec(dllexport) void ShowLine14Ex(int uavID,double uavLon,double
 //输入：飞机ID，自主着陆点经纬度
 extern "C" _declspec(dllexport) void SetBindLine14Coordinate(int uavID,double lon,double lat);
 
+//获取地图版本号
+extern "C" _declspec(dllexport) CString GetMapVersion();
+
 //#endif

GISControlDlg.def

@@ -39,3 +39,4 @@ EXPORTS
  OnShowTargetPoint          @32
  ShowLine14Ex				@33
  SetBindLine14Coordinate	@34
+ GetMapVersion				@35

GISDlg.cpp

@@ -1393,9 +1393,9 @@ void CGISDlg::OnShowRMenu()
 					{
 						pSubMenu->CheckMenuItem( ID_SHOW_BACKLINE, MF_BYCOMMAND | MF_UNCHECKED );
 					}*/
-					if (g_b981AMulti && m_line14FlyID >=0)
+					if (g_b981AMulti && m_line14FlyID >0)
 					{
-						if (m_pHaveDrawCopyLineFlag[13][m_line14FlyID])
+						if (m_pHaveDrawCopyLineFlag[13][m_line14FlyID-1])
 						{
 							menu.CheckMenuItem( ID_SHOW_BACKLINE, MF_BYCOMMAND | MF_CHECKED );
 						}
@@ -4683,8 +4683,8 @@ void CGISDlg::DrawCopyFlyLine(const DrawLineDataStruct lineData)
 
 	//航线索引号
 	int lineID = lineData.lineID-1;
-	//子航线索引号(飞机ID)
+	//子航线索引号
-	int sublineID = lineData.pts[0].nV;
+	int sublineID = lineData.pts[0].nV-1;
 
 	//没有目标标绘SHP图层，创建该图层
 	if (m_subLineLayerID[lineID][sublineID] ==-1)
@@ -5101,18 +5101,6 @@ void CGISDlg::SetFlyLineShowStatus(const int lineID)
 				bMulti = true;
 			}
 		}
-/*
-		if (lineID==14) //清除连线
-		{
-			for (auto it=m_TempLine14LayerID.begin();it!=m_TempLine14LayerID.end();)
-			{
-				if ((*it).second!=-1)
-				{
-					m_map.ClearDrawing((*it).second);
-					m_TempLine14LayerID.erase(it++);
-				}
-			}
-		}*/
 	}
 	//已经标绘，清除航线
 	if (m_pHaveDrawLineFlag[lineIndex])
@@ -5258,23 +5246,20 @@ void CGISDlg::OnShowGivenLine(const CString strLineFileName)
 		}
 
 		m_lineFullPathName[lineDataGroup.lineID] = strLineFileName;
-		if (g_b981AMulti) //多机ID号
+		if (g_b981AMulti && lineDataGroup.pts[0].nV>0) //多机ID号
 		{
 			if (lineDataGroup.lineID==14)
 			{
 				m_line14FlyID = lineDataGroup.pts[0].nV;
 				SetBindLine14Coordinate(lineDataGroup.pts[0].nV,lineDataGroup.pts[0].dX,lineDataGroup.pts[0].dY);
 			}
-			if (lineDataGroup.pts[0].nV > 0 || (lineDataGroup.lineID==14))
-			{
 			//清除标绘的航线
-				ClearDrawedCopyLine(lineDataGroup.lineID-1,lineDataGroup.pts[0].nV);
+			ClearDrawedCopyLine(lineDataGroup.lineID-1,lineDataGroup.pts[0].nV-1);
 
 			//标绘航线
 			DrawCopyFlyLine(lineDataGroup);	
 			return;
 		}
-		}
 
 		int ch = lineDataGroup.linePts[lineDataGroup.pointNum-1].ch1;
 		/***************************测绘区域处理************************************/
@@ -6295,9 +6280,9 @@ void CGISDlg::OnUpdateShowBackLine(CCmdUI *pCmdUI)
 	// TODO: 在此添加命令更新用户界面处理程序代码
 	if (g_b981ADesktop || g_b981APad)
 	{
-		if (g_b981AMulti && (m_line14FlyID>=0)) //多机
+		if (g_b981AMulti && (m_line14FlyID>0)) //多机
 		{
-			pCmdUI->SetCheck(m_pHaveDrawCopyLineFlag[13][m_line14FlyID]); 
+			pCmdUI->SetCheck(m_pHaveDrawCopyLineFlag[13][m_line14FlyID-1]); 
 			return;
 		}
 		pCmdUI->SetCheck(m_pHaveDrawLineFlag[13]);
@@ -8815,7 +8800,26 @@ void CGISDlg::SetBindLine14Coordinate(int uavID,double lon,double lat)
 	m_CoordinateBindLine14[uavID] = pt;
 }
 
-
+//获取地图版本号
+CString CGISDlg::GetMapVersion() 
+{
+	CString str;
+	if (g_b981ADesktop && g_b981AMulti)
+	{
+		mapVersion[2] = "多机单机版在线地图";
+	}else if (g_b981ADesktop && !g_b981AMulti)
+	{
+		mapVersion[2] = "单机版在线地图";
+	}else if (g_b981APad)
+	{
+		mapVersion[2] = "平板版在线地图";
+	}else if (g_b981AMulti)
+	{
+		mapVersion[2] = "多机版在线地图";
+	}
+	str = mapVersion[0] + '\/' + mapVersion[1] + '\/' + mapVersion[2];
+	return str;
+}
 
 
 

GISDlg.h

@@ -66,6 +66,8 @@ public:
 
 	~CGISDlg();
 
+	//获取地图版本号
+	CString GetMapVersion();
 	/*******************新增<编辑航线>功能**************************/
 	map<int,DrawLineDataStruct> m_ShowedLineDataList;  //存储已显示的航线数据
 	DrawLineDataStruct m_editLineDataGroup;  //编辑航线数据

Globe.cpp

@@ -323,4 +323,7 @@ bool    g_bMarkerPlot[g_iMarkerPtNum] = {false};
 bool g_b981ADesktop = true;
 bool g_b981APad = false;
 bool g_b981CDesktop = false;
-bool g_b981AMulti = true;
+bool g_b981AMulti = false;
+
+//地图模块版本号 [主版本.次版本.修订版本，日期，特性]
+CString mapVersion[3] = { "1.0.0","20240920", "单机版在线地图"};

Globe.h

@@ -301,4 +301,6 @@ extern bool g_b981APad;			// 981Aƽ
 extern bool g_b981CDesktop;		// 981C电脑端
 extern bool g_b981AMulti;		// 981A多机
 
+extern CString mapVersion[3];
+
 #endif