version:1.7.5

fix:
update:增加使用手册二级页面
This commit is contained in:
2024-03-12 17:03:23 +08:00
parent 0cfb4b93b4
commit 96ef02020a
27 changed files with 835 additions and 44 deletions

View File

@@ -0,0 +1,57 @@
package com.uiui.zyos.activity;
import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
import androidx.databinding.DataBindingUtil;
import com.uiui.zyos.R;
import com.uiui.zyos.base.BaseDataBindingActivity;
import com.uiui.zyos.databinding.ActivityAboutBinding;
public class AboutActivity extends BaseDataBindingActivity {
private ActivityAboutBinding mBinding;
/**
* 初始化视图
*/
@Override
public void initView() {
mBinding = DataBindingUtil.setContentView(this, R.layout.activity_about);
mBinding.ivBack.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
}
/**
* 初始化数据
*/
@Override
public void initData() {
Intent intent = getIntent();
if (intent == null) return;
String title = intent.getStringExtra("title");
if (TextUtils.isEmpty(title)) return;
mBinding.setTitle(title);
switch (title) {
default:
case "关于激活":
mBinding.setImage(R.drawable.page_activation);
break;
case "学习资源下载":
mBinding.setImage(R.drawable.page_resource);
break;
case "关于管控平板":
mBinding.setImage(R.drawable.page_control);
break;
case "客服联系":
mBinding.setImage(R.drawable.page_service);
break;
}
}
}

View File

@@ -0,0 +1,63 @@
package com.uiui.zyos.activity;
import android.content.Intent;
import android.view.View;
import androidx.databinding.DataBindingUtil;
import com.uiui.zyos.R;
import com.uiui.zyos.base.BaseDataBindingActivity;
import com.uiui.zyos.databinding.ActivityManualBinding;
public class ManualActivity extends BaseDataBindingActivity {
ActivityManualBinding mBinding;
/**
* 初始化视图
*/
@Override
public void initView() {
mBinding = DataBindingUtil.setContentView(this, R.layout.activity_manual);
mBinding.clActivation.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(ManualActivity.this, AboutActivity.class);
intent.putExtra("title", "关于激活");
startActivity(intent);
}
});
mBinding.clResource.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(ManualActivity.this, AboutActivity.class);
intent.putExtra("title", "学习资源下载");
startActivity(intent);
}
});
mBinding.clControl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(ManualActivity.this, AboutActivity.class);
intent.putExtra("title", "关于管控平板");
startActivity(intent);
}
});
mBinding.clService.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(ManualActivity.this, AboutActivity.class);
intent.putExtra("title", "客服联系");
startActivity(intent);
}
});
}
/**
* 初始化数据
*/
@Override
public void initData() {
}
}

View File

