Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

昨天 22881a4d6409c7d17867e1d40bf81a13578208df

 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/update/UpdateUtil.java

@@ -153,8 +153,8 @@

            @Override
            public void setOnclickUpdate() {
                //updateDialog.hide();
                /*downloadDialog = new DownloadDialog(activity, upgradeurl);
                updateDialog.hide();
                downloadDialog = new DownloadDialog(activity, upgradeurl);
                downloadDialog.show();
                downloadDialog.setCanceledOnTouchOutside(false);
                downloadDialog.setUpdateDialog(updateDialog);
@@ -171,7 +171,7 @@
                                }
                                return false;
                            }
                        });*/
                        });
            }

            @Override