Browse Source

优化完触摸,明天测试一下

张洋 1 month ago
parent
commit
8228b74afb
28 changed files with 24 additions and 435 deletions
  1. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/DuiLib_d.dll
  2. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/aixuexi_page.xml
  3. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_page.xml
  4. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_page.xml
  5. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/yubaozhuangbiaoqian_page.xml
  6. 2 2
      bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcan_diandan_page.xml
  7. BIN
      bin/Win32/Release/zhipuzi_pos_windows/DuiLib.dll
  8. BIN
      bin/Win32/Release/zhipuzi_pos_windows/zhipuzi_pos_windows.exe
  9. BIN
      dll/debug/DuiLib_d.dll
  10. BIN
      dll/release/DuiLib.dll
  11. BIN
      lib/debug/DuiLib_d.lib
  12. BIN
      lib/release/DuiLib.lib
  13. BIN
      pdb/release/DuiLib.pdb
  14. 3 3
      zhipuzi_pos_windows/page/CAIxuexiPageUI.cpp
  15. 4 4
      zhipuzi_pos_windows/page/CDiandanPageUI.cpp
  16. 2 2
      zhipuzi_pos_windows/page/CYubaozhuangbiaoqianPageUI.cpp
  17. 3 3
      zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.cpp
  18. BIN
      zhipuzi_pos_windows/resource/skin.zip
  19. BIN
      zhipuzi_pos_windows/resource/skin.zip.bak
  20. BIN
      zhipuzi_pos_windows/resource/skin.zip.before_r76d
  21. 1 2
      zhipuzi_pos_windows/ui/CModalWnd.h
  22. 0 313
      zhipuzi_pos_windows/ui/CTouchWindowBase.cpp
  23. 0 85
      zhipuzi_pos_windows/ui/CTouchWindowBase.h
  24. 2 11
      zhipuzi_pos_windows/wnd/CMainWnd.cpp
  25. 1 2
      zhipuzi_pos_windows/wnd/CMainWnd.h
  26. 1 1
      zhipuzi_pos_windows/wnd/CShangpinCreateWnd.cpp
  27. 1 1
      zhipuzi_pos_windows/wnd/CShangpinUpdateWnd.cpp
  28. 0 2
      zhipuzi_pos_windows/zhipuzi_pos_windows.vcxproj

BIN
bin/Win32/Debug/zhipuzi_pos_windows/DuiLib_d.dll


+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/aixuexi_page.xml

@@ -49,7 +49,7 @@
 
 				<Control width="1" bkcolor="#FFEBE8E8"></Control>
 				
-				<VerticalLayout name="aixuexi_page_food_layout" bkcolor="#FFF5F7FA" inset="12,12,12,12" childpadding="12">
+				<VerticalLayout name="aixuexi_page_food_layout" bkcolor="#FFF5F7FA" inset="12,12,0,12" childpadding="12">
 					<VerticalLayout name="aixuexi_page_fenlei_layout_scrolllayout" vscrollbar="true">
 						<!-- 分类栏:与点单页 diandan_fenlei_layout 同构(Container;子项 float=true,由 C++ SetFixedXY 定位) -->
 						<Container name="aixuexi_page_fenlei_layout">

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_page.xml

@@ -3,7 +3,7 @@
 
 
 	<DiandanPage>
-		<HorizontalLayout bkcolor="#FFF5F7FA" inset="12,12,12,12" childpadding="12">
+		<HorizontalLayout bkcolor="#FFF5F7FA" inset="12,12,0,12" childpadding="12">
 
 			<!-- ============ 左:购物车 390(白卡 radius 10,内容区 380 保持原样) ============ -->
 			<VerticalLayout width="390" bkcolor="#00000000" childpadding="12">

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_page.xml

@@ -43,7 +43,7 @@
 			<Control width="1" bkcolor="#FFEBE8E8"></Control>
 
 			<!-- ============ 右:分类 + 商品网格 + 搜索(规格与点单页完全一致) ============ -->
-			<VerticalLayout name="shangpin_food_layout" inset="12,12,12,12" childpadding="12">
+			<VerticalLayout name="shangpin_food_layout" inset="12,12,0,12" childpadding="12">
 				<VerticalLayout name="shangpin_fenlei_layout_scrolllayout" vscrollbar="true">
 					<Container name="shangpin_fenlei_layout">
 					</Container>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/yubaozhuangbiaoqian_page.xml

@@ -2,7 +2,7 @@
 <Window>
 
 	<YubaozhuangbiaoqianPage>
