JiXieShi
/
CLI_Manager
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 编码选择显示不对应问题

main
机械师 2025-09-08 14:31:47 +08:00
parent 2840c9a378
commit 534e5c0850
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/inc/CLIProcess.h
View File

@ -10,12 +10,12 @@
// 新增：输出编码枚举 // 新增：输出编码枚举
enum class OutputEncoding { enum class OutputEncoding {
UTF8 = 0, AUTO_DETECT =0,
UTF8,
GBK, GBK,
GB2312, GB2312,
BIG5, BIG5,
SHIFT_JIS, SHIFT_JIS,
AUTO_DETECT
}; };
class CLIProcess { class CLIProcess {
@ -60,8 +60,8 @@ private:
// 新增：编码转换相关方法 // 新增：编码转换相关方法
std::string ConvertToUTF8(const std::string& input, OutputEncoding encoding); std::string ConvertToUTF8(const std::string& input, OutputEncoding encoding);
std::string DetectAndConvertToUTF8(const std::string& input); std::string DetectAndConvertToUTF8(const std::string& input);
UINT GetCodePageFromEncoding(OutputEncoding encoding); static UINT GetCodePageFromEncoding(OutputEncoding encoding);
bool IsValidUTF8(const std::string& str); static bool IsValidUTF8(const std::string& str);
PROCESS_INFORMATION pi_{}; PROCESS_INFORMATION pi_{};
HANDLE hReadPipe_{}; HANDLE hReadPipe_{};

7
app/src/CLIProcess.cpp
View File

@ -30,7 +30,7 @@ OutputEncoding CLIProcess::GetOutputEncoding() const {
} }
// 新增：获取编码名称 // 新增：获取编码名称
std::string CLIProcess::GetEncodingName(OutputEncoding encoding) { std::string CLIProcess::GetEncodingName(const OutputEncoding encoding) {
switch (encoding) { switch (encoding) {
case OutputEncoding::UTF8: return "UTF-8"; case OutputEncoding::UTF8: return "UTF-8";
case OutputEncoding::GBK: return "GBK"; case OutputEncoding::GBK: return "GBK";
@ -55,9 +55,8 @@ std::vector<std::pair<OutputEncoding, std::string>> CLIProcess::GetSupportedEnco
} }
// 新增：根据编码获取代码页 // 新增：根据编码获取代码页
UINT CLIProcess::GetCodePageFromEncoding(OutputEncoding encoding) { UINT CLIProcess::GetCodePageFromEncoding(const OutputEncoding encoding) {
switch (encoding) { switch (encoding) {
case OutputEncoding::UTF8: return CP_UTF8;
case OutputEncoding::GBK: return 936; case OutputEncoding::GBK: return 936;
case OutputEncoding::GB2312: return 20936; case OutputEncoding::GB2312: return 20936;
case OutputEncoding::BIG5: return 950; case OutputEncoding::BIG5: return 950;
@ -68,7 +67,7 @@ UINT CLIProcess::GetCodePageFromEncoding(OutputEncoding encoding) {
// 新增：检查是否为有效的UTF-8 // 新增：检查是否为有效的UTF-8
bool CLIProcess::IsValidUTF8(const std::string& str) { bool CLIProcess::IsValidUTF8(const std::string& str) {
const unsigned char* bytes = reinterpret_cast<const unsigned char*>(str.c_str()); const auto* bytes = reinterpret_cast<const unsigned char*>(str.c_str());
size_t len = str.length(); size_t len = str.length();
for (size_t i = 0; i < len; ) { for (size_t i = 0; i < len; ) {

7
app/src/Manager.cpp
View File

@ -318,13 +318,8 @@ void Manager::RenderEnvironmentVariablesSettings() {
ImGui::Unindent(); ImGui::Unindent();
} else { } else {
ImGui::BeginDisabled(true); ImGui::BeginDisabled(true);
ImGui::InputText("变量名", env_key_input_, IM_ARRAYSIZE(env_key_input_));
ImGui::SameLine();
ImGui::InputText("变量值", env_value_input_, IM_ARRAYSIZE(env_value_input_));
ImGui::SameLine();
ImGui::Button("添加");
ImGui::EndDisabled();
ImGui::TextWrapped("说明：禁用时将使用系统默认环境变量启动程序。"); ImGui::TextWrapped("说明：禁用时将使用系统默认环境变量启动程序。");
ImGui::EndDisabled();
} }
} }