weizhengliang 4 lat temu
rodzic
commit
dfdff1e015

+ 2 - 0
app/src/main/java/com/wdkl/callingmainnurse/ui/activity/MainFragmentActivity.java

@@ -454,6 +454,8 @@ public class MainFragmentActivity extends FragmentActivity implements IVvsipServ
                                 LogUtil.d("appCheckUpdate", "7===Exception==");
                                 Constants.UPDATE_APP_FLAG = false;
                                 e.printStackTrace();
+                            } finally {
+                                Constants.UPDATE_APP_FLAG = false;
                             }
                         }
                     });

+ 3 - 2
app/src/main/java/com/wdkl/callingmainnurse/ui/fragment/CallingBedFragment.java

@@ -866,13 +866,14 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
 
                             }
                             setHospitalView();
-                        } catch (JSONException e) {
+                        } catch (Exception e) {
                             e.printStackTrace();
                             if (swipeRefreshLayout.isRefreshing()) {
                                 swipeRefreshLayout.setRefreshing(false);
                             }
+                        } finally {
+                            Constants.MGR_UPDATE = false;
                         }
-                        Constants.MGR_UPDATE = false;
                     }
                 });
     }

+ 1 - 1
test/build.gradle

@@ -27,7 +27,7 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:26.+'
+    compile 'com.android.support:appcompat-v7:24.2.0'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
     compile files('libs/UdpLibs.jar')