-		<HorizontalLayout bkcolor="#FFF5F7FA" inset="12,12,12,12" childpadding="12">
+		<HorizontalLayout bkcolor="#FFF5F7FA" inset="12,12,0,12" childpadding="12">
 
 			<!-- 左:称重卡(390) + 提示区 -->
 			<VerticalLayout width="390" bkcolor="#00000000" childpadding="12">

+ 2 - 2
bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcan_diandan_page.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Window>
 
 
@@ -14,7 +14,7 @@
 
 			<Control height="1" bkcolor="#FFF0F1F3"></Control>
 
-			<HorizontalLayout bkcolor="#FFF5F7FA" inset="12,12,12,12" childpadding="12">
+			<HorizontalLayout bkcolor="#FFF5F7FA" inset="12,12,0,12" childpadding="12">
 
 			<!-- ============ 左:购物车 390(白卡 radius 10,内容区 380 保持原样) ============ -->
 			<VerticalLayout width="390" bkcolor="#00000000" childpadding="12">

BIN
bin/Win32/Release/zhipuzi_pos_windows/DuiLib.dll


BIN
bin/Win32/Release/zhipuzi_pos_windows/zhipuzi_pos_windows.exe


BIN
dll/debug/DuiLib_d.dll


BIN
dll/release/DuiLib.dll


BIN
lib/debug/DuiLib_d.lib


BIN
lib/release/DuiLib.lib


BIN
pdb/release/DuiLib.pdb


+ 3 - 3
zhipuzi_pos_windows/page/CAIxuexiPageUI.cpp

@@ -197,10 +197,10 @@ void CAIxuexiPageUI::UpdateFoodtypePos()
 	}
 
 	//根据宽度计算每行显示的数量
-	//右栏宽 = 页宽 - 左栏 420 - 两条 1px 竖线 = nWidth - 422;右栏容器 inset 12*2 →
-	//分类区可用宽 = nWidth - 446。每个胶囊占 138(胶囊 130 + 间距 8),
+	//右栏宽 = 页宽 - 左栏 420 - 两条 1px 竖线 = nWidth - 422;右栏容器 inset 左12(右已为 0)→
+	//分类区可用宽 = nWidth - 434。每个胶囊占 138(胶囊 130 + 间距 8),
 	//几何完全对齐点单页 CDiandanPageUI::UpdateFoodtypePos(列距 138 / 行距 46 / 首行 +8)。
-	int nMeihangNum = (nWidth - 446) / 138;
+	int nMeihangNum = (nWidth - 434) / 138;
 
 	int num = 0;
 

+ 4 - 4
zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -238,9 +238,9 @@ void CDiandanPageUI::UpdateFoodtypePos()
 	}
 
 	//根据宽度计算每行显示的数量
-	//新布局:分类区可用宽 = 页宽 - inset 24 - 购物车 390 - 间距 12 - 操作条 56
+	//新布局:分类区可用宽 = 页宽 - inset 12(右已为0) - 购物车 390 - 间距 12 - 操作条 56
 	//每个胶囊占 138(胶囊 130 + 间距 8);首列从 x=0 起,与下方商品网格左边对齐
-	int nMeihangNum = (nWidth - 482) / 138;
+	int nMeihangNum = (nWidth - 470) / 138;
 
 	int num = 0;
 
@@ -693,11 +693,11 @@ void CDiandanPageUI::UpdateJiesuanZhifuPos()
 	int nZhangdanWidth;
 	if (m_is_yincangyouhui == true)
 	{
-		nZhangdanWidth = nWidth - 481 - 13;				// 隐藏优惠后只剩账单卡;13=右侧 inset12 + 余量1
+		nZhangdanWidth = nWidth - 481 - 1;				// 隐藏优惠后只剩账单卡;1=余量1(根 inset 右已为 0)
 	}
 	else
 	{
-		nZhangdanWidth = nWidth - 481 - 330 - 12 - 13;	// 优惠卡330 + 卡间距12;13=右侧 inset12 + 余量1
+		nZhangdanWidth = nWidth - 481 - 330 - 12 - 1;	// 优惠卡330 + 卡间距12;1=余量1(根 inset 右已为 0)
 	}
 
 	if (nZhangdanWidth < 300)

+ 2 - 2
zhipuzi_pos_windows/page/CYubaozhuangbiaoqianPageUI.cpp

@@ -209,9 +209,9 @@ void CYubaozhuangbiaoqianPageUI::UpdateFoodtypePos()
 	}
 
 	//根据宽度计算每行显示的数量
