diff --git a/.gitignore b/.gitignore index 56708fd..b383433 100644 --- a/.gitignore +++ b/.gitignore @@ -6,10 +6,8 @@ # Node artifact files node_modules/ dist/ -/build build/ release/ -/release # Compiled Java class files *.class diff --git a/build/.ninja_deps b/build/.ninja_deps index 8d02600..595b2c4 100644 Binary files a/build/.ninja_deps and b/build/.ninja_deps differ diff --git a/build/.ninja_log b/build/.ninja_log index c2c02ae..7bf970a 100644 --- a/build/.ninja_log +++ b/build/.ninja_log @@ -1,23 +1,79 @@ # ninja log v6 -4063 8329 7620828272105475 CMakeFiles/ctai.dir/src/ctai_tabbar.cpp.obj 41b68d110b3c0daf -4058 8712 7620828272053173 CMakeFiles/ctai.dir/src/ctai_cmd.cpp.obj 80d6964d23a3e9c5 -3699 15187 7621643165180959 CMakeFiles/ctai.dir/ctai_autogen/mocs_compilation.cpp.obj 696927afe9114740 -4077 13615 7620828272253227 CMakeFiles/ctai.dir/src/sui_title.cpp.obj e026b4b712cf9da4 -18 269 7621645896591194 ctai_autogen/timestamp da3870ebc94b983e -270 17912 7621645899099118 CMakeFiles/ctai.dir/src/ctai_curl.cpp.obj b2496aab435c15c7 -3560 6938 7621113173344145 CMakeFiles/ctai.dir/src/ctai_switch_control.cpp.obj ddca150b42c8a71b -4080 8720 7620828272270625 CMakeFiles/ctai.dir/qrc_res.cpp.obj 9f74f1f5e59b5b50 -3707 13634 7621643165268059 CMakeFiles/ctai.dir/src/ctai_tabwidget.cpp.obj 6fa8a641137702e0 -4070 13239 7620828272176219 CMakeFiles/ctai.dir/src/sui.cpp.obj e1630d781a04e855 -17912 29809 7621646075529326 F:/SourceCode/ctai/release/ctai.exe b22720a33d64aaa9 18 269 7621645896591194 F:/SourceCode/ctai/build/ctai_autogen/mocs_compilation.cpp da3870ebc94b983e +17912 29809 7621646075529326 F:/SourceCode/ctai/release/ctai.exe b22720a33d64aaa9 +4070 13239 7620828272176219 CMakeFiles/ctai.dir/src/sui.cpp.obj e1630d781a04e855 3857 4054 7620828271905766 qrc_res.cpp 9794859fafc6825 -4072 16884 7620828272196197 CMakeFiles/ctai.dir/src/sui_base_ex.cpp.obj 476c94d1f2c8cfea -3710 14540 7621643165298228 CMakeFiles/ctai.dir/src/main.cpp.obj 77280178abb968fc -4083 4223 7620828272305402 CMakeFiles/ctai.dir/sui.rc.obj e30df163c9cbe567 -18 269 7621645896591194 F:/SourceCode/ctai/build/ctai_autogen/timestamp da3870ebc94b983e -3705 14181 7621643165248358 CMakeFiles/ctai.dir/src/ctai_session_widget.cpp.obj 578ff58396e1bb80 -4075 7860 7620828272226167 CMakeFiles/ctai.dir/src/sui_sys_style.cpp.obj 3bdd07348bd84970 -3857 4054 7620828271905766 F:/SourceCode/ctai/build/qrc_res.cpp 9794859fafc6825 -3701 14345 7621643165213401 CMakeFiles/ctai.dir/src/ctai.cpp.obj c7f0e07034d2e115 +3707 13634 7621643165268059 CMakeFiles/ctai.dir/src/ctai_tabwidget.cpp.obj 6fa8a641137702e0 +4080 8720 7620828272270625 CMakeFiles/ctai.dir/qrc_res.cpp.obj 9f74f1f5e59b5b50 +3560 6938 7621113173344145 CMakeFiles/ctai.dir/src/ctai_switch_control.cpp.obj ddca150b42c8a71b +270 17912 7621645899099118 CMakeFiles/ctai.dir/src/ctai_curl.cpp.obj b2496aab435c15c7 +18 269 7621645896591194 ctai_autogen/timestamp da3870ebc94b983e 18 269 7621645896591194 ctai_autogen/mocs_compilation.cpp da3870ebc94b983e +3701 14345 7621643165213401 CMakeFiles/ctai.dir/src/ctai.cpp.obj c7f0e07034d2e115 +18 269 7621645896591194 F:/SourceCode/ctai/build/ctai_autogen/timestamp da3870ebc94b983e +3857 4054 7620828271905766 F:/SourceCode/ctai/build/qrc_res.cpp 9794859fafc6825 +4075 7860 7620828272226167 CMakeFiles/ctai.dir/src/sui_sys_style.cpp.obj 3bdd07348bd84970 +3705 14181 7621643165248358 CMakeFiles/ctai.dir/src/ctai_session_widget.cpp.obj 578ff58396e1bb80 +3710 14540 7621643165298228 CMakeFiles/ctai.dir/src/main.cpp.obj 77280178abb968fc +4072 16884 7620828272196197 CMakeFiles/ctai.dir/src/sui_base_ex.cpp.obj 476c94d1f2c8cfea +4083 4223 7620828272305402 CMakeFiles/ctai.dir/sui.rc.obj e30df163c9cbe567 +3699 15187 7621643165180959 CMakeFiles/ctai.dir/ctai_autogen/mocs_compilation.cpp.obj 696927afe9114740 +4058 8712 7620828272053173 CMakeFiles/ctai.dir/src/ctai_cmd.cpp.obj 80d6964d23a3e9c5 +4063 8329 7620828272105475 CMakeFiles/ctai.dir/src/ctai_tabbar.cpp.obj 41b68d110b3c0daf +4077 13615 7620828272253227 CMakeFiles/ctai.dir/src/sui_title.cpp.obj e026b4b712cf9da4 +22 3910 7621650333612904 ctai_autogen/timestamp da3870ebc94b983e +22 3910 7621650333612904 ctai_autogen/mocs_compilation.cpp da3870ebc94b983e +22 3910 7621650333612904 F:/SourceCode/ctai/build/ctai_autogen/timestamp da3870ebc94b983e +22 3910 7621650333612904 F:/SourceCode/ctai/build/ctai_autogen/mocs_compilation.cpp da3870ebc94b983e +3918 13850 7621650334749376 CMakeFiles/ctai.dir/src/ctai_tabwidget.cpp.obj 6fa8a641137702e0 +3916 14284 7621650334731983 CMakeFiles/ctai.dir/src/ctai_session_widget.cpp.obj 578ff58396e1bb80 +3920 14523 7621650334766767 CMakeFiles/ctai.dir/src/main.cpp.obj 77280178abb968fc +3912 14606 7621650334681956 CMakeFiles/ctai.dir/src/ctai.cpp.obj c7f0e07034d2e115 +3910 15188 7621650334664564 CMakeFiles/ctai.dir/ctai_autogen/mocs_compilation.cpp.obj 696927afe9114740 +3914 22527 7621650334699350 CMakeFiles/ctai.dir/src/ctai_curl.cpp.obj b2496aab435c15c7 +22527 37074 7621650520836996 F:/SourceCode/ctai/release/ctai.exe b22720a33d64aaa9 +17 246 7621651380285822 ctai_autogen/timestamp da3870ebc94b983e +17 246 7621651380285822 ctai_autogen/mocs_compilation.cpp da3870ebc94b983e +17 246 7621651380285822 F:/SourceCode/ctai/build/ctai_autogen/timestamp da3870ebc94b983e +17 246 7621651380285822 F:/SourceCode/ctai/build/ctai_autogen/mocs_compilation.cpp da3870ebc94b983e +247 16317 7621651382575746 CMakeFiles/ctai.dir/src/ctai_curl.cpp.obj b2496aab435c15c7 +16317 27314 7621651543281686 F:/SourceCode/ctai/release/ctai.exe b22720a33d64aaa9 +17 250 7621651864764006 ctai_autogen/timestamp da3870ebc94b983e +17 250 7621651864764006 ctai_autogen/mocs_compilation.cpp da3870ebc94b983e +17 250 7621651864764006 F:/SourceCode/ctai/build/ctai_autogen/timestamp da3870ebc94b983e +17 250 7621651864764006 F:/SourceCode/ctai/build/ctai_autogen/mocs_compilation.cpp da3870ebc94b983e +251 16974 7621651867100074 CMakeFiles/ctai.dir/src/ctai_curl.cpp.obj b2496aab435c15c7 +16975 28772 7621652034347252 F:/SourceCode/ctai/release/ctai.exe b22720a33d64aaa9 +17 268 7621652186939700 ctai_autogen/timestamp da3870ebc94b983e +17 268 7621652186939700 ctai_autogen/mocs_compilation.cpp da3870ebc94b983e +17 268 7621652186939700 F:/SourceCode/ctai/build/ctai_autogen/timestamp da3870ebc94b983e +17 268 7621652186939700 F:/SourceCode/ctai/build/ctai_autogen/mocs_compilation.cpp da3870ebc94b983e +16 231 7621652577848968 ctai_autogen/timestamp da3870ebc94b983e +16 231 7621652577848968 ctai_autogen/mocs_compilation.cpp da3870ebc94b983e +16 231 7621652577848968 F:/SourceCode/ctai/build/ctai_autogen/timestamp da3870ebc94b983e +16 231 7621652577848968 F:/SourceCode/ctai/build/ctai_autogen/mocs_compilation.cpp da3870ebc94b983e +232 16857 7621652579997141 CMakeFiles/ctai.dir/src/ctai_curl.cpp.obj b2496aab435c15c7 +16858 29066 7621652746267812 F:/SourceCode/ctai/release/ctai.exe b22720a33d64aaa9 +17 4054 7621653801163666 ctai_autogen/timestamp da3870ebc94b983e +17 4054 7621653801163666 ctai_autogen/mocs_compilation.cpp da3870ebc94b983e +17 4054 7621653801163666 F:/SourceCode/ctai/build/ctai_autogen/timestamp da3870ebc94b983e +17 4054 7621653801163666 F:/SourceCode/ctai/build/ctai_autogen/mocs_compilation.cpp da3870ebc94b983e +4062 14196 7621653802323893 CMakeFiles/ctai.dir/src/ctai_tabwidget.cpp.obj 6fa8a641137702e0 +4061 14549 7621653802313691 CMakeFiles/ctai.dir/src/ctai_session_widget.cpp.obj 578ff58396e1bb80 +4057 14885 7621653802268871 CMakeFiles/ctai.dir/src/ctai.cpp.obj c7f0e07034d2e115 +4064 14927 7621653802341325 CMakeFiles/ctai.dir/src/main.cpp.obj 77280178abb968fc +4055 15492 7621653802251470 CMakeFiles/ctai.dir/ctai_autogen/mocs_compilation.cpp.obj 696927afe9114740 +4059 23111 7621653802286262 CMakeFiles/ctai.dir/src/ctai_curl.cpp.obj b2496aab435c15c7 +23112 33632 7621653992815378 F:/SourceCode/ctai/release/ctai.exe b22720a33d64aaa9 +16 258 7621654925130662 ctai_autogen/timestamp da3870ebc94b983e +16 258 7621654925130662 ctai_autogen/mocs_compilation.cpp da3870ebc94b983e +16 258 7621654925130662 F:/SourceCode/ctai/build/ctai_autogen/timestamp da3870ebc94b983e +16 258 7621654925130662 F:/SourceCode/ctai/build/ctai_autogen/mocs_compilation.cpp da3870ebc94b983e +259 8971 7621654927559068 CMakeFiles/ctai.dir/src/ctai_session_widget.cpp.obj 578ff58396e1bb80 +8971 19412 7621655014698186 F:/SourceCode/ctai/release/ctai.exe b22720a33d64aaa9 +23 286 7621655252953030 ctai_autogen/timestamp da3870ebc94b983e +23 286 7621655252953030 ctai_autogen/mocs_compilation.cpp da3870ebc94b983e +23 286 7621655252953030 F:/SourceCode/ctai/build/ctai_autogen/timestamp da3870ebc94b983e +23 286 7621655252953030 F:/SourceCode/ctai/build/ctai_autogen/mocs_compilation.cpp da3870ebc94b983e +287 8389 7621655255599989 CMakeFiles/ctai.dir/src/ctai_session_widget.cpp.obj 578ff58396e1bb80 +16 11189 7621655396214908 F:/SourceCode/ctai/release/ctai.exe b22720a33d64aaa9 diff --git a/build/CMakeFiles/ctai.dir/ctai_autogen/mocs_compilation.cpp.obj b/build/CMakeFiles/ctai.dir/ctai_autogen/mocs_compilation.cpp.obj index ecad101..c8edfeb 100644 Binary files a/build/CMakeFiles/ctai.dir/ctai_autogen/mocs_compilation.cpp.obj and b/build/CMakeFiles/ctai.dir/ctai_autogen/mocs_compilation.cpp.obj differ diff --git a/build/CMakeFiles/ctai.dir/src/ctai_curl.cpp.obj b/build/CMakeFiles/ctai.dir/src/ctai_curl.cpp.obj index 8a4f046..df549d5 100644 Binary files a/build/CMakeFiles/ctai.dir/src/ctai_curl.cpp.obj and b/build/CMakeFiles/ctai.dir/src/ctai_curl.cpp.obj differ diff --git a/build/CMakeFiles/ctai.dir/src/ctai_session_widget.cpp.obj b/build/CMakeFiles/ctai.dir/src/ctai_session_widget.cpp.obj index fa7e5cc..be16e79 100644 Binary files a/build/CMakeFiles/ctai.dir/src/ctai_session_widget.cpp.obj and b/build/CMakeFiles/ctai.dir/src/ctai_session_widget.cpp.obj differ diff --git a/release/ctai.exe b/release/ctai.exe index c0c2bad..b9f3647 100644 Binary files a/release/ctai.exe and b/release/ctai.exe differ diff --git a/src/ctai_curl.cpp b/src/ctai_curl.cpp index b83526f..c4ec96f 100644 --- a/src/ctai_curl.cpp +++ b/src/ctai_curl.cpp @@ -12,8 +12,6 @@ ctai_curl::~ctai_curl() } } -static ctai_curl *instance; - size_t curl_callback(void *buffer, size_t sz, size_t nmemb, void *userdata) { auto ctx = static_cast(userdata); @@ -39,7 +37,6 @@ void ctai_curl::curl_init(send_data _send_args) m_error = CURLE_QUOTE_ERROR; m_headers = nullptr; set_send_post_option(_send_args); - instance = this; } void ctai_curl::set_send_post_option(send_data m_args) { diff --git a/src/ctai_curl.h b/src/ctai_curl.h index 99b2f75..3ff486b 100644 --- a/src/ctai_curl.h +++ b/src/ctai_curl.h @@ -25,7 +25,7 @@ typedef struct send_data bool followlocation = false; bool tcp_keepalive = true; bool debug_verbose = true; - bool steam_mode = true; + bool steam_mode = false; std::string user_data; std::string model_data; std::string time; diff --git a/src/ctai_session_widget.cpp b/src/ctai_session_widget.cpp index f21a123..3cb8877 100644 --- a/src/ctai_session_widget.cpp +++ b/src/ctai_session_widget.cpp @@ -108,15 +108,19 @@ void ctai_session_widget::ctai_session_set_send_info(send_data resp_data){ m_session_info->append(QString::fromStdString(resp_data.model_data)); }else{ if (resp_data.time!=current_info_time){ - m_session_info->append(QString::fromStdString(resp_data.time)); current_info_time=resp_data.time; - } - m_session_info->insertPlainText(QString::fromStdString(resp_data.model_data)); + m_session_info->append(QString::fromStdString(resp_data.time)); + m_session_info->append(QString::fromStdString(resp_data.model_data)); + }else{ + m_session_info->insertPlainText(QString::fromStdString(resp_data.model_data)); + } + } ctai_disable_enable_btn(true); m_lable_tips->clear(); } void ctai_session_widget::ctai_session_set_steam_mode(bool state){ + qDebug()<<"steam mode:"<setToggle(state); user_args.steam_mode=state; }