Sfoglia il codice sorgente

1、报告中添加加载框

LAPTOP-AMA5TPO8\zhongyi 4 anni fa
parent
commit
b34bd0eeb3
40 ha cambiato i file con 15 aggiunte e 129 eliminazioni
  1. 3 0
      app/build.gradle
  2. 8 3
      app/src/main/java/com/zy/bvvm/pdf/RportPDFActivity.java
  3. 0 1
      base/build/.transforms/99c94e6dfa3defcf8a489de04d2cad43.bin
  4. BIN
      base/build/.transforms/99c94e6dfa3defcf8a489de04d2cad43/full/classes.dex
  5. 0 0
      base/build/intermediates/annotations_typedef_file/debug/extractDebugAnnotations/typedefs.txt
  6. BIN
      base/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar
  7. 0 108
      base/build/intermediates/consumer_proguard_file/debug/proguard.txt
  8. BIN
      base/build/intermediates/incremental/debug-mergeJavaRes/merge-state
  9. 1 1
      base/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
  10. BIN
      base/build/intermediates/merged_java_res/debug/out.jar
  11. BIN
      base/build/intermediates/packaged-classes/debug/classes.jar
  12. BIN
      base/build/outputs/aar/base-debug.aar
  13. 0 1
      dialog/build/.transforms/28ea01ba0e1b861ce3c56c11ffa92e07.bin
  14. BIN
      dialog/build/.transforms/28ea01ba0e1b861ce3c56c11ffa92e07/full/classes.dex
  15. 0 0
      dialog/build/intermediates/annotations_typedef_file/debug/extractDebugAnnotations/typedefs.txt
  16. BIN
      dialog/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar
  17. BIN
      dialog/build/intermediates/incremental/debug-mergeJavaRes/merge-state
  18. 1 1
      dialog/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
  19. BIN
      dialog/build/intermediates/merged_java_res/debug/out.jar
  20. BIN
      dialog/build/intermediates/packaged-classes/debug/classes.jar
  21. BIN
      dialog/build/outputs/aar/dialog-debug.aar
  22. 0 1
      image/build/.transforms/be758a1deb7ef6d6656923eebd710cbc.bin
  23. BIN
      image/build/.transforms/be758a1deb7ef6d6656923eebd710cbc/full/classes.dex
  24. 0 0
      image/build/intermediates/annotations_typedef_file/debug/extractDebugAnnotations/typedefs.txt
  25. BIN
      image/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar
  26. 0 10
      image/build/intermediates/consumer_proguard_file/debug/proguard.txt
  27. BIN
      image/build/intermediates/incremental/debug-mergeJavaRes/merge-state
  28. 1 1
      image/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
  29. BIN
      image/build/intermediates/merged_java_res/debug/out.jar
  30. BIN
      image/build/intermediates/packaged-classes/debug/classes.jar
  31. BIN
      image/build/outputs/aar/image-debug.aar
  32. 0 1
      widget/build/.transforms/6a13e918dcd6ed1506828fd2778cf310.bin
  33. BIN
      widget/build/.transforms/6a13e918dcd6ed1506828fd2778cf310/full/classes.dex
  34. 0 0
      widget/build/intermediates/annotations_typedef_file/debug/extractDebugAnnotations/typedefs.txt
  35. BIN
      widget/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar
  36. BIN
      widget/build/intermediates/incremental/debug-mergeJavaRes/merge-state
  37. 1 1
      widget/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
  38. BIN
      widget/build/intermediates/merged_java_res/debug/out.jar
  39. BIN
      widget/build/intermediates/packaged-classes/debug/classes.jar
  40. BIN
      widget/build/outputs/aar/widget-debug.aar

+ 3 - 0
app/build.gradle

@@ -197,4 +197,7 @@ dependencies {
     implementation "androidx.core:core-ktx:1.3.2"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
+    //弹窗样式
+    implementation 'com.github.limxing:Android-PromptDialog:1.1.3'
+
 }

+ 8 - 3
app/src/main/java/com/zy/bvvm/pdf/RportPDFActivity.java

@@ -37,6 +37,7 @@ import java.io.InputStream;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import me.leefeng.promptlibrary.PromptDialog;
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.Response;
@@ -108,6 +109,7 @@ public class RportPDFActivity extends MvpActivity<VnDetailPresenter> implements
             Manifest.permission.READ_EXTERNAL_STORAGE,
     };
     private String nextbtn;
+    private PromptDialog promptDialog;
 
 
     @Override
@@ -115,6 +117,8 @@ public class RportPDFActivity extends MvpActivity<VnDetailPresenter> implements
         super.onCreate(savedInstanceState);
 //        setContentView(R.layout.activity_rport_p_d_f);
         ButterKnife.bind(this);    //必须要这一句,不然会出现奔溃