-	//与点单页保持一致:分类区可用宽 = 页宽 - 左侧 inset12 - 购物车390 - 间距12 - 右侧 inset12 = 页宽-414
+	//与点单页保持一致:分类区可用宽 = 页宽 - 左侧 inset12 - 购物车390 - 间距12(根 inset 右已为 0)= 页宽-402
 	//每个胶囊 130 宽 + 8 间距;首列从 x=0 起,与下方商品网格左边对齐
-	int nMeihangNum = (nWidth - 414) / 138;
+	int nMeihangNum = (nWidth - 402) / 138;
 
 	int num = 0;
 

+ 3 - 3
zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.cpp

@@ -323,7 +323,7 @@ void CZhengcanDiandanPageUI::UpdateFoodtypePos()
 	}
 
 	//根据宽度计算每行显示的数量
-	int nMeihangNum = (nWidth - 482) / 138;
+	int nMeihangNum = (nWidth - 470) / 138;
 
 	int num = 0;
 
@@ -729,11 +729,11 @@ void CZhengcanDiandanPageUI::UpdateJiesuanZhifuPos()
 	int nZhangdanWidth;
 	if (m_is_yincangyouhui == true)
 	{
-		nZhangdanWidth = nWidth - 481 - 13;				// 隐藏优惠后只剩账单卡;13=右侧 inset12 + 余量1
+		nZhangdanWidth = nWidth - 481 - 1;				// 隐藏优惠后只剩账单卡;1=余量1(根 inset 右已为 0)
 	}
 	else
 	{
-		nZhangdanWidth = nWidth - 481 - 330 - 12 - 13;	// 优惠卡330 + 卡间距12;13=右侧 inset12 + 余量1
+		nZhangdanWidth = nWidth - 481 - 330 - 12 - 1;	// 优惠卡330 + 卡间距12;1=余量1(根 inset 右已为 0)
 	}
 
 	if (nZhangdanWidth < 300)

BIN
zhipuzi_pos_windows/resource/skin.zip


BIN
zhipuzi_pos_windows/resource/skin.zip.bak


BIN
zhipuzi_pos_windows/resource/skin.zip.before_r76d


+ 1 - 2
zhipuzi_pos_windows/ui/CModalWnd.h

@@ -1,9 +1,8 @@
 #pragma once
 
-#include "CTouchWindowBase.h"
 
 //这个是所有模态对话框的基类
