逐趣校园OEM完成

bin/Win32/Debug/lewaimai_pos_windows/skin/main.xml

@@ -13,7 +13,7 @@
     		<Control height="2" bkcolor="#FFD1EDFF" />
     		<HorizontalLayout height="90" bkcolor="#FF8DD3FF" bkcolor2="#FF60B1FE">
     			<VerticalLayout width="600">
-    				<Label name="main_name_version" text="俏巴外卖接单软件" padding="5,5,0,0"/>
+    				<Label name="main_name_version" text="逐趣校园接单软件" padding="5,5,0,0"/>
     			</VerticalLayout>
     			<HorizontalLayout childpadding="20" inset="10,16,10,10" >    				
     				<Control />

bin/Win32/Debug/lewaimai_pos_windows/skin/setting.xml

@@ -191,7 +191,7 @@
 
 				<VerticalLayout bkcolor="#FFFFFFFF" padding="0,20,20,20" inset="15,15,15,15">
 					<Control height="300" />
-					<Label text="俏巴外卖接单软件" align="center">
+					<Label text="逐趣校园接单软件" align="center">
 					</Label>
 					<Label name="setting_version" text="版本号：1.0.0.1" align="center">
 					</Label>

bin/Win32/Release/lewaimai_pos_windows/log/pos.log

@@ -1,6 +0,0 @@
-2021-02-02 22:59:25[INFO] - folderPath:D:\work\lewaimai_pos_windows\bin\Win32\Release\lewaimai_pos_windows\db，没有找到对应的目录，即将创建 [d:\work\lewaimai_pos_windows\lewaimai_pos_windows\tool\csqlite3.cpp:11]
-2021-02-02 22:59:25[INFO] - 新建 db 目录成功！ [d:\work\lewaimai_pos_windows\lewaimai_pos_windows\tool\csqlite3.cpp:18]
-2021-02-02 22:59:25[INFO] - create table success [d:\work\lewaimai_pos_windows\lewaimai_pos_windows\tool\csqlite3.cpp:178]
-2021-02-02 22:59:25[INFO] - fount field [d:\work\lewaimai_pos_windows\lewaimai_pos_windows\tool\csqlite3.cpp:249]
-2021-02-02 22:59:25[INFO] - fount field [d:\work\lewaimai_pos_windows\lewaimai_pos_windows\tool\csqlite3.cpp:314]
-2021-02-02 22:59:48[INFO] - 可用的USB打印机数量：0 [d:\work\lewaimai_pos_windows\lewaimai_pos_windows\tool\cposprinter.cpp:29]

bin/Win32/Release/setup/listen.txt

@@ -1,7 +1,7 @@
-1.本软件为俏巴外卖接单软件，主要有外卖接单、提醒、打印等功能，可以配合俏巴外卖微信外卖系统使用；
+1.本软件为逐趣校园接单软件，主要有外卖接单、提醒、打印等功能，可以配合逐趣校园微信外卖系统使用；
 
-2.本软件的所有权归河南俏巴计算机信息有限公司，任何人不得对本软件进行破解与反编译等侵犯软件著作权的行为；
+2.本软件的所有权归深圳市迅享生活科技有限公司，任何人不得对本软件进行破解与反编译等侵犯软件著作权的行为；
 
-3.本协议的最终解释权归河南俏巴计算机信息有限公司所有；
+3.本协议的最终解释权归深圳市迅享生活科技有限公司所有；
 
-俏巴外卖官网 https://www.qiaoba.ren/
+逐趣校园官网 https://www.zhuquxiaoyuan.com/

bin/Win32/Release/setup/乐外卖接单软件安装脚本.nsi

@@ -1,10 +1,10 @@
 ; Script generated by the HM NIS Edit Script Wizard.
 
 ; HM NIS Edit Wizard helper defines
