diff --git a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java index 1d12ef561b..2bac694d83 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java @@ -208,19 +208,23 @@ public class UpdateManager { // 显示助手有更新提示框 private void showUpdateDialog(final String md5) { final Dialog updateDialog = new Dialog(mContext); + Window window = updateDialog.getWindow(); + if (window != null) { + window.setBackgroundDrawableResource(android.R.color.transparent); + } View view = View.inflate(mContext, R.layout.app_update_hint_dialog, null); - TextView content = view.findViewById(R.id.updeta_content); + TextView content = view.findViewById(R.id.desc); content.setText(Html.fromHtml(appEntity.getContent())); - TextView version = view.findViewById(R.id.update_app_version); - version.setText(String.format("光环助手V%s更新内容:", appEntity.getVersion())); + TextView version = view.findViewById(R.id.version); + version.setText(String.format("版本%s更新日志:", appEntity.getVersion())); - TextView size = view.findViewById(R.id.update_app_size); - size.setText(String.format("大小:%s", appEntity.getSize())); + TextView size = view.findViewById(R.id.size); + size.setText(String.format("大小 %s", appEntity.getSize())); - view.findViewById(R.id.update_cancel).setOnClickListener( + view.findViewById(R.id.cancel).setOnClickListener( v -> { if (appEntity.isForce()) { AppManager.getInstance().finishAllActivity(); @@ -229,7 +233,7 @@ public class UpdateManager { } }); - view.findViewById(R.id.update_confirm).setOnClickListener( + view.findViewById(R.id.confirm).setOnClickListener( v -> { updateDialog.dismiss(); String path = FileUtils.getDownloadPath(mContext, diff --git a/app/src/main/res/drawable-xxxhdpi/app_update_cancel.png b/app/src/main/res/drawable-xxxhdpi/app_update_cancel.png new file mode 100644 index 0000000000..e7a03483a3 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/app_update_cancel.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/app_update_head.png b/app/src/main/res/drawable-xxxhdpi/app_update_head.png new file mode 100644 index 0000000000..bc4c2ee34c Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/app_update_head.png differ diff --git a/app/src/main/res/drawable/app_update_background.xml b/app/src/main/res/drawable/app_update_background.xml new file mode 100644 index 0000000000..9e1808cba1 --- /dev/null +++ b/app/src/main/res/drawable/app_update_background.xml @@ -0,0 +1,10 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/app_update_hint_dialog.xml b/app/src/main/res/layout/app_update_hint_dialog.xml index 3f7c2b8a57..0cc6358cc3 100644 --- a/app/src/main/res/layout/app_update_hint_dialog.xml +++ b/app/src/main/res/layout/app_update_hint_dialog.xml @@ -1,109 +1,122 @@ - + - + - - - - - - - - - - - - - - - - + android:id="@+id/head_background" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:scaleType="fitXY" + android:src="@drawable/app_update_head" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + android:layout_width="0dp" + android:layout_height="0dp" + android:background="@drawable/app_update_background" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toBottomOf="@id/head_background" /> - + - + - - - + + - \ No newline at end of file + + + + + + + \ No newline at end of file