-class CModalWnd : public CTouchWindowBase, public INotifyUI, public IMessageFilterUI
+class CModalWnd : public DuiLib::CWindowWnd, public INotifyUI, public IMessageFilterUI
 {
 public:
 	CModalWnd();

+ 0 - 313
zhipuzi_pos_windows/ui/CTouchWindowBase.cpp

@@ -1,313 +0,0 @@
-#include "pch.h"
-#include "CTouchWindowBase.h"
-
-#ifndef TOUCH_COORD_TO_PIXEL
-// TOUCH 输入单位是 1/100 英寸,通常使用这个宏转换为像素
-#define TOUCH_COORD_TO_PIXEL(l) ((l) / 100)
-#endif
-
-CTouchWindowBase::CTouchWindowBase()
-{
-}
-
-CTouchWindowBase::~CTouchWindowBase()
-{
-	StopInertia();
-}
-
-std::int64_t CTouchWindowBase::NowMs() const
-{
-	using namespace std::chrono;
-	return duration_cast<milliseconds>(steady_clock::now().time_since_epoch()).count();
-}
-
-void CTouchWindowBase::AddTouchSample(LONG y)
-{
-	std::int64_t t = NowMs();
-	m_samples.push_back({ t, y });
-
-	// 保留时间窗口或最大条目数
-	while (!m_samples.empty() && (t - m_samples.front().tms) > SAMPLE_WINDOW_MS)
-		m_samples.pop_front();
-
-	while ((int)m_samples.size() > MAX_SAMPLE_COUNT)
-		m_samples.pop_front();
-}
-
-void CTouchWindowBase::SynthesizeTap(HWND target, POINT pt)
-{
-	if (!target || !::IsWindow(target))
-		return;
-	LPARAM lParamPos = MAKELPARAM(pt.x, pt.y);
-	// 模拟一次完整的“轻触点击”。注意:这两条消息由 PostMessage 发出,ExtraInfo=0,
-	// 不带 MOUSEEVENTF_FROMTOUCH,因此会被 DuiLib 当作真实鼠标点击正常处理。
-	::PostMessage(target, WM_LBUTTONDOWN, MK_LBUTTON, lParamPos);
-	::PostMessage(target, WM_LBUTTONUP, 0, lParamPos);
-}
-
-void CTouchWindowBase::ScheduleHoverClear()
-{
-	// 见下方 WM_TIMER(HOVER_CLEAR_TIMER_ID)说明。ExtraInfo=0 的鼠标消息不会被
-	// MessageHandler 入口的 FROMTOUCH 过滤器吞掉,能正常进入 DuiLib 的悬停清理逻辑。
-	::SetTimer(m_hWnd, HOVER_CLEAR_TIMER_ID, HOVER_CLEAR_DELAY_MS, NULL);
-}
-
-void CTouchWindowBase::StartInertia(float velocityPxPerMs)
-{
-	if (m_inertiaActive)
-		StopInertia();
-
-	m_inertiaVelocityPxPerMs = velocityPxPerMs;
-	if (std::abs(m_inertiaVelocityPxPerMs) < MIN_INERTIA_VELOCITY)
-	{
-		// 速度太小,不启动惯性
-		m_inertiaActive = false;
-		return;
-	}
-
-	m_lastInertiaTms = NowMs();
-	m_inertiaTimerId = ::SetTimer(m_hWnd, INERTIA_TIMER_ID, INERTIA_TIMER_INTERVAL_MS, NULL);
-	m_inertiaActive = (m_inertiaTimerId != 0);
-}
-
-void CTouchWindowBase::StopInertia()
-{
-	if (m_inertiaActive && m_inertiaTimerId)
-	{
-		::KillTimer(m_hWnd, m_inertiaTimerId);
-		m_inertiaTimerId = 0;
-	}
-	m_inertiaActive = false;
-	m_inertiaVelocityPxPerMs = 0.0f;
-}
-
-LRESULT CTouchWindowBase::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	// [触屏注册·作用域] 只有“主窗口”注册 WM_TOUCH——在 CMainWnd::OnCreate 里
-	// ::RegisterTouchWindow(m_hWnd, 0) 完成。本基类【不再】为派生弹框统一注册,原因:
-	//   弹框一旦注册,就会改走下面的 WM_TOUCH 自合成点击逻辑;而自合成点击(PostMessage
-	//   模拟 down+up)在模态弹框里实测会丢失——触屏点按钮/输入框毫无反应,鼠标点击却正常。
-	//   该问题只在弹框出现,主窗口自合成一切正常,根因属于“弹框消息路由/捕获/坐标”的运行时
-	//   细节,需真机调试才能定位,详见 2026-09-17 工作记录。
-	//   未注册的弹框走 Windows 默认“触摸→鼠标”模拟,产生的是【不带 FROMTOUCH 标记】的鼠标消息;
-	//   而 CPaintManagerUI::MessageHandler 入口的过滤器只吞掉带 FROMTOUCH 的模拟消息,因此这些消息
-	//   能正常进入 DuiLib,由标准鼠标流程完成点击与(滚轮式)滚动。
-	//   ⇒ 弹框保持“不注册”即恢复触屏点击;主窗口的惯性滚动 / 防误触逻辑完全不受影响。
-
-	switch (uMsg)
-	{
-		case WM_CREATE:
-			// 历史遗留:注册逻辑已上移到主窗口 OnCreate,弹框不复用,此处留空。
-			break;
-
-		case WM_TOUCH:
-		{
-			UINT cInputs = LOWORD(wParam);
-			std::vector<TOUCHINPUT> inputs(cInputs);
-			if (GetTouchInputInfo((HTOUCHINPUT)lParam, cInputs, inputs.data(), sizeof(TOUCHINPUT)))
-			{
-				for (UINT i = 0; i < cInputs; ++i)
-				{
-					TOUCHINPUT& ti = inputs[i];
-					POINT pt;
-					pt.x = TOUCH_COORD_TO_PIXEL(ti.x);
-					pt.y = TOUCH_COORD_TO_PIXEL(ti.y);
-
-					// 把屏幕坐标转换为目标 paint 窗口客户区坐标
-					HWND target = m_hWndPaint ? m_hWndPaint : m_hWnd;
-					ScreenToClient(target, &pt);
-
-					// 触摸按下
-					if (ti.dwFlags & TOUCHEVENTF_DOWN)
-					{
-						// 停止可能正在进行的惯性
-						StopInertia();
-
-						m_touchDown = true;
-						m_lastX = pt.x;
-						m_lastY = pt.y;
-						m_accumWheel = 0;
-						m_samples.clear();
-						AddTouchSample(pt.y);
-
-						// 轻触/滑动判定初始化
-						m_touchStartPt = pt;
-						m_touchStartTime = NowMs();
-						m_bTouchMoved = false;
-						m_moveDistSq = 0;
-
-						// 保存最后触摸点(用于惯性期间发送位置)
-						m_lastTouchPt = pt;
-
-						//::PostMessage(target, WM_LBUTTONDOWN, MK_LBUTTON, MAKELPARAM(pt.x, pt.y));
-						::SetCapture(target);
-					}
-					// 触摸移动
-					else if (ti.dwFlags & TOUCHEVENTF_MOVE)
-					{
-						if (m_touchDown)
-						{
-							LONG dx = pt.x - m_lastX;
-							LONG dy = pt.y - m_lastY; // 按手机习惯:手指上滑(坐标减小) -> 负增量
-							m_lastX = pt.x;
-							m_lastY = pt.y;
-
-							// 累计移动距离平方,用于“轻触 vs 滑动”判定
-							m_moveDistSq += (std::int64_t)dx * dx + (std::int64_t)dy * dy;
-							if (m_moveDistSq > (std::int64_t)TAP_MOVE_THRESHOLD * TAP_MOVE_THRESHOLD)
-								m_bTouchMoved = true;
-
-							AddTouchSample(pt.y);
-
-							int wheelUnits = static_cast<int>(dy * PIXEL_TO_WHEEL);
-							m_accumWheel += wheelUnits;
-
-							// 更新最后触摸点(用于惯性期间发送位置)
-							m_lastTouchPt = pt;
-
-							// 每当累积达到 WHEEL_DELTA 就发送一次 WM_MOUSEWHEEL
-							while (abs(m_accumWheel) >= WHEEL_DELTA)
-							{
-								int sendDelta = (m_accumWheel > 0) ? WHEEL_DELTA : -WHEEL_DELTA;
-								m_accumWheel -= sendDelta;
-
-								WPARAM wParamWheel = (WPARAM)(((DWORD)sendDelta) << 16);
-								LPARAM lParamPos = MAKELPARAM(pt.x, pt.y);
-								::PostMessage(target, WM_MOUSEWHEEL, wParamWheel, lParamPos);
-							}
-
-							// 注意:触摸滚动时不再发送 WM_MOUSEMOVE。原因:
-							//   滚动期间若发 WM_MOUSEMOVE,DuiLib 会给手指扫过的每个 item 置上悬浮态(UISTATE_HOT),
-							//   且触摸抬起后没有 WM_MOUSELEAVE 来清除,导致“多个 item 同时悬浮、且悬停态卡死不消失”。
-							//   滚动本身就由上面的 WM_MOUSEWHEEL 完成,不需要鼠标移动消息;真实鼠标的悬停仍由 DuiLib 正常处理。
-						}
-					}
-					// 触摸抬起
-					else if (ti.dwFlags & TOUCHEVENTF_UP)
-					{
-						if (m_touchDown)
-						{
-							// 计算速度(px/ms)
-							float velocityPxPerMs = 0.0f;
-							if (m_samples.size() >= 2)
-							{
-								TouchSample first = m_samples.front();
-								TouchSample last = m_samples.back();
-								std::int64_t dt = last.tms - first.tms;
-								if (dt > 0)
-								{
-									// 与 MOVE 中 dy 方向保持一致:last - first
-									velocityPxPerMs = static_cast<float>(last.y - first.y) / static_cast<float>(dt);
-								}
-							}
-
-							m_touchDown = false;
-							// 保存最后触摸点(确保惯性期间有位置可用)
-							m_lastTouchPt = pt;
-							m_lastX = 0;
-							m_lastY = 0;
-							m_accumWheel = 0;
-							m_samples.clear();
-
-							//::PostMessage(target, WM_LBUTTONUP, 0, MAKELPARAM(pt.x, pt.y));
-							::ReleaseCapture();
-
-							// 关键修复(误触):本次触摸没有发生“滑动”才视为“轻触点击”,
-							// 模拟一次 down+up,让 DuiLib 正常触发 click(如点商品加入购物车)。
-							// 若发生过滑动,则只滚动、绝不触发点击,从而彻底避免误触。
-							if (!m_bTouchMoved)
-							{
-								SynthesizeTap(target, m_touchStartPt);
-							}
-
-							// 启动惯性滚动(如果速度足够大)
-							StartInertia(velocityPxPerMs);
-
-							// 关键修复(悬浮态卡死):触屏轻触/滑动时,操作系统会先发一条
-							// “将光标移动到触点”的 WM_MOUSEMOVE(不带 FROMTOUCH 标记),它绕过了
-							// MessageHandler 入口的过滤器,于是 DuiLib 会把该控件置为 UISTATE_HOT
-							// (悬浮态);而 DuiLib 只在 WM_MOUSEMOVE 指到“别的控件/窗口外”时才
-							// 发 MOUSELEAVE 清除悬浮态。触屏没有后续“移动光标离开”的动作,于是
-							// 悬浮态永远清不掉 → 按钮/列表项卡在悬浮态不恢复。
-							// 真实鼠标靠“物理移开”触发 MOUSELEAVE;这里用定时器在手势结束后补一次
-							// WM_MOUSEMOVE(-1)(即“光标移到窗口外”),模拟鼠标移开,强制清除悬浮态。
-							// 用定时器延后约 50ms,确保本次手势可能产生的 OS 尾随消息都已处理完,
-							// 避免“我们刚清掉又被 OS 尾随的 move 重新置上”的竞态。
-							ScheduleHoverClear();
-						}
-					}
-				}
-				CloseTouchInputHandle((HTOUCHINPUT)lParam);
-			}
-			else
-			{
-				// 可添加日志:GetTouchInputInfo 失败
-			}
-			return 0; // 已处理
-		}
-
-		case WM_TIMER:
-		{
-			if (wParam == HOVER_CLEAR_TIMER_ID)
-			{
-				// 模拟“鼠标移开窗口”:给 paint 窗口发一条 WM_MOUSEMOVE,lParam=-1 表示
-				// 坐标为 (-1,-1),FindControl 必然返回 NULL;DuiLib 在 WM_MOUSEMOVE 里对旧
-				// 悬停控件触发 UIEVENT_MOUSELEAVE,从而清除 UISTATE_HOT 悬浮态。
-				// 这样触屏轻触/滑动结束后,按钮/列表项不会卡在悬浮态。
-				HWND target = m_hWndPaint ? m_hWndPaint : m_hWnd;
-				if (target && ::IsWindow(target))
-					::PostMessage(target, WM_MOUSEMOVE, 0, (LPARAM)-1);
-				::KillTimer(m_hWnd, HOVER_CLEAR_TIMER_ID);
-				return 0;
-			}
-			if (wParam == INERTIA_TIMER_ID && m_inertiaActive)
-			{
-				HWND target = m_hWndPaint ? m_hWndPaint : m_hWnd;
-				std::int64_t now = NowMs();
-				std::int64_t dt = now - m_lastInertiaTms;
-				if (dt <= 0) dt = INERTIA_TIMER_INTERVAL_MS;
-				m_lastInertiaTms = now;
-
-				// 计算本帧移动的像素
-				float pixels = m_inertiaVelocityPxPerMs * static_cast<float>(dt);
-
-				// 将像素转换为 wheel units 累积并发送
-				int wheelUnits = static_cast<int>(pixels * PIXEL_TO_WHEEL);
-				m_accumWheel += wheelUnits;
-
-				// 使用保存的最后触摸点(target 的客户区坐标)
-				POINT pt = m_lastTouchPt;
-				LPARAM lParamPos = MAKELPARAM(pt.x, pt.y);
-
-				while (abs(m_accumWheel) >= WHEEL_DELTA)
-				{
-					int sendDelta = (m_accumWheel > 0) ? WHEEL_DELTA : -WHEEL_DELTA;
-					m_accumWheel -= sendDelta;
-					WPARAM wParamWheel = (WPARAM)(((DWORD)sendDelta) << 16);
-					::PostMessage(target, WM_MOUSEWHEEL, wParamWheel, lParamPos);
-				}
-
-				// 衰减速度(指数衰减)
-				// velocity *= pow(INERTIA_DECAY_PER_MS, dt)
-				m_inertiaVelocityPxPerMs *= std::pow(INERTIA_DECAY_PER_MS, static_cast<float>(dt));
-
-				// 停止条件
-				if (std::abs(m_inertiaVelocityPxPerMs) < MIN_INERTIA_VELOCITY)
-				{
-					StopInertia();
-				}
-
-				return 0;
-			}
-			break;
-		}
-
-		case WM_DESTROY:
-			StopInertia();
-			::KillTimer(m_hWnd, HOVER_CLEAR_TIMER_ID);
-			break;
-	}
-
-	// 若未处理,交给基类
-	return CWindowWnd::HandleMessage(uMsg, wParam, lParam);
-}

