Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release' into dev-4.7.0

Browse Source 
# Conflicts:
#	app/src/main/java/com/gh/common/exposure/ExposureManager.kt
#	app/src/main/java/com/gh/common/videolog/VideoRecordUtils.kt
#	app/src/main/res/drawable-nodpi/splash_01.webp
This commit is contained in:
juntao
2021-01-19 12:02:39 +08:00
parent f216bf4097 c540c14e1c
commit f73048d3a5
21 changed files with 135 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/gh/common/util/DialogUtils.java
View File

@ -1953,7 +1953,7 @@ public class DialogUtils {
return dialog;
}
public static void showEnergyDialog(Context context, String userName, String energy) {
public static void showEnergyDialog(Context context, String userName, int energy) {
context = checkDialogContext(context);
final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);