Browse Source

fix: ci

master
高志龙 4 months ago
parent
commit
d87aef7f87
  1. 13
      app/src/main/java/qianmu/container/activity/H5/UpdateFileActivity.java
  2. 14
      app/src/main/java/qianmu/container/activity/device/DeviceInfoActivity.java
  3. 3
      app/src/main/java/qianmu/container/util/SignWayUtil.java

13
app/src/main/java/qianmu/container/activity/H5/UpdateFileActivity.java

@ -266,18 +266,7 @@ public class UpdateFileActivity extends BaseActivity {
SdkApi.newInstance(this);
}
LoggerUtil.e("当前版本号: ",DeviceUtil.getVersionName());
try{
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
if(!Environment.isExternalStorageManager()){
Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
intent.setData(Uri.parse("package:" + this.getPackageName())); // 设置要申请权限的应用包名
startActivity(intent); // 启动活动以请求用户授权
return;
}
}
}catch (ActivityNotFoundException e){
}
//设置开机自启应用
if(Constant.androidBoardType.equals("smt")){
MyApplication.getInstance().getSmdt().sys_setSystemBootApp(MyApplication.getInstance().getPackageName());
@ -447,7 +436,7 @@ public class UpdateFileActivity extends BaseActivity {
.setProductKey(productKey)
.setProductSecret(productSecret)
.create();
config.setExtraParameter("DEVICE_NAME", code);
//config.setExtraParameter("DEVICE_NAME", code);
DUILiteSDK.init(getApplicationContext());
// SDK 授权
DUILiteSDK.doAuth(getApplicationContext(), config, new DUILiteSDK.InitListener() {

14
app/src/main/java/qianmu/container/activity/device/DeviceInfoActivity.java

@ -3,6 +3,7 @@ package qianmu.container.activity.device;
import android.Manifest;
import android.app.Activity;
import android.app.ActivityManager;
import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
@ -59,6 +60,18 @@ public class DeviceInfoActivity extends BaseActivity {
serverInfo = new ViewServerInfo(this, binding.viewServerInfo.getRoot());
deviceInfo = new ViewDeviceInfo(this, binding.viewDeviceInfo.getRoot());
inputPassword = new ViewInputPassword(this, binding.viewInputPassword.getRoot());
try{
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
if(!Environment.isExternalStorageManager()){
Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
intent.setData(Uri.parse("package:" + this.getPackageName()));
startActivity(intent);
return;
}
}
}catch (Exception e){
ToastUtils.showToast("申请文件权限失败,请手动前往设置开启");
}
setPermission();
}
@ -73,7 +86,6 @@ public class DeviceInfoActivity extends BaseActivity {
boolean result = getIntent().getBooleanExtra(Constant.INPUT_PASSWORD, false);
if (result) showInputPassword();
else showServerInfo();
}
@Override

3
app/src/main/java/qianmu/container/util/SignWayUtil.java

@ -348,7 +348,8 @@ public class SignWayUtil {
zcApi.setGestureStatusBar(type);
}else if(Constant.androidBoardType.equals("huidu")){
HuiduTech helper = new HuiduTech(MyApplication.getInstance());
// helper.showNavigationBar(!type);
helper.showNavigationBar(type);
helper.showStatusBar(type);
}
} catch (Throwable t) {

Loading…
Cancel
Save