@@ -260,7 +260,12 @@ public class MainActivity extends BaseActivity implements MainContact.MainView,
ComponentName cn = new ComponentName(RemoteManager.SN_PACKAGE_NAME, "com.uiui.zy.activity.EyeProtectionActivity");
Intent intent = new Intent();
intent.setComponent(cn);
startActivity(intent);
try {
startActivity(intent);
} catch (Exception e) {
Log.e(TAG, "onClick: " + e.getMessage());
ToastUtil.show("应用未安装");
}
}
});
cl_5.setOnClickListener(new View.OnClickListener() {

View File

@@ -17,6 +17,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.recyclerview.widget.RecyclerView;
import com.uiui.zyos.R;
import com.uiui.zyos.activity.ManualActivity;
import com.uiui.zyos.activity.PasswordActivity;
import com.uiui.zyos.bean.DesktopIcon;
import com.uiui.zyos.config.CommonConfig;
@@ -64,33 +65,42 @@ public class AppAdapter extends RecyclerView.Adapter<AppAdapter.AppHolder> {
holder.iv_icon.setImageDrawable(mContext.getResources().getDrawable(resID));
}
} else {
if (AppManager.ADD_NAME.equals(pkg)) {
holder.iv_icon.setImageDrawable(desktopIcon.getIcon());
} else if (AppManager.UPDATE_NAME.equals(pkg)) {
holder.iv_icon.setImageDrawable(desktopIcon.getIcon());
} else {
holder.iv_icon.setImageBitmap(BitmapUtils.getIconBitmap(mContext, desktopIcon.getIcon()));
switch (pkg) {
case AppManager.ADD_NAME:
case AppManager.UPDATE_NAME:
case AppManager.MANUAL_NAME:
holder.iv_icon.setImageDrawable(desktopIcon.getIcon());
break;
default:
holder.iv_icon.setImageBitmap(BitmapUtils.getIconBitmap(mContext, desktopIcon.getIcon()));
break;
}
}
holder.root.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (AppManager.ADD_NAME.equals(pkg)) {
mContext.startActivity(new Intent(mContext, PasswordActivity.class));
} else if (AppManager.UPDATE_NAME.equals(pkg)) {
Intent intent = new Intent();
ComponentName componentName = new ComponentName("com.uiui.zy", "com.uiui.zy.activity.update.UpdateActivity");
intent.setComponent(componentName);
mContext.startActivity(intent);
} else {
int setting_other_appInstaller = Settings.Global.getInt(mContext.getContentResolver(), CommonConfig.SETTING_OTHER_APPINSTALLER_KEY, 1);
if (setting_other_appInstaller == 0
&& !ApkUtils.isSystemApp(mContext, desktopIcon.getPackageName()
)) {
ToastUtil.show("已禁止应用打开");
} else {
OpenApkUtils.getInstance().openApp(desktopIcon.getPackageName(), desktopIcon.getClassName());
}
switch (pkg) {
case AppManager.ADD_NAME:
mContext.startActivity(new Intent(mContext, PasswordActivity.class));
break;
case AppManager.UPDATE_NAME:
Intent intent = new Intent();
ComponentName componentName = new ComponentName("com.uiui.zy", "com.uiui.zy.activity.update.UpdateActivity");
intent.setComponent(componentName);
mContext.startActivity(intent);
break;
case AppManager.MANUAL_NAME:
mContext.startActivity(new Intent(mContext, ManualActivity.class));
default:
int settingOtherAppInstaller = Settings.Global.getInt(mContext.getContentResolver(), CommonConfig.SETTING_OTHER_APPINSTALLER_KEY, 1);
if (settingOtherAppInstaller == 0
&& !ApkUtils.isSystemApp(mContext, desktopIcon.getPackageName()
)) {
ToastUtil.show("已禁止应用打开");
} else {
OpenApkUtils.getInstance().openApp(desktopIcon.getPackageName(), desktopIcon.getClassName());
}
break;
}
}

View File

@@ -0,0 +1,123 @@
package com.uiui.zyos.base;
import android.os.Bundle;
import androidx.annotation.CallSuper;
import androidx.annotation.CheckResult;
import androidx.annotation.ContentView;
import androidx.annotation.LayoutRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import com.trello.rxlifecycle4.LifecycleProvider;
import com.trello.rxlifecycle4.LifecycleTransformer;
import com.trello.rxlifecycle4.RxLifecycle;
import com.trello.rxlifecycle4.android.ActivityEvent;
import com.trello.rxlifecycle4.android.RxLifecycleAndroid;
import com.uiui.zyos.R;
import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.subjects.BehaviorSubject;
public abstract class BaseDataBindingActivity extends AppCompatActivity implements LifecycleProvider<ActivityEvent> {
public final BehaviorSubject<ActivityEvent> lifecycleSubject = BehaviorSubject.create();
public BaseDataBindingActivity() {
super();
}
@ContentView
public BaseDataBindingActivity(@LayoutRes int contentLayoutId) {
super(contentLayoutId);
}
@Override
@NonNull
@CheckResult
public final Observable<ActivityEvent> lifecycle() {
return lifecycleSubject.hide();
}
@Override
@NonNull
@CheckResult
public final <T> LifecycleTransformer<T> bindUntilEvent(@NonNull ActivityEvent event) {
return RxLifecycle.bindUntilEvent(lifecycleSubject, event);
}
@Override
@NonNull
@CheckResult
public final <T> LifecycleTransformer<T> bindToLifecycle() {
return RxLifecycleAndroid.bindActivity(lifecycleSubject);
}
@Override
@CallSuper
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
lifecycleSubject.onNext(ActivityEvent.CREATE);
// StatusBarUtil.init(this);
UltimateBarX.statusBar(this)
.transparent()
.colorRes(R.color.colorPrimaryDark)
.light(true)
.apply();
UltimateBarX.navigationBar(this)
.transparent()
.colorRes(R.color.colorPrimaryDark)
.light(true)
.apply();
initView();
initData();
}
/**
* 初始化视图
*/
public abstract void initView();
/**
* 初始化数据
*/
public abstract void initData();
@Override
@CallSuper
protected void onStart() {
super.onStart();
lifecycleSubject.onNext(ActivityEvent.START);
}
@Override
@CallSuper
protected void onResume() {
super.onResume();
lifecycleSubject.onNext(ActivityEvent.RESUME);
}
@Override
@CallSuper
protected void onPause() {
lifecycleSubject.onNext(ActivityEvent.PAUSE);
super.onPause();
}
@Override
@CallSuper
protected void onStop() {
lifecycleSubject.onNext(ActivityEvent.STOP);
super.onStop();
}
@Override
@CallSuper
protected void onDestroy() {
lifecycleSubject.onNext(ActivityEvent.DESTROY);
super.onDestroy();
}
}

View File

@@ -50,12 +50,17 @@ public class AppPresenter implements AppContact.AppPresenter {
updateDesktopIcon.setIcon(mContext.getDrawable(R.drawable.icon_update));
desktopIcons.add(desktopIcons.size(), updateDesktopIcon);
DesktopIcon manualIcon = new DesktopIcon();
manualIcon.setLable("使用手册");
manualIcon.setPackageName(AppManager.MANUAL_NAME);
manualIcon.setIcon(mContext.getDrawable(R.drawable.icon_manual));
desktopIcons.add(desktopIcons.size(), manualIcon);
DesktopIcon desktopIcon = new DesktopIcon();
desktopIcon.setLable("添加应用");
desktopIcon.setPackageName(AppManager.ADD_NAME);
desktopIcon.setIcon(mContext.getDrawable(R.drawable.icon_add));
desktopIcons.add(desktopIcons.size(), desktopIcon);
mView.setInstalledApp(desktopIcons);
}
}

View File

@@ -31,6 +31,7 @@ public class AppManager {
public static final String ADD_NAME = "com.zyos.add";
public static final String UPDATE_NAME = "com.zyos.update";
public static final String MANUAL_NAME = "com.zyos.manual";
private static final String SHOW_PACKAGE_KEY = "SHOW_PACKAGE_KEY";
@SuppressLint("StaticFieldLeak")

View File

@@ -0,0 +1,21 @@
package com.uiui.zyos.view;
import android.widget.ImageView;
import androidx.databinding.BindingAdapter;
import com.bumptech.glide.Glide;
public class ImageViewAdapter {
/**
* 自定义设置图片属性 - 在匹配时自定义命名空间会被忽略
*/
@BindingAdapter({"imageUrl"})
public static void loadImage(ImageView imageView, int id) {
Glide.with(imageView.getContext())
.load(id)
.into(imageView);
}
}