From 4f44034b7277bc560894486bed1effc0befadc7f Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 31 Mar 2025 00:46:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E4=B8=8E=E6=96=AD=E5=BC=80=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 4 +- libaes/build.properties | 4 +- .../libaes/winboll/WinBollClientService.java | 4 +- .../winboll/WinBollServiceStatusView.java | 170 +++++++++--------- 4 files changed, 91 insertions(+), 91 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index 1020120..51ec9d7 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 30 06:06:05 GMT 2025 +#Sun Mar 30 16:43:08 GMT 2025 stageCount=2 libraryProject=libaes baseVersion=15.2 publishVersion=15.2.1 -buildCount=85 +buildCount=91 baseBetaVersion=15.2.2 diff --git a/libaes/build.properties b/libaes/build.properties index 1020120..51ec9d7 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 30 06:06:05 GMT 2025 +#Sun Mar 30 16:43:08 GMT 2025 stageCount=2 libraryProject=libaes baseVersion=15.2 publishVersion=15.2.1 -buildCount=85 +buildCount=91 baseBetaVersion=15.2.2 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollClientService.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollClientService.java index 6d2d170..756e885 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollClientService.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollClientService.java @@ -171,13 +171,13 @@ public class WinBollClientService extends Service implements IWinBollClientServi while (mIsEnableService) { // 显示运行状态 WinBollServiceStatusView.startConnection(); - + LogUtils.d(TAG, String.format("while mIsEnableService is %s", mIsEnableService)); + try { Thread.sleep(10 * 1000); } catch (InterruptedException e) { LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); } - LogUtils.d(TAG, "while syncWinBollClientThreadStatus"); syncWinBollClientThreadStatus(); } diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServiceStatusView.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServiceStatusView.java index a25a8e0..4954177 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServiceStatusView.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServiceStatusView.java @@ -218,7 +218,7 @@ public class WinBollServiceStatusView extends LinearLayout { String msg = "ClientIP<" + formattedDateTime + ">: " + text; mWinBollServiceViewHandler.postMessageText(msg); mWinBollServiceViewHandler.postMessageConnectionStatus(true); - + } @Override @@ -263,91 +263,91 @@ public class WinBollServiceStatusView extends LinearLayout { } /*void requestWithBasicAuth(final WinBollServiceViewHandler textViewHandler, String targetUrl, final String username, final String password) { - // 用户名和密码，替换为实际的认证信息 - //String username = "your_username"; - //String password = "your_password"; - LogUtils.d(TAG, "requestWithBasicAuth(...)"); - LogUtils.d(TAG, String.format("targetUrl %s", targetUrl)); + // 用户名和密码，替换为实际的认证信息 + //String username = "your_username"; + //String password = "your_password"; + LogUtils.d(TAG, "requestWithBasicAuth(...)"); + LogUtils.d(TAG, String.format("targetUrl %s", targetUrl)); - // 构建包含认证信息的请求 - String credential = Credentials.basic(username, password); - LogUtils.d(TAG, String.format("credential %s", credential)); + // 构建包含认证信息的请求 + String credential = Credentials.basic(username, password); + LogUtils.d(TAG, String.format("credential %s", credential)); - OkHttpClient client = new OkHttpClient(); - Request request = new Request.Builder() - .url(targetUrl) - .header("Accept", "text/plain") // 设置正确的Content-Type头 - .header("Authorization", credential) - .build(); + OkHttpClient client = new OkHttpClient(); + Request request = new Request.Builder() + .url(targetUrl) + .header("Accept", "text/plain") // 设置正确的Content-Type头 + .header("Authorization", credential) + .build(); - Call call = client.newCall(request); - call.enqueue(new Callback() { - @Override - public void onFailure(Call call, IOException e) { - // 处理网络请求失败 - setImageViewByConnection(mImageView, false); - textViewHandler.postMessageText(e.getMessage()); - textViewHandler.postMessageConnectionStatus(false); - LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); - //String sz = "请求失败，状态码: " + response.code(); - //setImageViewByConnection(mImageView, false); - //LogUtils.d(TAG, sz); - } + Call call = client.newCall(request); + call.enqueue(new Callback() { + @Override + public void onFailure(Call call, IOException e) { + // 处理网络请求失败 + setImageViewByConnection(mImageView, false); + textViewHandler.postMessageText(e.getMessage()); + textViewHandler.postMessageConnectionStatus(false); + LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); + //String sz = "请求失败，状态码: " + response.code(); + //setImageViewByConnection(mImageView, false); + //LogUtils.d(TAG, sz); + } - @Override - public void onResponse(Call call, Response response) throws IOException { - if (!response.isSuccessful()) { - setImageViewByConnection(mImageView, false); - textViewHandler.postMessageText("Unexpected code " + response); - textViewHandler.postMessageConnectionStatus(false); - LogUtils.d(TAG, "Unexpected code " + response, Thread.currentThread().getStackTrace()); - return; - } + @Override + public void onResponse(Call call, Response response) throws IOException { + if (!response.isSuccessful()) { + setImageViewByConnection(mImageView, false); + textViewHandler.postMessageText("Unexpected code " + response); + textViewHandler.postMessageConnectionStatus(false); + LogUtils.d(TAG, "Unexpected code " + response, Thread.currentThread().getStackTrace()); + return; + } - try { - // 读取响应体作为字符串，注意这里可能需要解码 - String text = response.body().string(); - LogUtils.d(TAG, "Develop Host Connection IP is : " + text); - mConnectionStatus = ConnectionStatus.CONNECTED; - // 获取当前时间 - LocalDateTime now = LocalDateTime.now(); - // 定义时间格式 - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss"); - // 按照指定格式格式化时间并输出 - String formattedDateTime = now.format(formatter); - textViewHandler.postMessageText("ClientIP<" + formattedDateTime + ">: " + text); - textViewHandler.postMessageConnectionStatus(true); + try { + // 读取响应体作为字符串，注意这里可能需要解码 + String text = response.body().string(); + LogUtils.d(TAG, "Develop Host Connection IP is : " + text); + mConnectionStatus = ConnectionStatus.CONNECTED; + // 获取当前时间 + LocalDateTime now = LocalDateTime.now(); + // 定义时间格式 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss"); + // 按照指定格式格式化时间并输出 + String formattedDateTime = now.format(formatter); + textViewHandler.postMessageText("ClientIP<" + formattedDateTime + ">: " + text); + textViewHandler.postMessageConnectionStatus(true); - //org.jsoup.nodes.Document doc = org.jsoup.Jsoup.parse(text); - //LogUtils.d(TAG, doc.text()); + //org.jsoup.nodes.Document doc = org.jsoup.Jsoup.parse(text); + //LogUtils.d(TAG, doc.text()); - // 使用id选择器找到具有特定id的元素 - //org.jsoup.nodes.Element elementWithId = doc.select("#LastRelease").first(); // 获取第一个匹配的元素 + // 使用id选择器找到具有特定id的元素 + //org.jsoup.nodes.Element elementWithId = doc.select("#LastRelease").first(); // 获取第一个匹配的元素 - // 提取并打印元素的文本内容 - //mszNewestAppPackageName = elementWithId.text(); - //ToastUtils.delayedShow(text + "\n" + mszNewestAppPackageName, 5000); + // 提取并打印元素的文本内容 + //mszNewestAppPackageName = elementWithId.text(); + //ToastUtils.delayedShow(text + "\n" + mszNewestAppPackageName, 5000); - //mHandler.sendMessage(mHandler.obtainMessage(MSG_APPUPDATE_CHECKED)); - //System.out.println(response.body().string()); - // mConnectionStatus = ConnectionStatus.CONNECTED; - // // 获取当前时间 - // LocalDateTime now = LocalDateTime.now(); - // - // // 定义时间格式 - // DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss"); - // // 按照指定格式格式化时间并输出 - // String formattedDateTime = now.format(formatter); - // //System.out.println(formattedDateTime); - // textViewHandler.postMessageText("ClientIP<" + formattedDateTime + ">: " + response.body().string()); - // textViewHandler.postMessageConnectionStatus(true); - } catch (Exception e) { - LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); - } - } - }); + //mHandler.sendMessage(mHandler.obtainMessage(MSG_APPUPDATE_CHECKED)); + //System.out.println(response.body().string()); + // mConnectionStatus = ConnectionStatus.CONNECTED; + // // 获取当前时间 + // LocalDateTime now = LocalDateTime.now(); + // + // // 定义时间格式 + // DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss"); + // // 按照指定格式格式化时间并输出 + // String formattedDateTime = now.format(formatter); + // //System.out.println(formattedDateTime); + // textViewHandler.postMessageText("ClientIP<" + formattedDateTime + ">: " + response.body().string()); + // textViewHandler.postMessageConnectionStatus(true); + } catch (Exception e) { + LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); + } + } + }); - }*/ + }*/ class WinBollServiceViewHandler extends Handler { WinBollServiceStatusView mDevelopHostConnectionStatusView; @@ -399,26 +399,26 @@ public class WinBollServiceStatusView extends LinearLayout { mConnectionStatus = ConnectionStatus.START_CONNECT; LogUtils.d(TAG, "startConnectionThread"); if (mConnectionThread != null) { + LogUtils.d(TAG, "mConnectionThread != null"); mConnectionThread.mIsExist = true; } mConnectionThread = new ConnectionThread(); mConnectionThread.start(); } else if (mConnectionStatus == ConnectionStatus.CONNECTING) { //LogUtils.d(TAG, "mConnectionStatus == ConnectionStatus.CONNECTING"); + } else if (mConnectionStatus == ConnectionStatus.CONNECTED) { + //LogUtils.d(TAG, "mConnectionStatus == ConnectionStatus.CONNECTED"); } else { - LogUtils.d(TAG, "Unknow mConnectionStatus, can not start ConnectionThread."); + LogUtils.d(TAG, String.format("Unknow mConnectionStatus %s, can not start ConnectionThread.", mConnectionStatus)); } } void stopConnectionThread() { - if (mConnectionStatus == ConnectionStatus.CONNECTED) { - LogUtils.d(TAG, "stopConnectionThread"); - if (mConnectionThread != null) { - mConnectionThread.mIsExist = true; - mConnectionThread = null; - } - } else { - LogUtils.d(TAG, "Unknow mConnectionStatus, can not start ConnectionThread."); + LogUtils.d(TAG, "stopConnectionThread"); + if (mConnectionThread != null) { + LogUtils.d(TAG, "mConnectionThread != null"); + mConnectionThread.mIsExist = true; + mConnectionThread = null; } }