+ 0 - 85
zhipuzi_pos_windows/ui/CTouchWindowBase.h

@@ -1,85 +0,0 @@
-#pragma once
-
-// Windows 为“触屏模拟鼠标”生成的鼠标消息,会在 GetMessageExtraInfo() 中带此标记。
-// 必须过滤掉这类消息,否则手指滑动/轻触会被 DuiLib 当成真实鼠标点击(误触加入购物车等)。
-// 真实鼠标的 ExtraInfo 不带该标记,因此过滤不会影响鼠标操作(含调试用鼠标)。
-#ifndef MOUSEEVENTF_FROMTOUCH
-#define MOUSEEVENTF_FROMTOUCH 0xFF515700
-#endif
-
-class CTouchWindowBase : public DuiLib::CWindowWnd
-{
-public:
-	CTouchWindowBase();
-	virtual ~CTouchWindowBase();
-
-	// 必须设置为 DuiLib 的 paint 窗口(CPaintManagerUI 创建的窗口)
-	void SetPaintWindow(HWND hWndPaint)
-	{
-		m_hWndPaint = hWndPaint;
-	}
-
-	virtual LRESULT HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam) override;
-
-protected:
-	HWND m_hWndPaint = NULL;
-
-	// touch 状态
-	bool m_touchDown = false;
-	LONG m_lastX = 0;
-	LONG m_lastY = 0;
-	int m_accumWheel = 0; // 累积 wheel 值(单位 wheel delta)
-
-	// 轻触/滑动判定
-	bool m_bTouchMoved = false;        // 本次触摸是否发生了“滑动”(超过阈值)
-	POINT m_touchStartPt = { 0, 0 };   // 触摸起点(paint 窗口客户区坐标)
-	std::int64_t m_touchStartTime = 0; // 触摸起点时间(ms)
-	std::int64_t m_moveDistSq = 0;     // 累计移动距离的平方(用于阈值判定,避免频繁开方)
-
-	// 保存最后一次触摸的点(目标 paint 窗口的客户区坐标),用于惯性期间发送位置
-	POINT m_lastTouchPt = { 0, 0 };
-
-	// 每像素转多少 wheel units(可调节灵敏度)
-	// wheelUnits = dy * PIXEL_TO_WHEEL,后面按 WHEEL_DELTA(120) 做累积阈值
-	static constexpr float PIXEL_TO_WHEEL = 12.0f; // 约 10px -> 120,越小越灵敏/越连贯
-
-	// 轻触/滑动判定阈值(像素)。一次触摸累计移动距离小于该值视为“轻触点击”,
-	// 否则视为“滑动滚动”(不触发点击)。用于区分“想点商品”与“想滑列表”。
-	static constexpr LONG TAP_MOVE_THRESHOLD = 10;
-
-	// 采样用于计算速度
-	struct TouchSample
-	{
-		std::int64_t tms; // ms
-		LONG y;
-	};
-	std::deque<TouchSample> m_samples; // 保留最近若干样本
-
-	// 惯性滚动状态
-	bool m_inertiaActive = false;
-	float m_inertiaVelocityPxPerMs = 0.0f; // 像素每毫秒
-	UINT_PTR m_inertiaTimerId = 0;
-	std::int64_t m_lastInertiaTms = 0;
-
-	// 惯性参数(可调)
-	static constexpr int INERTIA_TIMER_ID = 0xA001;
-	static constexpr int INERTIA_TIMER_INTERVAL_MS = 16; // 约 60 FPS
-
-	// 触屏抬起后清除“悬停态”定时器:模拟真实鼠标“移开”以清除 UISTATE_HOT 悬浮态,
-	// 避免按钮在触屏轻触后卡在悬浮态(详见下方 ScheduleHoverClear 说明)。
-	static constexpr UINT HOVER_CLEAR_TIMER_ID = 0xA002;
-	static constexpr int  HOVER_CLEAR_DELAY_MS = 50; // 延后一点,确保本次手势的 OS 尾随消息都已处理完
-	// 衰减系数按每毫秒指数衰减: velocity *= pow(INERTIA_DECAY_PER_MS, dt)
-	static constexpr float INERTIA_DECAY_PER_MS = 0.997f; // 值接近 1,越接近 1 惯性持续越久
-	static constexpr float MIN_INERTIA_VELOCITY = 0.008f; // px/ms,低于则停止(调小=惯性更持久)
-	static constexpr int SAMPLE_WINDOW_MS = 120; // 计算速度时回溯的时间窗口
-	static constexpr int MAX_SAMPLE_COUNT = 8;
-
-	// 内部方法
-	void AddTouchSample(LONG y);
-	void SynthesizeTap(HWND target, POINT pt); // 模拟一次“轻触点击”(down+up),仅用于判定为轻触时
-	void ScheduleHoverClear(); // 触屏抬起后安排清除悬停态(避免按钮卡在悬浮态)
-	void StartInertia(float velocityPxPerMs);
-	void StopInertia();
-	std::int64_t NowMs() const;
-};

