diff --git a/patch_v2/ncm_app/app/ui/login.c b/patch_v2/ncm_app/app/ui/login.c index 213c297..9a0f9d2 100644 --- a/patch_v2/ncm_app/app/ui/login.c +++ b/patch_v2/ncm_app/app/ui/login.c @@ -78,7 +78,8 @@ static int get_unikey_and_qr(char *unikey, size_t usz) { int rc = ncm_login_unikey(g_st.ctx.device_id, unikey, usz); - if (rc != NCM_OK) return rc; + if (rc != NCM_OK) { meow_log(MEOW_LOG_ERROR, "login: unikey fetch failed rc=%d", rc); return rc; } + meow_log(MEOW_LOG_INFO, "login: unikey ok, qr ready"); ncm_strlcpy(g_st.unikey, unikey, sizeof g_st.unikey); ncm_login_qr_url(unikey, g_st.qr_url, sizeof g_st.qr_url); int size = 0; @@ -96,6 +97,7 @@ static void *login_worker(void *arg) (void)arg; char unikey[64]; if (get_unikey_and_qr(unikey, sizeof unikey) != NCM_OK) { g_err = 1; return NULL; } + meow_log(MEOW_LOG_INFO, "login: poll worker start"); char cookie[NCM_COOKIE_MAX]; ncm_strlcpy(cookie, g_st.ctx.cookie, sizeof cookie); @@ -105,10 +107,13 @@ static void *login_worker(void *arg) char out_cookie[NCM_COOKIE_MAX]; int rc = ncm_login_poll(g_st.ctx.device_id, unikey, cookie, &r, out_cookie, sizeof out_cookie); - if (rc != NCM_OK) { g_err = 1; usleep(2 * 1000 * 1000); continue; } + if (rc != NCM_OK) { meow_log(MEOW_LOG_WARN, "login: poll failed rc=%d", rc); g_err = 1; usleep(2 * 1000 * 1000); continue; } + if (r.state != g_st.login_state) + meow_log(MEOW_LOG_INFO, "login: state -> %d", (int)r.state); g_st.login_state = r.state; if (r.state == NCM_LOGIN_OK) { + meow_log(MEOW_LOG_INFO, "login: 803 confirmed, saving cookie"); ncm_strlcpy(cookie, out_cookie, sizeof cookie); ncm_ctx_set_cookie(&g_st.ctx, cookie); /* 拿 uid/nickname */ diff --git a/patch_v2/ncm_app/ncm b/patch_v2/ncm_app/ncm index fb7818a..cffa6ba 100755 Binary files a/patch_v2/ncm_app/ncm and b/patch_v2/ncm_app/ncm differ