-!define PRODUCT_NAME "俏巴外卖接单软件"
-!define PRODUCT_VERSION "1.0.3.3"
-!define PRODUCT_PUBLISHER "河南俏巴计算机信息有限公司"
-!define PRODUCT_WEB_SITE "https://www.qiaoba.ren"
+!define PRODUCT_NAME "逐趣校园接单软件"
+!define PRODUCT_VERSION "1.0.3.4"
+!define PRODUCT_PUBLISHER "深圳市迅享生活科技有限公司"
+!define PRODUCT_WEB_SITE "https://www.zhuquxiaoyuan.com"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKCU"
@@ -35,7 +35,7 @@
 !insertmacro MUI_PAGE_FINISH
 
 Function autostart
-WriteRegStr HKCU Software\Microsoft\Windows\CurrentVersion\Run 俏巴外卖接单软件 "$INSTDIR\lewaimai_pos_windows.exe"
+WriteRegStr HKCU Software\Microsoft\Windows\CurrentVersion\Run 逐趣校园接单软件 "$INSTDIR\lewaimai_pos_windows.exe"
 Functionend
 
 ; Uninstaller pages
@@ -47,8 +47,8 @@ Functionend
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "qiaobawaimai_pos_windows_setup_${PRODUCT_VERSION}.exe"
-InstallDir "$PROGRAMFILES\qiaobawaimai_pos_windows"
+OutFile "zhuquxiaoyuan_pos_windows_setup_${PRODUCT_VERSION}.exe"
+InstallDir "$PROGRAMFILES\zhuquxiaoyuan_pos_windows"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
 ShowUnInstDetails show
@@ -61,21 +61,21 @@ Section "MainSection" SEC01
 SectionEnd
 
 Section -AdditionalIcons
-  WriteIniStr "$INSTDIR\俏巴外卖官网.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
+  WriteIniStr "$INSTDIR\逐趣校园官网.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
   
   ;桌面快捷方式的文件
-  CreateShortCut "$DESKTOP\俏巴外卖接单软件.lnk" "$INSTDIR\lewaimai_pos_windows.exe"
-  CreateShortCut "$DESKTOP\俏巴外卖官网.lnk" "$INSTDIR\俏巴外卖官网.url" "" "$INSTDIR\icon\lewaimai.ico"
+  CreateShortCut "$DESKTOP\逐趣校园接单软件.lnk" "$INSTDIR\lewaimai_pos_windows.exe"
+  CreateShortCut "$DESKTOP\逐趣校园官网.lnk" "$INSTDIR\逐趣校园官网.url" "" "$INSTDIR\icon\lewaimai.ico"
   
   ;开始程序里面的文件
-  CreateDirectory "$SMPROGRAMS\俏巴外卖接单软件"
-  CreateShortCut "$SMPROGRAMS\俏巴外卖接单软件\俏巴外卖接单软件.lnk" "$INSTDIR\lewaimai_pos_windows.exe"
-  CreateShortCut "$SMPROGRAMS\俏巴外卖接单软件\俏巴外卖官网.lnk" "$INSTDIR\俏巴外卖官网.url" "" "$INSTDIR\icon\lewaimai.ico"
+  CreateDirectory "$SMPROGRAMS\逐趣校园接单软件"
+  CreateShortCut "$SMPROGRAMS\逐趣校园接单软件\逐趣校园接单软件.lnk" "$INSTDIR\lewaimai_pos_windows.exe"
+  CreateShortCut "$SMPROGRAMS\逐趣校园接单软件\逐趣校园官网.lnk" "$INSTDIR\逐趣校园官网.url" "" "$INSTDIR\icon\lewaimai.ico"
 SectionEnd
 
 Section -Post
   WriteUninstaller "$INSTDIR\卸载.exe"
-  CreateShortCut "$SMPROGRAMS\俏巴外卖接单软件\卸载.lnk" "$INSTDIR\卸载.exe"
+  CreateShortCut "$SMPROGRAMS\逐趣校园接单软件\卸载.lnk" "$INSTDIR\卸载.exe"
   
   WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\lewaimai_pos_windows.exe"
   
@@ -127,23 +127,23 @@ FunctionEnd
 Section Uninstall  
   RMDir /r "$INSTDIR"
 
