补传优化
This commit is contained in:
		
							parent
							
								
									4c230f75f0
								
							
						
					
					
						commit
						2a9b4a4f4d
					
				| @ -27,7 +27,7 @@ | |||||||
| #define JUDGE_VERSION_MAJOR  1 | #define JUDGE_VERSION_MAJOR  1 | ||||||
| #define JUDGE_VERSION_MINOR  0 | #define JUDGE_VERSION_MINOR  0 | ||||||
| #define JUDGE_VERSION_PATCH  3 | #define JUDGE_VERSION_PATCH  3 | ||||||
| #define JUDGE_VERSION_STAMP  "2504281937b" | #define JUDGE_VERSION_STAMP  "2505071805b" | ||||||
| #if JUDGE_USE_OLD | #if JUDGE_USE_OLD | ||||||
| #   undef JUDGE_VERSION_STAMP | #   undef JUDGE_VERSION_STAMP | ||||||
| #   define JUDGE_VERSION_STAMP  "2411121010b.old" | #   define JUDGE_VERSION_STAMP  "2411121010b.old" | ||||||
|  | |||||||
| @ -5036,7 +5036,7 @@ void ExamCarSub3::dealItemNoIDEndItem() | |||||||
|                 { |                 { | ||||||
|                     //ToDo1:生成 全程加减挡 进项目事件
 |                     //ToDo1:生成 全程加减挡 进项目事件
 | ||||||
|                     //createEventEnterItem({item14->ItemNo, ""});
 |                     //createEventEnterItem({item14->ItemNo, ""});
 | ||||||
|                     KM3EndItem(item14->ItemNo); |                     KM3EndItem(item14->ItemNo, true, false); | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|             else |             else | ||||||
| @ -5046,7 +5046,7 @@ void ExamCarSub3::dealItemNoIDEndItem() | |||||||
|                 { |                 { | ||||||
|                     //ToDo1:生成 全程加减挡 进项目事件
 |                     //ToDo1:生成 全程加减挡 进项目事件
 | ||||||
|                     //createEventEnterItem({item14->ItemNo, ""});
 |                     //createEventEnterItem({item14->ItemNo, ""});
 | ||||||
|                     KM3EndItem(item14->ItemNo); |                     KM3EndItem(item14->ItemNo, true, false); | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
| @ -5063,7 +5063,7 @@ void ExamCarSub3::dealItemNoIDEndItem() | |||||||
|                 { |                 { | ||||||
|                     if(item->FinishFlag == false) |                     if(item->FinishFlag == false) | ||||||
|                     { |                     { | ||||||
|                         KM3EndItem(item->ItemNo); |                         KM3EndItem(item->ItemNo, true, false); | ||||||
|                     } |                     } | ||||||
|                 } |                 } | ||||||
|                 else if(item->ItemNo == Sub3ItemType14Jjdw) //加减档单独处理
 |                 else if(item->ItemNo == Sub3ItemType14Jjdw) //加减档单独处理
 | ||||||
| @ -5073,7 +5073,7 @@ void ExamCarSub3::dealItemNoIDEndItem() | |||||||
|                 { |                 { | ||||||
|                     if(item->Item_Color == itemStateWk) //&& item->FinishFlag == false
 |                     if(item->Item_Color == itemStateWk) //&& item->FinishFlag == false
 | ||||||
|                     { |                     { | ||||||
|                         KM3EndItem(item->ItemNo); |                         KM3EndItem(item->ItemNo, true, false); | ||||||
|                     } |                     } | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|  | |||||||
| @ -95,6 +95,8 @@ protected: | |||||||
|     //当前路段是否禁止左右转、直行、掉头
 |     //当前路段是否禁止左右转、直行、掉头
 | ||||||
|     bool forbidInLane(const std::string& laneDir, TURN_TYPE d); |     bool forbidInLane(const std::string& laneDir, TURN_TYPE d); | ||||||
| 
 | 
 | ||||||
|  |     bool judgeAllowable() { return true; /*(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) ? false : true; */ } | ||||||
|  | 
 | ||||||
|     //显示状态信息
 |     //显示状态信息
 | ||||||
|     void showStatus(const std::string& msg); |     void showStatus(const std::string& msg); | ||||||
| protected: | protected: | ||||||
|  | |||||||
| @ -101,7 +101,7 @@ void Sub3Judge01Sczb::dealJudgeItem() | |||||||
|     HELP_COST_TIME(""); |     HELP_COST_TIME(""); | ||||||
|     if(m_exam->TestPro != ItemProFlagJudge) return; |     if(m_exam->TestPro != ItemProFlagJudge) return; | ||||||
|     //超声波评判跟差分信号没有关系,所以不做差分信号状态的判断
 |     //超声波评判跟差分信号没有关系,所以不做差分信号状态的判断
 | ||||||
|     //if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return;
 |     //if(!judgeAllowable()) return;
 | ||||||
| 
 | 
 | ||||||
|     const std::string& s386 = TableSysSet->get386(); |     const std::string& s386 = TableSysSet->get386(); | ||||||
|     //if(s386 == "3") //无锡地区模式只要发动机启动了,点切换就上车准备自动完成播报模拟灯光
 |     //if(s386 == "3") //无锡地区模式只要发动机启动了,点切换就上车准备自动完成播报模拟灯光
 | ||||||
|  | |||||||
| @ -63,7 +63,7 @@ void Sub3Judge02Qbxx::dealJudgeItem() | |||||||
| 
 | 
 | ||||||
|     HELP_COST_TIME(""); |     HELP_COST_TIME(""); | ||||||
|     if(m_exam->TestPro != ItemProFlagJudge) return; |     if(m_exam->TestPro != ItemProFlagJudge) return; | ||||||
|     if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return; |     if(!judgeAllowable()) return; | ||||||
| 
 | 
 | ||||||
|     const TChuanGan* cg = m_car->historyChuanGan(); |     const TChuanGan* cg = m_car->historyChuanGan(); | ||||||
|     const TSensorInfo& sor = cg->real.sensor; |     const TSensorInfo& sor = cg->real.sensor; | ||||||
|  | |||||||
| @ -105,7 +105,7 @@ void Sub3Judge03Zxxs::dealJudgeItem() | |||||||
| { | { | ||||||
|     HELP_COST_TIME(""); |     HELP_COST_TIME(""); | ||||||
|     if(m_exam->TestPro != ItemProFlagJudge) return; |     if(m_exam->TestPro != ItemProFlagJudge) return; | ||||||
|     if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return; |     if(!judgeAllowable()) return; | ||||||
| 
 | 
 | ||||||
|     const TChuanGan* cg = m_car->historyChuanGan(); |     const TChuanGan* cg = m_car->historyChuanGan(); | ||||||
|     const TRTKResult& RTKKM3 = cg->RTKKM3; |     const TRTKResult& RTKKM3 = cg->RTKKM3; | ||||||
|  | |||||||
| @ -56,7 +56,7 @@ void Sub3Judge04Bgcd::dealJudgeItem() | |||||||
| { | { | ||||||
|     HELP_COST_TIME(""); |     HELP_COST_TIME(""); | ||||||
|     if(m_exam->TestPro != ItemProFlagJudge) return; |     if(m_exam->TestPro != ItemProFlagJudge) return; | ||||||
|     if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return; |     if(!judgeAllowable()) return; | ||||||
| 
 | 
 | ||||||
|     const TChuanGan* cg = m_car->historyChuanGan(); |     const TChuanGan* cg = m_car->historyChuanGan(); | ||||||
|     const TRTKResult& RTKKM3 = cg->RTKKM3; |     const TRTKResult& RTKKM3 = cg->RTKKM3; | ||||||
|  | |||||||
| @ -78,7 +78,7 @@ void Sub3Judge05Lkzx::dealJudgeItem() | |||||||
| { | { | ||||||
|     HELP_COST_TIME(""); |     HELP_COST_TIME(""); | ||||||
|     if(m_exam->TestPro != ItemProFlagJudge) return; |     if(m_exam->TestPro != ItemProFlagJudge) return; | ||||||
|     if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return; |     if(!judgeAllowable()) return; | ||||||
| 
 | 
 | ||||||
|     //setup1: 路口类型 1-平交 2-环道 3-三叉   缺省 1-平交
 |     //setup1: 路口类型 1-平交 2-环道 3-三叉   缺省 1-平交
 | ||||||
|     //setup2: 限速值,通过路口停车线时的车速  缺省 35
 |     //setup2: 限速值,通过路口停车线时的车速  缺省 35
 | ||||||
|  | |||||||
| @ -110,7 +110,7 @@ void Sub3Judge06Rxhd::dealJudgeItem() | |||||||
| { | { | ||||||
|     HELP_COST_TIME(""); |     HELP_COST_TIME(""); | ||||||
|     if(m_exam->TestPro != ItemProFlagJudge) return; |     if(m_exam->TestPro != ItemProFlagJudge) return; | ||||||
|     if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return; |     if(!judgeAllowable()) return; | ||||||
| 
 | 
 | ||||||
|     const TChuanGan* cg = m_car->historyChuanGan(); |     const TChuanGan* cg = m_car->historyChuanGan(); | ||||||
|     const TSensorInfo& sor = cg->real.sensor; |     const TSensorInfo& sor = cg->real.sensor; | ||||||
|  | |||||||
| @ -82,7 +82,7 @@ void Sub3Judge07Xxqy::dealJudgeItem() | |||||||
| { | { | ||||||
|     HELP_COST_TIME(""); |     HELP_COST_TIME(""); | ||||||
|     if(m_exam->TestPro != ItemProFlagJudge) return; |     if(m_exam->TestPro != ItemProFlagJudge) return; | ||||||
|     if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return; |     if(!judgeAllowable()) return; | ||||||
| 
 | 
 | ||||||
|     const TChuanGan* cg = m_car->historyChuanGan(); |     const TChuanGan* cg = m_car->historyChuanGan(); | ||||||
|     const TSensorInfo& sor = cg->real.sensor; |     const TSensorInfo& sor = cg->real.sensor; | ||||||
|  | |||||||
| @ -93,7 +93,7 @@ void Sub3Judge08Gjzt::dealJudgeItem() | |||||||
| { | { | ||||||
|     HELP_COST_TIME(""); |     HELP_COST_TIME(""); | ||||||
|     if(m_exam->TestPro != ItemProFlagJudge) return; |     if(m_exam->TestPro != ItemProFlagJudge) return; | ||||||
|     if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return; |     if(!judgeAllowable()) return; | ||||||
| 
 | 
 | ||||||
|     const TChuanGan* cg = m_car->historyChuanGan(); |     const TChuanGan* cg = m_car->historyChuanGan(); | ||||||
|     const TRTKResult& RTKKM3 = cg->RTKKM3; |     const TRTKResult& RTKKM3 = cg->RTKKM3; | ||||||
|  | |||||||
| @ -63,7 +63,7 @@ void Sub3Judge09Hcxx::dealJudgeItem() | |||||||
| { | { | ||||||
|     HELP_COST_TIME(""); |     HELP_COST_TIME(""); | ||||||
|     if(m_exam->TestPro != ItemProFlagJudge) return; |     if(m_exam->TestPro != ItemProFlagJudge) return; | ||||||
|     if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return; |     if(!judgeAllowable()) return; | ||||||
| 
 | 
 | ||||||
|     const TChuanGan* cg = m_car->historyChuanGan(); |     const TChuanGan* cg = m_car->historyChuanGan(); | ||||||
|     const TRTKResult& RTKKM3 = cg->RTKKM3; |     const TRTKResult& RTKKM3 = cg->RTKKM3; | ||||||
|  | |||||||
| @ -144,7 +144,7 @@ void Sub3Judge10Ccxx::dealJudgeItem() | |||||||
| { | { | ||||||
|     HELP_COST_TIME(""); |     HELP_COST_TIME(""); | ||||||
|     if(m_exam->TestPro != ItemProFlagJudge) return; |     if(m_exam->TestPro != ItemProFlagJudge) return; | ||||||
|     if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return; |     if(!judgeAllowable()) return; | ||||||
| 
 | 
 | ||||||
|     const TChuanGan* cg = m_car->historyChuanGan(); |     const TChuanGan* cg = m_car->historyChuanGan(); | ||||||
|     const TRTKResult& RTKKM3 = cg->RTKKM3; |     const TRTKResult& RTKKM3 = cg->RTKKM3; | ||||||
|  | |||||||
| @ -141,7 +141,7 @@ void Sub3Judge11Kbtc::dealJudgeItem() | |||||||
| { | { | ||||||
|     HELP_COST_TIME(""); |     HELP_COST_TIME(""); | ||||||
|     if(m_exam->TestPro != ItemProFlagJudge) return; |     if(m_exam->TestPro != ItemProFlagJudge) return; | ||||||
|     //if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return;
 |     //if(!judgeAllowable()) return;
 | ||||||
| 
 | 
 | ||||||
|     const TChuanGan* cg = m_car->historyChuanGan(); |     const TChuanGan* cg = m_car->historyChuanGan(); | ||||||
|     const TSensorInfo& sor = cg->real.sensor; |     const TSensorInfo& sor = cg->real.sensor; | ||||||
|  | |||||||
| @ -59,7 +59,7 @@ void Sub3Judge12Lkdt::dealJudgeItem() | |||||||
| { | { | ||||||
|     HELP_COST_TIME(""); |     HELP_COST_TIME(""); | ||||||
|     if(m_exam->TestPro != ItemProFlagJudge) return; |     if(m_exam->TestPro != ItemProFlagJudge) return; | ||||||
|     if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return; |     if(!judgeAllowable()) return; | ||||||
| 
 | 
 | ||||||
|     //setup1: 路口类型 1-平交 2-环道 3-三叉   缺省 1-平交
 |     //setup1: 路口类型 1-平交 2-环道 3-三叉   缺省 1-平交
 | ||||||
|     //setup2: 限速值,通过路口停车线时的车速  缺省 35
 |     //setup2: 限速值,通过路口停车线时的车速  缺省 35
 | ||||||
|  | |||||||
| @ -48,7 +48,7 @@ void Sub3Judge12Ptdt::dealJudgeItem() | |||||||
| { | { | ||||||
|     HELP_COST_TIME(""); |     HELP_COST_TIME(""); | ||||||
|     if(m_exam->TestPro != ItemProFlagJudge) return; |     if(m_exam->TestPro != ItemProFlagJudge) return; | ||||||
|     if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return; |     if(!judgeAllowable()) return; | ||||||
| 
 | 
 | ||||||
|     const TChuanGan* cg = m_car->historyChuanGan(); |     const TChuanGan* cg = m_car->historyChuanGan(); | ||||||
|     const TRTKResult& RTKKM3 = cg->RTKKM3; |     const TRTKResult& RTKKM3 = cg->RTKKM3; | ||||||
|  | |||||||
| @ -31,7 +31,7 @@ void Sub3Judge14Jjdw::dealJudgeItem() | |||||||
| { | { | ||||||
|     HELP_COST_TIME(""); |     HELP_COST_TIME(""); | ||||||
|     if(m_exam->TestPro != ItemProFlagJudge) return; |     if(m_exam->TestPro != ItemProFlagJudge) return; | ||||||
|     if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return; |     if(!judgeAllowable()) return; | ||||||
| 
 | 
 | ||||||
|     std::string Str425; |     std::string Str425; | ||||||
|     std::string TempLog; |     std::string TempLog; | ||||||
|  | |||||||
| @ -73,7 +73,7 @@ void Sub3Judge15Lkzz::dealJudgeItem() | |||||||
| { | { | ||||||
|     HELP_COST_TIME(""); |     HELP_COST_TIME(""); | ||||||
|     if(m_exam->TestPro != ItemProFlagJudge) return; |     if(m_exam->TestPro != ItemProFlagJudge) return; | ||||||
|     if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return; |     if(!judgeAllowable()) return; | ||||||
| 
 | 
 | ||||||
|     //setup1: 路口类型 1-平交 2-环道 3-三叉   缺省 1-平交
 |     //setup1: 路口类型 1-平交 2-环道 3-三叉   缺省 1-平交
 | ||||||
|     //setup2: 限速值,通过路口停车线时的车速  缺省 35
 |     //setup2: 限速值,通过路口停车线时的车速  缺省 35
 | ||||||
|  | |||||||
| @ -73,7 +73,7 @@ void Sub3Judge16Lkyz::dealJudgeItem() | |||||||
| { | { | ||||||
|     HELP_COST_TIME(""); |     HELP_COST_TIME(""); | ||||||
|     if(m_exam->TestPro != ItemProFlagJudge) return; |     if(m_exam->TestPro != ItemProFlagJudge) return; | ||||||
|     if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return; |     if(!judgeAllowable()) return; | ||||||
| 
 | 
 | ||||||
|     //setup1: 路口类型 1-平交 2-环道 3-三叉   缺省 1-平交
 |     //setup1: 路口类型 1-平交 2-环道 3-三叉   缺省 1-平交
 | ||||||
|     //setup2: 限速值,通过路口停车线时的车速  缺省 35
 |     //setup2: 限速值,通过路口停车线时的车速  缺省 35
 | ||||||
|  | |||||||
| @ -52,6 +52,61 @@ struct Index { | |||||||
|       confirm: () => { |       confirm: () => { | ||||||
|       } |       } | ||||||
|     }), |     }), | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  |      | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|     customStyle: true, |     customStyle: true, | ||||||
|     alignment: DialogAlignment.Center, |     alignment: DialogAlignment.Center, | ||||||
|   }) |   }) | ||||||
| @ -60,7 +115,7 @@ struct Index { | |||||||
|   private context = getContext(this) as common.UIAbilityContext; |   private context = getContext(this) as common.UIAbilityContext; | ||||||
|   private serviceExtProxy: IdlServiceExtProxy |   private serviceExtProxy: IdlServiceExtProxy | ||||||
|   @State judgeVersion: string = "" |   @State judgeVersion: string = "" | ||||||
|   private version: string = "2025.05.06.01" |   private version: string = "2025.05.08.01" | ||||||
| 
 | 
 | ||||||
|   @Styles |   @Styles | ||||||
|   commStyle(){ |   commStyle(){ | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user