fix dialog bug

XinYiWorld · May 17, 2017 · c968b0e · c968b0e
1 parent 17288a3
commit c968b0e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/CZBaseDevTool/src/main/java/com/xinyi/czbasedevtool/base/manager/net_about/HttpMaster.java b/CZBaseDevTool/src/main/java/com/xinyi/czbasedevtool/base/manager/net_about/HttpMaster.java
@@ -83,7 +83,6 @@ public void doNext() {
             executeService(executor, requestCode, serviceClass, convertedClass, params, serviceExecuteMethod, isTargetBeanAsList);
         } catch (Exception e) {
             e.printStackTrace();
-        }finally {
             hideProgressView();
         }
     }
@@ -124,7 +123,6 @@ public void doNext() {
             executeServiceWithoutConvert(executor, requestCode, serviceClass, params, serviceExecuteMethod);
         } catch (Exception e) {
             e.printStackTrace();
-        }finally {
             hideProgressView();
         }
     }
@@ -152,7 +150,6 @@ public void doNext() {
             executeService(executor, requestCode, serviceClass, serviceExecuteMethod, uploadFileWrappers);
         } catch (Exception e) {
             e.printStackTrace();
-        }finally {
             hideProgressView();
         }
     }
@@ -183,7 +180,6 @@ public void doNext() {
             executeService(executor, requestCode, serviceClass, serviceExecuteMethod, parts);
         } catch (Exception e) {
             e.printStackTrace();
-        }finally {
             hideProgressView();
         }
     }
@@ -245,7 +241,6 @@ public void doNext() {
             executeService(executor, requestCode, serviceClass, convertedClass, params, uploadFileWrappers,serviceExecuteMethod, isTargetBeanAsList);
         } catch (Exception e) {
             e.printStackTrace();
-        }finally {
             hideProgressView();
         }
     }
@@ -474,7 +469,7 @@ private <T> Method reflectServiceMethod(Class<T> serviceClass, String methodName
     }
 
     private <T> void executeServiceWithoutConvert(final View executor, int requestCode, Class<T> serviceClass, Object[] params, Method serviceExecuteMethod) throws IllegalAccessException, InvocationTargetException {
-        setState(executor, false);;
+        setState(executor, false);
         if (params != null) {     //有参
             ((Observable<BaseHttpResultBean>) (serviceExecuteMethod.invoke(RetrofitClient.getService(serviceClass), params)))
                     .subscribeOn(Schedulers.io())

diff --git a/...main/java/com/xinyi/czbasedevtool/base/manager/ui_about/dialog/MaterialDialogFactory.java b/...main/java/com/xinyi/czbasedevtool/base/manager/ui_about/dialog/MaterialDialogFactory.java
@@ -229,7 +229,7 @@ public  MaterialDialog createMsgProgressMaterialDialog(int msgRes){
      * 关闭进度对话框
      */
     public  void hideProgressMaterialDialog(){
-       if(progressMaterialDialog != null && progressMaterialDialog.isShowing()){
+       if(progressMaterialDialog != null){
            progressMaterialDialog.dismiss();        //注意是dimiss而不是hide，hide仅仅是Visibility的改变，不会改变isShowing的变化.
        }
     }