-  Delete "$DESKTOP\俏巴外卖接单软件.lnk"
-  Delete "$DESKTOP\俏巴外卖官网.lnk"
+  Delete "$DESKTOP\逐趣校园接单软件.lnk"
+  Delete "$DESKTOP\逐趣校园官网.lnk"
   
   SetShellVarContext current
-  Delete "$SMPROGRAMS\俏巴外卖接单软件\卸载.lnk"
-  Delete "$SMPROGRAMS\俏巴外卖接单软件\俏巴外卖官网.lnk"
-  Delete "$SMPROGRAMS\俏巴外卖接单软件\俏巴外卖接单软件.lnk"
-  RMDir "$SMPROGRAMS\俏巴外卖接单软件"
+  Delete "$SMPROGRAMS\逐趣校园接单软件\卸载.lnk"
+  Delete "$SMPROGRAMS\逐趣校园接单软件\逐趣校园官网.lnk"
+  Delete "$SMPROGRAMS\逐趣校园接单软件\逐趣校园接单软件.lnk"
+  RMDir "$SMPROGRAMS\逐趣校园接单软件"
   
   SetShellVarContext all
-  Delete "$SMPROGRAMS\俏巴外卖接单软件\卸载.lnk"
-  Delete "$SMPROGRAMS\俏巴外卖接单软件\俏巴外卖官网.lnk"
-  Delete "$SMPROGRAMS\俏巴外卖接单软件\俏巴外卖接单软件.lnk"
-  RMDir "$SMPROGRAMS\俏巴外卖接单软件"
+  Delete "$SMPROGRAMS\逐趣校园接单软件\卸载.lnk"
+  Delete "$SMPROGRAMS\逐趣校园接单软件\逐趣校园官网.lnk"
+  Delete "$SMPROGRAMS\逐趣校园接单软件\逐趣校园接单软件.lnk"
+  RMDir "$SMPROGRAMS\逐趣校园接单软件"
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
-  DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "俏巴外卖接单软件"
+  DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "逐趣校园接单软件"
   SetAutoClose true
 SectionEnd

lewaimai_pos_windows/helper/CSystem.h

@@ -50,7 +50,7 @@ public:
             GetModuleFileName(NULL, strExeFullDir, MAX_PATH);
 
             //3、添加一个子Key,并设置值，"GISRestart"是应用程序名字（不加后缀.exe）
-            RegSetValueEx(hKey, L"俏巴外卖接单软件", 0, REG_SZ, (LPBYTE)strExeFullDir, (lstrlen(strExeFullDir) + 1) * sizeof(TCHAR));
+            RegSetValueEx(hKey, L"逐趣校园接单软件", 0, REG_SZ, (LPBYTE)strExeFullDir, (lstrlen(strExeFullDir) + 1) * sizeof(TCHAR));
 
             //4、关闭注册表
             RegCloseKey(hKey);
@@ -72,7 +72,7 @@ public:
         if(RegOpenKeyEx(HKEY_CURRENT_USER, strRegPath.c_str(), 0, KEY_ALL_ACCESS, &hKey) == ERROR_SUCCESS)
         {
             //2、删除值
-            RegDeleteValue(hKey, L"俏巴外卖接单软件");
+            RegDeleteValue(hKey, L"逐趣校园接单软件");
 
             //3、关闭注册表
             RegCloseKey(hKey);
@@ -91,7 +91,7 @@ public:
             DWORD dwSzType = REG_SZ;
             DWORD dwSize = sizeof(dwValue);
 
-            if(::RegQueryValueEx(hKey, _T("俏巴外卖接单软件"), 0, &dwSzType, (LPBYTE)&dwValue, &dwSize) != ERROR_SUCCESS)
+            if(::RegQueryValueEx(hKey, _T("逐趣校园接单软件"), 0, &dwSzType, (LPBYTE)&dwValue, &dwSize) != ERROR_SUCCESS)
             {
                 return false;
             }

lewaimai_pos_windows/lewaimai_pos_windows.cpp

@@ -41,7 +41,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
         return 0;
     }
 
