moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：修复错误改动

Browse Source
This commit is contained in:
Max
2023-11-15 22:03:21 +08:00
parent 1d4f1492f9
commit cedc402455
3 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/yizhuan/habu/ui/widget/dialog/CommonLoadingDialog.java
View File

@@ -23,7 +23,7 @@ public class CommonLoadingDialog extends BaseDialog {
private String msg = ResUtil.getString(R.string.widget_dialog_commonloadingdialog_01);
private TextView tvTip;
private SVGAImageView loading;
// private SVGAImageView loading;
public CommonLoadingDialog(Context context, String tip) {
super(context, R.style.dialog);
@@ -40,7 +40,7 @@ public class CommonLoadingDialog extends BaseDialog {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.layout_progress_dialog);
loading = (SVGAImageView) findViewById(R.id.dialog_loading) ;
// loading = (SVGAImageView) findViewById(R.id.dialog_loading) ;
tvTip = (TextView) findViewById(R.id.tv_tip);
tvTip.setText(msg);
}
@@ -64,10 +64,10 @@ public class CommonLoadingDialog extends BaseDialog {
return this;
}
@Override
public void onDetachedFromWindow() {
super.onDetachedFromWindow();
loading.stopAnimation();
loading.clear();
}
// @Override
// public void onDetachedFromWindow() {
// super.onDetachedFromWindow();
// loading.stopAnimation();
// loading.clear();
// }
}

33
app/src/main/res/layout/dialog_loading.xml
View File

@@ -1,21 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_gravity="center"
android:gravity="center_horizontal"
android:background="@drawable/toast_bg"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical">
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/dialog_loading"
android:layout_width="240dp"
android:layout_height="160dp"
app:autoPlay="true"
app:source="svga/loading.svga" />
<!-- <ProgressBar-->
<!-- <com.opensource.svgaplayer.SVGAImageView-->
<!-- android:id="@+id/dialog_loading"-->
<!-- android:layout_width="240dp"-->
<!-- android:layout_height="wrap_content"/>-->
<!-- android:layout_height="160dp"-->
<!-- app:autoPlay="true"-->
<!-- app:source="svga/loading.svga" />-->
<ProgressBar
android:id="@+id/loading_progress"
style="@style/progressDialog"
android:layout_width="35dp"
android:layout_height="37.5dp"
android:layout_marginTop="30dp"
android:layout_centerHorizontal="true"
android:indeterminate="false" />
<TextView
android:layout_width="wrap_content"
@@ -23,7 +30,7 @@
android:layout_gravity="center"
android:layout_marginTop="16dp"
android:text="@string/layout_dialog_loading_01"
android:textColor="#ffc9bcf2"
android:textColor="#FFFFFF"
android:textSize="16sp" />
</LinearLayout>

3
app/src/main/res/layout/layout_progress_dialog.xml
View File

@@ -7,8 +7,7 @@
android:layout_gravity="center"
android:gravity="center_horizontal"
android:background="@drawable/toast_bg"
android:orientation="vertical"
tools:background="@color/black_transparent_10">
android:orientation="vertical">
<!-- <com.opensource.svgaplayer.SVGAImageView-->
<!-- android:id="@+id/dialog_loading"-->