+        promptDialog = new PromptDialog(this);
+        promptDialog.showLoading("数据加载中");
     }
 
     @Override
@@ -144,9 +148,7 @@ public class RportPDFActivity extends MvpActivity<VnDetailPresenter> implements
             @Override
             public void onLeftClick(View v) {
                 //判断数据来源
-                if (nextbtn.equals("read")) {
-                    finish();
-                }
+                finish();
             }
 
             @Override
@@ -319,8 +321,11 @@ public class RportPDFActivity extends MvpActivity<VnDetailPresenter> implements
                         map_address.setVisibility(View.GONE);
                     }
                     map_image.setImageBitmap((Bitmap) msg.obj);
+                    promptDialog.dismissImmediately();
                     break;
                 case ERROR:
+                    promptDialog.showError("请求超时");
+                    promptDialog.dismissImmediately();
                     Toast.makeText(RportPDFActivity.this, "请求超时", Toast.LENGTH_SHORT).show();
 
                     break;

+ 0 - 1
base/build/.transforms/99c94e6dfa3defcf8a489de04d2cad43.bin

@@ -1 +0,0 @@
-o/full

BIN
base/build/.transforms/99c94e6dfa3defcf8a489de04d2cad43/full/classes.dex


+ 0 - 0
base/build/intermediates/annotations_typedef_file/debug/extractDebugAnnotations/typedefs.txt


BIN
base/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar


+ 0 - 108
base/build/intermediates/consumer_proguard_file/debug/proguard.txt

@@ -1,108 +0,0 @@
-# 指定代码的压缩级别
--optimizationpasses 5
-
-# 包明不混合大小写
--dontusemixedcaseclassnames
-
-# 不去忽略非公共的库类
--dontskipnonpubliclibraryclasses
-
-# 优化  不优化输入的类文件
--dontoptimize
-
-# 预校验
--dontpreverify
-
-# 混淆时是否记录日志
--verbose
-
-# 混淆时所采用的算法
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
-
-# 保护注解
--keepattributes *Annotation*
-
-# 保持哪些类不被混淆
--keep public class * extends android.app.Fragment
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
--keep public class com.android.vending.licensing.ILicensingService
-
-######## 记录生成的日志数据,gradle build时在本项目根目录输出 ########
-
-# apk 包内所有 class 的内部结构
--dump class_files.txt
-# 未混淆的类和成员
--printseeds seeds.txt
-# 列出从 apk 中删除的代码
--printusage unused.txt
-# 混淆前后的映射
--printmapping mapping.txt
-
-######## 记录生成的日志数据,gradle build时 在本项目根目录输出 ########
-
-# 保持 native 方法不被混淆
--keepclasseswithmembernames class * {
-    native <methods>;
-}
-
-# 保持自定义控件类不被混淆
--keepclassmembers class * extends android.app.Activity {
-   public void *(android.view.View);
-}
--keep public class * extends android.view.View {
-    public <init>(android.content.Context);
-    public <init>(android.content.Context, android.util.AttributeSet);
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-    public void set*(...);
-}
-
-# 保持 Parcelable 不被混淆
--keep class * implements android.os.Parcelable {
-  public static final android.os.Parcelable$Creator *;
-}
-
-# 保持 Serializable 不被混淆
--keepnames class * implements java.io.Serializable
-
-# 保持 Serializable 不被混淆并且enum 类也不被混淆
--keepclassmembers class * implements java.io.Serializable {
-    static final long serialVersionUID;
-    private static final java.io.ObjectStreamField[] serialPersistentFields;
-    !static !transient <fields>;
-    !private <fields>;
-    !private <methods>;
-    private void writeObject(java.io.ObjectOutputStream);
-    private void readObject(java.io.ObjectInputStream);
-    java.lang.Object writeReplace();
-    java.lang.Object readResolve();
-}
-
-# 保持枚举 enum 类不被混淆 如果混淆报错,建议直接使用上面的 -keepclassmembers class * implements java.io.Serializable即可
--keepclassmembers enum * {
-  public static **[] values();
-  public static ** valueOf(java.lang.String);
-}
-
--keepclassmembers class * {
-    public void *ButtonClicked(android.view.View);
-}
-
-# 不混淆资源类
--keepclassmembers class **.R$* {
-    public static <fields>;
-}
-
-# 避免混淆泛型 如果混淆报错建议关掉
--keepattributes Signature
-
-# Android 混淆的误区
-# 网上很多现成并且成熟的混淆规则,大家参考一下即可,但是不要盲目照找,我们现在大家理解每个混淆规则是什么意思,自己参照的时候注意一下。
-# 举个例子,我们现在开发 Android 我们肯定会引用 support-v4 、support-v7 ,但是 support 包里面的功能我们不可能全部都使用到。
-# 而网上有很多博客中写了 keep 掉 v7 v4 包,其实我们是没有必要的。要知道 v7 包足足有 15000 个左右的方法呢!进行混淆是很有必要的。
-# -dontwarn android.support.**