-    pLogin->Create(NULL, _T("俏巴外卖接单软件登录"), UI_WNDSTYLE_DIALOG, 0, 0, 0, 0, 0, NULL);
+    pLogin->Create(NULL, _T("逐趣校园接单软件登录"), UI_WNDSTYLE_DIALOG, 0, 0, 0, 0, 0, NULL);
     pLogin->SetIcon(IDI_ICON_DUILIB);
     pLogin->CenterWindow();
 

lewaimai_pos_windows/lewaimai_pos_windows.vcxproj

@@ -295,10 +295,10 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     <ResourceCompile Include="resource\lewaimai_pos_windows.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Image Include="resource\lewaimai.ico" />
+    <None Include="resource\lewaimai_pos_windows.aps" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="resource\lewaimai_pos_windows.aps" />
+    <Image Include="resource\lewaimai.ico" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

lewaimai_pos_windows/lewaimai_pos_windows.vcxproj.filters

@@ -140,9 +140,6 @@
     <ClCompile Include="tool\CPosPrinter.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="order\CWaimaiOrder.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
     <ClCompile Include="network\CMessagePush.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
@@ -194,11 +191,9 @@
     <ClCompile Include="tool\CExceptionDmp.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="resource\lewaimai.ico">
-      <Filter>资源文件</Filter>
-    </Image>
+    <ClCompile Include="order\CWaimaiOrder.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="resource\lewaimai_pos_windows.rc">
@@ -208,4 +203,9 @@
   <ItemGroup>
     <None Include="resource\lewaimai_pos_windows.aps" />
   </ItemGroup>
+  <ItemGroup>
+    <Image Include="resource\lewaimai.ico">
+      <Filter>资源文件</Filter>
+    </Image>
+  </ItemGroup>
 </Project>

lewaimai_pos_windows/network/CLewaimaiHttpClient.cpp

@@ -74,8 +74,8 @@ bool CLewaimaiHttpClient::Login(std::string& errmsg)
 		if (role_type != "1" && role_type != "9")
 		{
 			//不是商家账户，不允许登录（1是单店，9是连锁店）
-			LOG_INFO("俏巴外卖PC版仅支持商户类型的子账号登录");
-			errmsg = CLewaimaiString::UnicodeToUTF8(L"俏巴外卖PC版仅支持商户类型的子账号登录");
+			LOG_INFO("逐趣校园PC版仅支持商户类型的子账号登录");
+			errmsg = CLewaimaiString::UnicodeToUTF8(L"逐趣校园PC版仅支持商户类型的子账号登录");
 			return false;
 		}
 

lewaimai_pos_windows/tool/CExceptionDmp.cpp

@@ -55,7 +55,7 @@ LONG WINAPI MyUnhandledExceptionFilter(PEXCEPTION_POINTERS pExInfo)
 		};
 		TCHAR msg[400];
 		_stprintf_s(msg, fmt, file_name);
-		MessageBox(NULL, msg, L"俏巴外卖接单软件异常报告", MB_ICONERROR | MB_SYSTEMMODAL);
+		MessageBox(NULL, msg, L"逐趣校园接单软件异常报告", MB_ICONERROR | MB_SYSTEMMODAL);
 	}
 	else
 	{

lewaimai_pos_windows/wnd/CLoginWnd.cpp

@@ -8,7 +8,7 @@ void CLoginWnd::Init()
 {
 	//刷新版本号
 	CLabelUI* version = static_cast<CLabelUI*>(m_pm.FindControl(_T("login_version")));
-	version->SetText((L"俏巴外卖接单软件 " + CLewaimaiString::UTF8ToUnicode(CSystem::GetVersion())).c_str());
+	version->SetText((L"逐趣校园接单软件 " + CLewaimaiString::UTF8ToUnicode(CSystem::GetVersion())).c_str());
 
 	//初始化下拉框的用户名
 	CComboUI* pCom = static_cast<CComboUI*>(m_pm.FindControl(_T("accountcombo")));
@@ -111,7 +111,7 @@ void CLoginWnd::Notify(TNotifyUI& msg)
 		}
 		else if (msg.pSender->GetName() == _T("guanwang"))
 		{
-			ShellExecute(NULL, _T("open"), _T("explorer.exe"), _T("https://www.qiaoba.ren"), NULL, SW_SHOW);
+			ShellExecute(NULL, _T("open"), _T("explorer.exe"), _T("https://www.zhuquxiaoyuan.com"), NULL, SW_SHOW);
 		}
     }
 	else if (msg.sType == _T("itemselect"))
