Merge remote-tracking branch 'origin/master'

Admin

2021-02-22 8aefca0bdda8ad06a9ec8b810148c97279d9b62b

 lib/src/main/java/com/anyun/exam/lib/Upgrade.java

@@ -31,6 +31,9 @@
    private static final String newProgramIndUrl = "http://upgrade.safeluck.com/ftp/aykj4/aks3.json";
    private static Upgrade instance = null;
    private Context context;
    private int province;
    private int city;

    private DownloadManagerUtil downloadManagerUtil = null;
    private InstallUtil installUtil = null;
    private static final String SAVE_FILE_NAME = "aks3.apk";
@@ -219,7 +222,7 @@
            String result = CheckNewVersion(newProgramIndUrl);

            if (result != null) {
                DfuFileInfo dfuFileInfo = parseJson(result, 53, 100);
                DfuFileInfo dfuFileInfo = parseJson(result, province, city);
                if (dfuFileInfo != null && dfuFileInfo.getValid()) {
                    if (dfuFileInfo.getAppVerCode() > 0 && dfuFileInfo.getAppUrl() != null) {
                        if (installUtil.getVerCode() < dfuFileInfo.getAppVerCode()) {
@@ -248,7 +251,9 @@
        }
    };

    public void CheckUpgrade() {
    public void CheckUpgrade(int province, int city) {
        this.province = province;
        this.city = city;
        handlerCheckNewVersion.removeCallbacks(runnableCheckNewVersion);
        handlerCheckNewVersion.postDelayed(runnableCheckNewVersion, 100);
    }