+ 2 - 11
zhipuzi_pos_windows/wnd/CMainWnd.cpp

@@ -207,16 +207,7 @@ LRESULT CMainWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandl
 
     m_pm.AddNotifier(this);
 
-	this->SetPaintWindow(m_pm.GetPaintWindow()); // 或类似方式获取 paint 窗口句柄
-
-	// 注册触摸支持(Windows 7+ 使用 WM_TOUCH)
-	// RegisterTouchWindow 需要在窗口创建后调用,放在 OnCreate 合适位置
-	if (!::RegisterTouchWindow(m_hWnd, 0))
-	{
-		// 可选:记录错误,便于调试没有触摸设备或注册失败的情况
-		LOG_INFO("RegisterTouchWindow failed:" << GetLastError());
-	}
-
+	//this->SetPaintWindow(m_pm.GetPaintWindow()); // 或类似方式获取 paint 窗口句柄
     return 0;
 }
 
@@ -511,7 +502,7 @@ LRESULT CMainWnd::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
         return lRes;
     }
 
-    return CTouchWindowBase::HandleMessage(uMsg, wParam, lParam);
+    return DuiLib::CWindowWnd::HandleMessage(uMsg, wParam, lParam);
 }
 
 bool CMainWnd::HandleCustomMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)

+ 1 - 2
zhipuzi_pos_windows/wnd/CMainWnd.h

