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

doum

昨天 22881a4d6409c7d17867e1d40bf81a13578208df

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

@@ -57,6 +57,17 @@
        // thread.interrupt();
        // }
    }

    public boolean isShowing() {
        if(updateDialog!=null&&updateDialog.isShowing()){
            return true;
        }
        if(downloadDialog!=null&&downloadDialog.isShowing()){
            return true;
        }
        return false;
    }

    public static interface VersionCallBack{
        void isNeedUpdate(boolean isUpdate);
    }
@@ -81,8 +92,8 @@
                                    versionCallBack.isNeedUpdate(true);
                                    upgradeurl=data.getFullFileUrl();
                                    updatelog=data.getContent();
                                    newVerName = response.getData().getVersionInfo();
                                    doNewVersionUpdate(true);
                                    newVerName = data.getVersionInfo();
                                    doNewVersionUpdate(data.getIsForce()==1);
                                }else {
                                    versionCallBack.isNeedUpdate(false);
                                }
@@ -117,6 +128,7 @@
        }
    }

    private UpdateDialog updateDialog;
    // 更新新版本
    public void doNewVersionUpdate(boolean type) {
        StringBuffer sb = new StringBuffer();
@@ -132,7 +144,10 @@
        }
        // sb.append(updatelog+"\n\n\r");
        // new UpdateDialog(activity).show();
        final UpdateDialog updateDialog = new UpdateDialog(activity);
        if(updateDialog!=null&&updateDialog.isShowing()){
            updateDialog.dismiss();
        }
        updateDialog = new UpdateDialog(activity);
        updateDialog.setText(sb.toString(),newVerName);
        updateDialog.setOnOtemListener(new UpdateDialog.UpdialogListener() {