|
|
@@ -18,6 +18,7 @@ import android.widget.ProgressBar |
|
|
import android.widget.TextView |
|
|
import android.widget.TextView |
|
|
import androidx.annotation.RequiresApi |
|
|
import androidx.annotation.RequiresApi |
|
|
import androidx.core.widget.ContentLoadingProgressBar |
|
|
import androidx.core.widget.ContentLoadingProgressBar |
|
|
|
|
|
import com.allenliu.versionchecklib.callback.APKDownloadListener |
|
|
import com.allenliu.versionchecklib.v2.AllenVersionChecker |
|
|
import com.allenliu.versionchecklib.v2.AllenVersionChecker |
|
|
import com.allenliu.versionchecklib.v2.builder.UIData |
|
|
import com.allenliu.versionchecklib.v2.builder.UIData |
|
|
import com.allenliu.versionchecklib.v2.callback.CustomDownloadingDialogListener |
|
|
import com.allenliu.versionchecklib.v2.callback.CustomDownloadingDialogListener |
|
|
@@ -41,6 +42,7 @@ import org.jetbrains.anko.find |
|
|
import org.jetbrains.anko.startActivity |
|
|
import org.jetbrains.anko.startActivity |
|
|
import org.jetbrains.anko.toast |
|
|
import org.jetbrains.anko.toast |
|
|
import org.json.JSONObject |
|
|
import org.json.JSONObject |
|
|
|
|
|
import java.io.File |
|
|
import java.util.* |
|
|
import java.util.* |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
@@ -120,6 +122,8 @@ class WebActivity : BaseActivity<BasePresenter<*>>() { |
|
|
UIData.create() |
|
|
UIData.create() |
|
|
.setTitle("检测到新版本") |
|
|
.setTitle("检测到新版本") |
|
|
.setContent(version.explain) |
|
|
.setContent(version.explain) |
|
|
|
|
|
// .setDownloadUrl("https://oa-edu-1259243469.cos.ap-chengdu.myqcloud.com/public/Yzx_2.0.0.apk") |
|
|
|
|
|
// .setDownloadUrl("https://filea.oa.qbjjyyun.net/edufile/202102/5986/27a58c0b85cb42aee37ce85fe956b743.apk") |
|
|
.setDownloadUrl(version.app_src) |
|
|
.setDownloadUrl(version.app_src) |
|
|
) |
|
|
) |
|
|
.setCustomVersionDialogListener { context, versionBundle -> |
|
|
.setCustomVersionDialogListener { context, versionBundle -> |
|
|
@@ -146,6 +150,8 @@ class WebActivity : BaseActivity<BasePresenter<*>>() { |
|
|
val progressBar: ContentLoadingProgressBar = dialog.findViewById(R.id.pb) |
|
|
val progressBar: ContentLoadingProgressBar = dialog.findViewById(R.id.pb) |
|
|
progressBar.progress = progress |
|
|
progressBar.progress = progress |
|
|
tvProgress.text = "$progress%" |
|
|
tvProgress.text = "$progress%" |
|
|
|
|
|
|
|
|
|
|
|
Log.d("checkVersion", "onSuccess: ${progress}") |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
override fun getCustomDownloadingDialog( |
|
|
override fun getCustomDownloadingDialog( |
|
|
@@ -245,13 +251,11 @@ class WebActivity : BaseActivity<BasePresenter<*>>() { |
|
|
view?.post { |
|
|
view?.post { |
|
|
progressbar.visibility = View.GONE |
|
|
progressbar.visibility = View.GONE |
|
|
if (view.canGoBack()) { |
|
|
if (view.canGoBack()) { |
|
|
//btnClose.visibility = View.VISIBLE |
|
|
|
|
|
btnBack.visibility = View.VISIBLE |
|
|
btnBack.visibility = View.VISIBLE |
|
|
btnClose.visibility = View.VISIBLE |
|
|
|
|
|
|
|
|
// btnClose.visibility = View.VISIBLE |
|
|
} else { |
|
|
} else { |
|
|
//btnClose.visibility = View.GONE |
|
|
|
|
|
btnBack.visibility = View.GONE |
|
|
btnBack.visibility = View.GONE |
|
|
btnClose.visibility = View.GONE |
|
|
|
|
|
|
|
|
// btnClose.visibility = View.GONE |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
|