BIN
base/build/intermediates/incremental/debug-mergeJavaRes/merge-state


+ 1 - 1
base/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Mon Jul 26 17:39:52 CST 2021
+#Thu Aug 19 10:37:10 CST 2021
 F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_from_bottom.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\layout_animation_from_bottom.xml
 F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_right_in.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_right_in.xml
 F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_right_out.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_right_out.xml

BIN
base/build/intermediates/merged_java_res/debug/out.jar


BIN
base/build/intermediates/packaged-classes/debug/classes.jar


BIN
base/build/outputs/aar/base-debug.aar


+ 0 - 1
dialog/build/.transforms/28ea01ba0e1b861ce3c56c11ffa92e07.bin

@@ -1 +0,0 @@
-o/full

BIN
dialog/build/.transforms/28ea01ba0e1b861ce3c56c11ffa92e07/full/classes.dex


+ 0 - 0
dialog/build/intermediates/annotations_typedef_file/debug/extractDebugAnnotations/typedefs.txt


BIN
dialog/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar


BIN
dialog/build/intermediates/incremental/debug-mergeJavaRes/merge-state


+ 1 - 1
dialog/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Mon Jul 26 17:39:53 CST 2021
+#Thu Aug 19 10:37:10 CST 2021
 F\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_finish.png=F\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_finish.png
 F\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_pay_password_item_del_selector.xml=F\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_pay_password_item_del_selector.xml
 F\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\layout\\item_dialog_pay_password.xml=F\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\item_dialog_pay_password.xml

BIN
dialog/build/intermediates/merged_java_res/debug/out.jar


BIN
dialog/build/intermediates/packaged-classes/debug/classes.jar


BIN
dialog/build/outputs/aar/dialog-debug.aar


+ 0 - 1
image/build/.transforms/be758a1deb7ef6d6656923eebd710cbc.bin

@@ -1 +0,0 @@
-o/full

BIN
image/build/.transforms/be758a1deb7ef6d6656923eebd710cbc/full/classes.dex


+ 0 - 0
image/build/intermediates/annotations_typedef_file/debug/extractDebugAnnotations/typedefs.txt


BIN
image/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar


+ 0 - 10
image/build/intermediates/consumer_proguard_file/debug/proguard.txt

@@ -1,10 +0,0 @@
-# Glide
--keep public class * implements com.bumptech.glide.module.GlideModule
--keep public class * extends com.bumptech.glide.module.AppGlideModule
--keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
-  **[] $VALUES;
-  public *;
-}
-
-# for DexGuard only
-# -keepresourcexmlelements manifest/application/meta-data@value=GlideModule

BIN
image/build/intermediates/incremental/debug-mergeJavaRes/merge-state


+ 1 - 1
image/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Mon Jul 26 17:39:53 CST 2021
+#Thu Aug 19 10:37:10 CST 2021
 F\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-xhdpi\\image_loading.png=F\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\image_loading.png
 F\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-xhdpi\\image_load_err.png=F\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\image_load_err.png
 F\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-hdpi\\image_loading.png=F\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-hdpi-v4\\image_loading.png

BIN
image/build/intermediates/merged_java_res/debug/out.jar


BIN
image/build/intermediates/packaged-classes/debug/classes.jar


BIN
image/build/outputs/aar/image-debug.aar


+ 0 - 1
widget/build/.transforms/6a13e918dcd6ed1506828fd2778cf310.bin

@@ -1 +0,0 @@
-o/full

BIN
widget/build/.transforms/6a13e918dcd6ed1506828fd2778cf310/full/classes.dex


+ 0 - 0
widget/build/intermediates/annotations_typedef_file/debug/extractDebugAnnotations/typedefs.txt


BIN
widget/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar


BIN
widget/build/intermediates/incremental/debug-mergeJavaRes/merge-state


+ 1 - 1
widget/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Mon Jul 26 17:39:52 CST 2021
+#Thu Aug 19 10:37:10 CST 2021
 F\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\drawable-hdpi\\ic_stat_name.png=F\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\ic_stat_name.png
 F\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\drawable-xxhdpi\\ic_stat_name.png=F\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\ic_stat_name.png
 F\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\layout\\widget_hint_layout.xml=F\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\layout\\widget_hint_layout.xml

BIN
widget/build/intermediates/merged_java_res/debug/out.jar


BIN
widget/build/intermediates/packaged-classes/debug/classes.jar


BIN
widget/build/outputs/aar/widget-debug.aar