@@ -7,11 +7,10 @@
 
 #include "../ui/CBasePageUI.h"
 
-#include "../ui/CTouchWindowBase.h"
 
 class CMessagePush;
 
-class CMainWnd : public CTouchWindowBase, public INotifyUI, public IMessageFilterUI
+class CMainWnd : public DuiLib::CWindowWnd, public INotifyUI, public IMessageFilterUI
 {
 public:
 	enum MainPageName

+ 1 - 1
zhipuzi_pos_windows/wnd/CShangpinCreateWnd.cpp

@@ -87,7 +87,7 @@ LRESULT CShangpinCreateWnd::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lPara
 	{
 		return lRes;
 	}
-	return CTouchWindowBase::HandleMessage(uMsg, wParam, lParam);
+	return DuiLib::CWindowWnd::HandleMessage(uMsg, wParam, lParam);
 }
 
 LRESULT CShangpinCreateWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled)

+ 1 - 1
zhipuzi_pos_windows/wnd/CShangpinUpdateWnd.cpp

@@ -87,7 +87,7 @@ LRESULT CShangpinUpdateWnd::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lPara
 	{
 		return lRes;
 	}
-	return CTouchWindowBase::HandleMessage(uMsg, wParam, lParam);
+	return DuiLib::CWindowWnd::HandleMessage(uMsg, wParam, lParam);
 }
 
 LRESULT CShangpinUpdateWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled)

+ 0 - 2
zhipuzi_pos_windows/zhipuzi_pos_windows.vcxproj

@@ -256,7 +256,6 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     <ClInclude Include="tool\tts\StreamTtsPlayer.h" />
     <ClInclude Include="tool\tts\TtsClient.h" />
     <ClInclude Include="tool\tts\WssClient.h" />
-    <ClInclude Include="ui\CTouchWindowBase.h" />
     <ClInclude Include="wnd\CShangpinCreateWnd.h" />
     <ClInclude Include="wnd\CShangpinUpdateWnd.h" />
     <ClInclude Include="worker\CDiandanAIShibieWorker.h" />
@@ -394,7 +393,6 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     <ClCompile Include="tool\tts\StreamTtsPlayer.cpp" />
     <ClCompile Include="tool\tts\TtsClient.cpp" />
     <ClCompile Include="tool\tts\WssClient.cpp" />
-    <ClCompile Include="ui\CTouchWindowBase.cpp" />
     <ClCompile Include="wnd\CShangpinCreateWnd.cpp" />
     <ClCompile Include="wnd\CShangpinUpdateWnd.cpp" />
     <ClCompile Include="worker\CDiandanAIShibieWorker.cpp" />