Skip to content

Commit bcf1e75

Browse files
committed
增加加载工具LoadDialogUtils
1 parent d5848a7 commit bcf1e75

File tree

10 files changed

+248
-162
lines changed

10 files changed

+248
-162
lines changed

README.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ allprojects {
1717
```groovy
1818
dependencies {
1919
//多个物联网相关基础工具类
20-
implementation 'com.github.wave-chtj:BaseIotUtils:2.7.1'
20+
implementation 'com.github.wave-chtj:BaseIotUtils:2.8.0'
2121
}
2222
```
2323

@@ -95,9 +95,26 @@ public class App extends Application {
9595
| 33 | PopupWindowTools | 气泡提示 | 某个控件的上,下,左,右弹出 |
9696
| 34 | CodeUtils | 二维码,条形码生成 | 按条件生成二维码,条形码 |
9797
| 35 | FileDialogSelectUtils | 文件多选返回 | 递归选中文件夹下文件 |
98+
| 36 | LoadDialogUtils | 加载中(全局) | 帧列表,单图片360旋转 |
9899

99100
## base_iotutils 工具调用方式,及图片展示
100101

102+
#### LoadDialogUtils 递归多选文件夹下文件
103+
104+
```java
105+
//使用示例:一张时为360旋转,大于一张时为逐个切换
106+
List<Integer> pngList = Arrays.asList(
107+
R.drawable.loading_1,
108+
R.drawable.loading_2,
109+
R.drawable.loading_3
110+
);
111+
LoadDialogUtils dialog = new LoadDialogUtils(this, pngList);
112+
dialog.setImageSize(80, 80);
113+
dialog.showLoading();
114+
隐藏
115+
dialog.hideLoading();
116+
```
117+
101118
#### FileDialogSelectUtils 递归多选文件夹下文件
102119

103120
```java

app/src/main/java/com/ichtj/basetools/MainActivity.java

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
import com.ichtj.basetools.util.CustomButtonGridView;
7070
import com.ichtj.basetools.util.FKey;
7171
import com.ichtj.basetools.util.JXLExcelUtils;
72-
import com.ichtj.basetools.util.LoadingDialog;
72+
import com.face_chtj.base_iotutils.LoadDialogUtils;
7373
import com.ichtj.basetools.util.OptionTools;
7474
import com.ichtj.basetools.util.PACKAGES;
7575
import com.ichtj.basetools.util.POIExcelUtils;
@@ -81,6 +81,7 @@
8181

8282
import java.io.File;
8383
import java.io.InputStream;
84+
import java.util.ArrayList;
8485
import java.util.Arrays;
8586
import java.util.HashMap;
8687
import java.util.List;
@@ -487,27 +488,24 @@ public void onFileSelected(List<File> selected) {
487488
fileDialogSelectUtils.show();
488489
break;
489490
case FKey.KEY_LOADDING_DIALOG:
490-
int[] frames = new int[] {
491-
R.drawable.ic_1,
492-
R.drawable.ic_2,
493-
R.drawable.ic_3,
494-
R.drawable.ic_4,
495-
R.drawable.ic_5,
496-
R.drawable.ic_6
497-
};
498-
499-
LoadingDialog loadingDialog = new LoadingDialog(this);
500-
491+
List<Integer> pngList = new ArrayList<>();
492+
pngList.add(R.drawable.ic_1);
493+
// pngList.add(R.drawable.ic_2);
494+
// pngList.add(R.drawable.ic_3);
495+
// pngList.add(R.drawable.ic_4);
496+
// pngList.add(R.drawable.ic_5);
497+
// pngList.add(R.drawable.ic_6);
498+
LoadDialogUtils loadDialogUtils = new LoadDialogUtils(this);
501499
// 情况一:PNG 列表
502-
loadingDialog.setLoadingImages(frames, 100, 100, 1200);
503-
loadingDialog.showLoading();
504-
505-
// 情况二:仅一张图旋转
506-
// loadingDialog.setLoadingImages(new int[]{R.drawable.loading_icon}, 100, 100, 0);
507-
// loadingDialog.showLoading();
500+
loadDialogUtils.setPngList(pngList);
501+
loadDialogUtils.showLoading();
508502

509-
// 关闭时
510-
// loadingDialog.hideLoading();
503+
customButtonGridView.getSelectButton().postDelayed(new Runnable() {
504+
@Override
505+
public void run() {
506+
loadDialogUtils.hideLoading();
507+
}
508+
},3000);
511509
break;
512510
}
513511
}

app/src/main/java/com/ichtj/basetools/dialog/DialogAty.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@
77

88
import com.face_chtj.base_iotutils.DialogUtils;
99
import com.face_chtj.base_iotutils.KLog;
10+
import com.face_chtj.base_iotutils.LoadDialogUtils;
1011
import com.face_chtj.base_iotutils.callback.IDialogCallback;
1112
import com.ichtj.basetools.R;
1213
import com.ichtj.basetools.base.BaseActivity;
1314

15+
import java.util.ArrayList;
16+
import java.util.List;
17+
1418
public class DialogAty extends BaseActivity {
1519
@Override
1620
protected void onCreate(@Nullable Bundle savedInstanceState) {

app/src/main/java/com/ichtj/basetools/install/InstallAPkAty.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,8 @@ public void onFileSelected(List<File> selected) {
138138
if (selected==null&&selected.size()<=0){
139139
return;
140140
}
141-
Log.d(TAG, "onFileSelected: "+selected);
142-
// ShellUtils.CommandResult commandResult=ShellUtils.execCommand("pm install -r /sdcard/pkgSearch.apk",true);
143-
// Log.d(TAG, "onFileSelected: commandResult>>"+commandResult);
141+
ShellUtils.CommandResult commandResult=ShellUtils.execCommand("pm install -r "+selected.get(0),true);
142+
Log.d(TAG, "onFileSelected: commandResult>>"+commandResult);
144143
}
145144
}).setSizeRatio(0.5f,0.5f,30).setSingleSelect(true);
146145
fileDialogSelectUtils.show();

app/src/main/java/com/ichtj/basetools/test/ReadImeiAty.java

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.face_chtj.base_iotutils.FormatViewUtils;
1414
import com.ichtj.basetools.R;
1515
import com.ichtj.basetools.base.BaseActivity;
16-
import com.ichtj.basetools.util.LoadingDialog;
1716
import com.ichtj.basetools.util.PACKAGES;
1817

1918
@Route(path = PACKAGES.BASE + "readimei")
@@ -40,27 +39,6 @@ public void run() {
4039
}
4140
}
4241
}.start();
43-
int[] frames = new int[] {
44-
R.drawable.ic_1,
45-
R.drawable.ic_2,
46-
R.drawable.ic_3,
47-
R.drawable.ic_4,
48-
R.drawable.ic_5,
49-
R.drawable.ic_6
50-
};
51-
52-
LoadingDialog loadingDialog = new LoadingDialog(this);
53-
54-
// 情况一:PNG 列表
55-
loadingDialog.setLoadingImages(frames, 100, 100, 1200);
56-
loadingDialog.showLoading();
57-
58-
// 情况二:仅一张图旋转
59-
// loadingDialog.setLoadingImages(new int[]{R.drawable.loading_icon}, 100, 100, 0);
60-
// loadingDialog.showLoading();
61-
62-
// 关闭时
63-
// loadingDialog.hideLoading();
6442
}
6543
Handler handler=new Handler(){
6644
@Override

app/src/main/java/com/ichtj/basetools/test/TestAty.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@
44
import android.content.Intent;
55
import android.os.Bundle;
66
import android.util.Log;
7-
import android.widget.TextView;
87

98
import androidx.annotation.Nullable;
10-
import androidx.viewpager.widget.ViewPager;
119

1210
import com.alibaba.android.arouter.facade.annotation.Route;
1311
import com.ichtj.basetools.R;
1412
import com.ichtj.basetools.StartPageAty;
1513
import com.ichtj.basetools.base.BaseActivity;
1614
import com.ichtj.basetools.util.AppManager;
17-
import com.ichtj.basetools.util.LoadingDialog;
1815
import com.ichtj.basetools.util.PACKAGES;
1916

2017
import java.io.BufferedReader;

app/src/main/java/com/ichtj/basetools/util/LoadingDialog.java

Lines changed: 0 additions & 112 deletions
This file was deleted.

app/src/main/res/drawable/loader.png

451 Bytes
Loading

app/src/main/res/values/styles.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<item name="android:windowIsFloating">true</item>
88
<item name="android:windowIsTranslucent">true</item>
99
</style>
10-
1110
<!-- Base application theme. -->
1211
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
1312
<!-- Customize your theme here. -->

0 commit comments

Comments
 (0)