@@ -380,7 +380,7 @@ void CLoginWnd::HandleLogin()
 	std::map<string, string> params;
 
 	//OEM版本，需要修改这里的admin_id参数
-	params["admin_id"] = "93654";
+	params["admin_id"] = "85663";
 
 	std::string response;
 	bool ret = CLewaimaiHttpClient::Request("/version/getwindowsversion", params, response);
@@ -562,7 +562,7 @@ void CLoginWnd::LoginSuccess()
 	}
 
 	pFrame->SetIcon(IDI_ICON_DUILIB);
-	pFrame->Create(NULL, _T("俏巴外卖接单软件"), UI_WNDSTYLE_FRAME, 0L, 0, 0, 1024, 768);
+	pFrame->Create(NULL, _T("逐趣校园接单软件"), UI_WNDSTYLE_FRAME, 0L, 0, 0, 1024, 768);
 	pFrame->CenterWindow();
 
 	::ShowWindow(*pFrame, SW_SHOWMAXIMIZED);

lewaimai_pos_windows/wnd/CMainWnd.cpp

@@ -1419,7 +1419,7 @@ void CMainWnd::AddTrayIcon()
     m_trayIcon.cbSize = sizeof(NOTIFYICONDATA);
     m_trayIcon.hIcon = ::LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_ICON_DUILIB));
     m_trayIcon.hWnd = m_hWnd;
-    lstrcpy(m_trayIcon.szTip, _T("俏巴外卖接单软件"));
+    lstrcpy(m_trayIcon.szTip, _T("逐趣校园接单软件"));
     m_trayIcon.uCallbackMessage = WM_SHOWTASK;
     m_trayIcon.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
     Shell_NotifyIcon(NIM_ADD, &m_trayIcon);
@@ -1488,7 +1488,7 @@ void CMainWnd::InitSettingStatus()
     //显示当前软件版本和登录账号信息
     CLabelUI* name_version = static_cast<CLabelUI*>(m_pm.FindControl(_T("main_name_version")));
 
-    std::wstring wsShowName = L"俏巴外卖接单软件 " + CLewaimaiString::UTF8ToUnicode(CSystem::GetVersion());
+    std::wstring wsShowName = L"逐趣校园接单软件 " + CLewaimaiString::UTF8ToUnicode(CSystem::GetVersion());
 
     std::string last_login_username = CSetting::GetParam("last_login_username");
     std::wstring wx_last_login_username = CLewaimaiString::UTF8ToUnicode(last_login_username);
@@ -2099,7 +2099,7 @@ void CMainWnd::LoginOut(int mode)
 
     //设置模式
     pLogin->SetMode(mode);
-    pLogin->Create(NULL, _T("俏巴外卖接单软件登录"), UI_WNDSTYLE_DIALOG, 0, 0, 0, 0, 0, NULL);
+    pLogin->Create(NULL, _T("逐趣校园接单软件登录"), UI_WNDSTYLE_DIALOG, 0, 0, 0, 0, 0, NULL);
     pLogin->SetIcon(IDI_ICON_DUILIB);
     pLogin->CenterWindow();
 

lewaimai_pos_windows/wnd/CUpdateWnd.cpp

@@ -20,7 +20,7 @@ void CUpdateWnd::Notify(TNotifyUI& msg)
 
         else if(msg.pSender->GetName() == _T("guanwang"))
         {
-            ShellExecute(NULL, _T("open"), _T("explorer.exe"), _T("https://www.qiaoba.ren"), NULL, SW_SHOW);
+            ShellExecute(NULL, _T("open"), _T("explorer.exe"), _T("https://www.zhuquxiaoyuan.com"), NULL, SW_SHOW);
         }
     }