From a3d6877669396315c9f280a71f39ab85604355a3 Mon Sep 17 00:00:00 2001 From: gaozl Date: Wed, 10 Jun 2026 16:06:39 +0800 Subject: [PATCH] fix: ci --- app/build.gradle | 4 +-- .../java/qianmu/container/app/Constant.java | 4 +-- .../qianmu/container/app/MyApplication.java | 4 +-- .../java/qianmu/container/data/FloorData.java | 1 + .../container/handler/ContainerHandler.java | 33 +++++++++++++++++++ .../container/http/retrofit/RetrofitUtil.java | 6 ++++ .../qianmu/container/mqtt/MQTTService.java | 21 ++++++++---- playerview/build.gradle | 1 + .../java/com/dl7/player/ExampleUnitTest.java | 2 +- 9 files changed, 62 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 599fbc3..dea2577 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,14 +12,14 @@ android { minSdkVersion 24 targetSdkVersion 30 versionCode 6 - versionName "V2.0.8.31" + versionName "V2.0.8.32" //V2.0.8.22 删除ai背景视频切换代码 //V2.0.8.23 节目切换图片覆盖问题 //V2.0.8.30 4个视频 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' - ndk { abiFilters "armeabi-v7a" } + ndk { abiFilters "armeabi-v7a", "arm64-v8a" } // javaCompileOptions { annotationProcessorOptions { diff --git a/app/src/main/java/qianmu/container/app/Constant.java b/app/src/main/java/qianmu/container/app/Constant.java index a6b7f2a..0402210 100644 --- a/app/src/main/java/qianmu/container/app/Constant.java +++ b/app/src/main/java/qianmu/container/app/Constant.java @@ -23,13 +23,13 @@ public class Constant { public static String mqttState = ""; // 屏幕连接方式 public static String TTSHome="sbc"; // sbc-思必驰 kdxf-科大讯飞 (有语音的项目需要配置） // public static String androidBoardType = ""; //设备板子型号 无固定版 - // public static String androidBoardType = "ys"; // 设备板子型号 ys（亿晟） 北京颐堤港定制touch + public static String androidBoardType = "ys"; // 设备板子型号 ys（亿晟） 北京颐堤港定制touch // public static String androidBoardType = "xwst"; //设备板子型号 xwst（欣威视通3399） // public static String androidBoardType = "xwst2"; //设备板子型号 xwst2（欣威视通3588、T982、3576） // public static String androidBoardType = "zc"; //设备板子型号 zc（卓策主板——王府井喜悦、杨浦中心医院） // public static String androidBoardType = "sx"; //设备板子型号 sx（视想） // public static String androidBoardType = "nova"; //设备板子型号 诺瓦盒子 华贸LED - public static String androidBoardType = "huidu"; //设备板子型号 huidu（灰度主板） 罗湖寻车机 + // public static String androidBoardType = "huidu"; //设备板子型号 huidu（灰度主板） 罗湖寻车机 // public static String androidBoardType = "bv"; //设备板子型号 Bv-3588M // public static String androidBoardType = "smt"; //设备板子型号 视美泰 // public static String androidBoardType = "ctf"; //创泰丰 diff --git a/app/src/main/java/qianmu/container/app/MyApplication.java b/app/src/main/java/qianmu/container/app/MyApplication.java index bd1e67c..aa96425 100644 --- a/app/src/main/java/qianmu/container/app/MyApplication.java +++ b/app/src/main/java/qianmu/container/app/MyApplication.java @@ -94,9 +94,9 @@ public class MyApplication extends Application { if(Constant.androidBoardType.equals("tcl")){ boolean result = AuthorityManager.getInstance().verify("2d9e9b15c070d0b57f5281e13c03f1ac960ce86ab8835bb8a747042aef8ef53c"); if (result) { - Log.e("TAG", "Auth SDK success, can call other interface "); + LoggerUtil.e("TAG", "Auth SDK success, can call other interface "); } else { - Log.e("TAG", "Auth SDK failed, please check the auth key is correct"); + LoggerUtil.e("TAG", "Auth SDK failed, please check the auth key is correct"); } } diff --git a/app/src/main/java/qianmu/container/data/FloorData.java b/app/src/main/java/qianmu/container/data/FloorData.java index d3a59f2..48886d9 100644 --- a/app/src/main/java/qianmu/container/data/FloorData.java +++ b/app/src/main/java/qianmu/container/data/FloorData.java @@ -228,6 +228,7 @@ public class FloorData extends BaseData { if (finishListener != null) finishListener.onFinish(); } if(response.body() != null &&response.body().getMsg()!=null){ + LoggerUtil.e("queryConstList", new Gson().toJson(response.body().getData())); ToastUtils.showToast(response.body().getMsg()); } } catch (Throwable t) { diff --git a/app/src/main/java/qianmu/container/handler/ContainerHandler.java b/app/src/main/java/qianmu/container/handler/ContainerHandler.java index b0c01f3..5d843f5 100644 --- a/app/src/main/java/qianmu/container/handler/ContainerHandler.java +++ b/app/src/main/java/qianmu/container/handler/ContainerHandler.java @@ -27,6 +27,7 @@ import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; import java.lang.ref.WeakReference; +import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.List; @@ -76,6 +77,7 @@ public class ContainerHandler extends Handler { public static final int INIT_JXB = 10; //设置机械臂 public static final int INIT_JXB2 = 11; //设置机械臂 public int goMemoryTime =0; + private boolean isSetOver = false; //是否设置过开机时间了，默认没有设置过 private WeakReference weakReference; @@ -121,6 +123,37 @@ public class ContainerHandler extends Handler { PowerData.updatePowerOnOrOffTime(); } }else { + // Calendar calendar = Calendar.getInstance(); + // int hour = calendar.get(Calendar.HOUR_OF_DAY); + // int minute = calendar.get(Calendar.MINUTE); + // if(hour<=1){ //如果在23点 + // isSetOver = false; + // } + + // if(Constant.androidBoardType.equals("ys") && !isSetOver){ // 亿盛定制多组开关机时间 + // long currentLong = System.currentTimeMillis();//当前时间 + // SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + // String[] date = dateFormat.format(currentLong).split("-"); + // String[] date2 = dateFormat.format(currentLong+24*60*60*1000).split("-"); + // if(hour<9){ + // int[] timeoffArray = {Integer.parseInt(date[0]), Integer.parseInt(date[1]), Integer.parseInt(date[2]), hour, minute}; + // int[] timeonArray = {Integer.parseInt(date[0]), Integer.parseInt(date[1]), Integer.parseInt(date[2]), 9, 30}; + // SignWayUtil.setPowerOnOffTimeFortYs(timeoffArray,timeonArray); + // }else if (hour<10) { //如果在10点之前 + // int[] timeoffArray = {Integer.parseInt(date[0]), Integer.parseInt(date[1]), Integer.parseInt(date[2]), 10, 0}; + // int[] timeonArray = {Integer.parseInt(date[0]), Integer.parseInt(date[1]), Integer.parseInt(date[2]), 19, 0}; + // SignWayUtil.setPowerOnOffTimeFortYs(timeoffArray,timeonArray); + // }else if (hour>=10 && hour<18){ //如果在10点到19点之间 + // int[] timeoffArray = {Integer.parseInt(date[0]), Integer.parseInt(date[1]), Integer.parseInt(date[2]), hour, minute}; + // int[] timeonArray = {Integer.parseInt(date[0]), Integer.parseInt(date[1]), Integer.parseInt(date[2]), 19, 0}; + // SignWayUtil.setPowerOnOffTimeFortYs(timeoffArray,timeonArray); + // }else if (hour>=19 && hour<=23){ //如果在19点到23点之间 + // int[] timeoffArray = {Integer.parseInt(date[0]), Integer.parseInt(date[1]), Integer.parseInt(date[2]), 23, 0}; + // int[] timeonArray = {Integer.parseInt(date2[0]), Integer.parseInt(date2[1]), Integer.parseInt(date2[2]), 9, 30}; + // SignWayUtil.setPowerOnOffTimeFortYs(timeoffArray,timeonArray); + // } + // isSetOver = true; + // } PowerData.updatePowerOnOrOffTime(); } if(!DeviceData.getDeviceInfo(DeviceData.HINT_DEVICE_TYPE).equals("信发")&&!DeviceData.getDeviceInfo(DeviceData.HINT_DEVICE_TYPE).equals("双面屏")){ diff --git a/app/src/main/java/qianmu/container/http/retrofit/RetrofitUtil.java b/app/src/main/java/qianmu/container/http/retrofit/RetrofitUtil.java index 25b3ea1..1409c8f 100644 --- a/app/src/main/java/qianmu/container/http/retrofit/RetrofitUtil.java +++ b/app/src/main/java/qianmu/container/http/retrofit/RetrofitUtil.java @@ -63,6 +63,12 @@ public class RetrofitUtil { builder.connectTimeout(timeout, TimeUnit.SECONDS); builder.sslSocketFactory(sslContext.getSocketFactory(), (X509TrustManager) trustAllCerts[0]); builder.hostnameVerifier(SSLSocketClient.getHostnameVerifier()); + builder.addInterceptor(new BaseInterceptor()); + builder.addInterceptor(chain -> { + okhttp3.Request req = chain.request(); + LoggerUtil.e("OkHttp>>", req.url().toString()); + return chain.proceed(req); + }); return builder.build(); } catch (Throwable t) { LoggerUtil.e("initOkHttpClient", StringUtil.getThrowableStr(t)); diff --git a/app/src/main/java/qianmu/container/mqtt/MQTTService.java b/app/src/main/java/qianmu/container/mqtt/MQTTService.java index c23e786..768ac71 100644 --- a/app/src/main/java/qianmu/container/mqtt/MQTTService.java +++ b/app/src/main/java/qianmu/container/mqtt/MQTTService.java @@ -243,7 +243,6 @@ public class MQTTService extends Service { isConnected = false; sendOffline(); disconnectMqtt(); - stopSelf(); EventBus.getDefault().unregister(this); super.onDestroy(); } @@ -453,16 +452,24 @@ public class MQTTService extends Service { //断开连接 public void disconnectMqtt(){ + MqttAndroidClient c = client; + client = null; + if (c == null) return; try { - if(client!=null){ - client.unsubscribe(myTopic); - IMqttToken disconnectToken = client.disconnect(); -// disconnectToken.waitForCompletion(); - } + c.unsubscribe(myTopic); + } catch (Exception e) { + LoggerUtil.e(TAG, "取消订阅失败", e); + } + try { + c.disconnect(); } catch (Exception e) { LoggerUtil.e(TAG, "断开MQTT连接失败", e); } - + try { + c.close(); + } catch (Exception e) { + LoggerUtil.e(TAG, "关闭MQTT客户端失败", e); + } } public void sendCommand(String msg){ diff --git a/playerview/build.gradle b/playerview/build.gradle index 2ac3192..2c57d7a 100644 --- a/playerview/build.gradle +++ b/playerview/build.gradle @@ -26,6 +26,7 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) + testImplementation 'org.testng:testng:6.9.6' androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/playerview/src/test/java/com/dl7/player/ExampleUnitTest.java b/playerview/src/test/java/com/dl7/player/ExampleUnitTest.java index 2742106..686a0b8 100644 --- a/playerview/src/test/java/com/dl7/player/ExampleUnitTest.java +++ b/playerview/src/test/java/com/dl7/player/ExampleUnitTest.java @@ -1,6 +1,6 @@ package com.dl7.player; -import org.junit.Test; +import org.testng.annotations.Test; import static org.junit.Assert.*;