gaozl
/
Container_iot_custom_kdxf4.7
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: ci

master
高志龙 7 months ago
parent
6f1ea06215
commit
4cab9da1af
7 changed files with 10 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/build.gradle
  2. 4
      app/src/main/java/qianmu/container/activity/H5/UpdateFileActivity.java
  3. 1
      app/src/main/java/qianmu/container/activity/device/DeviceInfoActivity.java
  4. 3
      app/src/main/java/qianmu/container/activity/program/ScreenSaverActivity.java
  5. 4
      app/src/main/java/qianmu/container/app/Constant.java
  6. 22
      app/src/main/java/qianmu/container/data/PowerData.java
  7. 10
      app/src/main/java/qianmu/container/handler/ContainerHandler.java

2
app/build.gradle
View File

@ -12,7 +12,7 @@ android {
minSdkVersion 22
targetSdkVersion 30
versionCode 6
versionName "V2.0.7.30"
versionName "V2.0.7.34"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'

4
app/src/main/java/qianmu/container/activity/H5/UpdateFileActivity.java
View File

@ -260,6 +260,7 @@ public class UpdateFileActivity extends BaseActivity {
return;
}
}
LoggerUtil.e("当前版本号: ",DeviceUtil.getVersionName());
//设置开机自启应用
if(Constant.androidBoardType.equals("smt")){
MyApplication.getInstance().getSmdt().sys_setSystemBootApp(MyApplication.getInstance().getPackageName());
@ -304,6 +305,9 @@ public class UpdateFileActivity extends BaseActivity {
super.onResume();
currRoute = Constant.ROUTE_UPDATE_FILE;
LoggerUtil.e("UpdateFileActivity","onResume()");
//设备迁移使用
//DeviceData.saveDeviceInfo(DeviceData.HINT_SERVER_IP, "http://192.168.10.215");
//DeviceData.saveDeviceInfo(DeviceData.HINT_REG_KEY, "qNMWiv");
handler.removeMessages(TYPE_DOWNLOAD_H5);
handler.sendEmptyMessageDelayed(TYPE_DOWNLOAD_H5, 30000);
deviceType = DeviceData.getDeviceInfo(DeviceData.HINT_DEVICE_TYPE);//设备类型，导视，信发等

1
app/src/main/java/qianmu/container/activity/device/DeviceInfoActivity.java
View File

@ -19,7 +19,6 @@ import androidx.databinding.DataBindingUtil;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import cn.huidu.toolkit.HuiduTech;
import qianmu.container.R;
import qianmu.container.activity.BaseActivity;
import qianmu.container.activity.H5.CoreService;

3
app/src/main/java/qianmu/container/activity/program/ScreenSaverActivity.java
View File

@ -18,7 +18,6 @@ import androidx.recyclerview.widget.GridLayoutManager;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.google.gson.Gson;
import com.squareup.leakcanary.RefWatcher;
import com.sun.jna.Native;
import org.java_websocket.drafts.Draft_6455;
@ -337,8 +336,6 @@ public class ScreenSaverActivity extends BaseActivity {
protected void onDestroy() {
super.onDestroy();
LoggerUtil.e("ScreenSaverActivity", "onDestroy");
// RefWatcher refWatcher = MyApplication.getRefWatcher(this);
// refWatcher.watch(this);
}
@Override

4
app/src/main/java/qianmu/container/app/Constant.java
View File

@ -23,9 +23,9 @@ public class Constant {
public static boolean newGuide = false; // 指路机类型，true:新版指路机 false:老板指路机（流花）
public static String mqttState = ""; // 屏幕连接方式
// 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 = "xwst2"; //设备板子型号 xwst2（欣威视通3588、T982、3576）
// public static String androidBoardType = "zc"; //设备板子型号 zc（卓策主板——王府井喜悦、杨浦中心医院）
// public static String androidBoardType = "sx"; //设备板子型号 sx（视想）
// public static String androidBoardType = "nova"; //设备板子型号 诺瓦盒子 华贸LED

22
app/src/main/java/qianmu/container/data/PowerData.java
View File

@ -214,26 +214,10 @@ public class PowerData extends BaseData {
}else if (Constant.androidBoardType.equals("xwst2")){
SdkApi.getInstance().TimerSwitch().setTimerSwitchOnoff(true);
SdkApi.getInstance().TimerSwitch().setTimerType(true);
if(parameterLong > bootLong) {
//当天关机，第二天开机
SdkApi.getInstance().TimerSwitch().setTimerOnYmdTime(dateFormat.format(currentLong+24*60*60*1000)+" "+bootTime2);
SdkApi.getInstance().TimerSwitch().setTimerOffYmdTime(s+" "+parameter);
LoggerUtil.e("PowerData()", "关机时间："+s + " " + parameter+"，开机时间："+dateFormat.format(currentLong+24*60*60*1000)+" "+bootTime2);
}else {
if(currentLong > bootLong){
//第二天关机，第二天开机
SdkApi.getInstance().TimerSwitch().setTimerOnYmdTime(s2+" "+bootTime);
SdkApi.getInstance().TimerSwitch().setTimerOffYmdTime(s2+" "+parameter);
LoggerUtil.e("PowerData()", "关机时间："+ s2 + " " + parameter+"，开机时间："+s2 + " " + bootTime);
}else {
//当天关机，当天开机
boolean b = SdkApi.getInstance().TimerSwitch().setTimerOnYmdTime(s + " " + bootTime);
boolean b1 = SdkApi.getInstance().TimerSwitch().setTimerOffYmdTime(s + " " + parameter);
Log.e("TAG","设置结果："+b+","+b1);
LoggerUtil.e("PowerData()", "关机时间："+s + " " + parameter+"，开机时间："+s + " " + bootTime);
}
}
boolean b = SdkApi.getInstance().TimerSwitch().setTimerOnTime(bootTime);
boolean b1 = SdkApi.getInstance().TimerSwitch().setTimerOffTime(parameter);
LoggerUtil.e("PowerData()", "关机时间："+ parameter+ String.valueOf(b)+"，开机时间："+ bootTime+ String.valueOf(b1));
}else if(Constant.androidBoardType.equals("ys")){
//按周：关机时间要在开机时间之后 按天：关机时间在开机时间之前

10
app/src/main/java/qianmu/container/handler/ContainerHandler.java
View File

@ -119,16 +119,6 @@ public class ContainerHandler extends Handler {
if(RootCmdUtil.HDMIEnabled()){
PowerData.updatePowerOnOrOffTime();
}
}else if(Constant.androidBoardType.equals("xwst2") && Constant.screenType.equals("HDMI")){
RootCmdUtil.checkHDMIEnabled(new HdmiStatusCallback() {
@Override
public void onResult(boolean isEnabled) {
LoggerUtil.e("mqttState","HDMI结果："+isEnabled+",mqttState结果:"+Constant.mqttState);
if(isEnabled){
PowerData.updatePowerOnOrOffTime();
}
}
});
}else {
PowerData.updatePowerOnOrOffTime();
}

Write Preview
Loading…
Cancel
Save