소스 검색

fix bug

master
leiyun 5 년 전
부모
커밋
9092b85cc0
3개의 변경된 파일11개의 추가작업 그리고 5개의 파일을 삭제
  1. +8
    -4
      app/src/main/java/com/yzx/webebook/activity/WebActivity.kt
  2. +2
    -1
      app/src/main/res/layout/download_dialog.xml
  3. +1
    -0
      app/src/main/res/values/styles.xml

+ 8
- 4
app/src/main/java/com/yzx/webebook/activity/WebActivity.kt 파일 보기

@@ -18,6 +18,7 @@ import android.widget.ProgressBar
import android.widget.TextView
import androidx.annotation.RequiresApi
import androidx.core.widget.ContentLoadingProgressBar
import com.allenliu.versionchecklib.callback.APKDownloadListener
import com.allenliu.versionchecklib.v2.AllenVersionChecker
import com.allenliu.versionchecklib.v2.builder.UIData
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.toast
import org.json.JSONObject
import java.io.File
import java.util.*

/**
@@ -120,6 +122,8 @@ class WebActivity : BaseActivity<BasePresenter<*>>() {
UIData.create()
.setTitle("检测到新版本")
.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)
)
.setCustomVersionDialogListener { context, versionBundle ->
@@ -146,6 +150,8 @@ class WebActivity : BaseActivity<BasePresenter<*>>() {
val progressBar: ContentLoadingProgressBar = dialog.findViewById(R.id.pb)
progressBar.progress = progress
tvProgress.text = "$progress%"

Log.d("checkVersion", "onSuccess: ${progress}")
}

override fun getCustomDownloadingDialog(
@@ -245,13 +251,11 @@ class WebActivity : BaseActivity<BasePresenter<*>>() {
view?.post {
progressbar.visibility = View.GONE
if (view.canGoBack()) {
//btnClose.visibility = View.VISIBLE
btnBack.visibility = View.VISIBLE
btnClose.visibility = View.VISIBLE
// btnClose.visibility = View.VISIBLE
} else {
//btnClose.visibility = View.GONE
btnBack.visibility = View.GONE
btnClose.visibility = View.GONE
// btnClose.visibility = View.GONE
}
}
} else {


+ 2
- 1
app/src/main/res/layout/download_dialog.xml 파일 보기

@@ -3,7 +3,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="20dp">
android:padding="20dp"
android:background="@color/white">

<TextView
android:layout_width="match_parent"


+ 1
- 0
app/src/main/res/values/styles.xml 파일 보기

@@ -11,6 +11,7 @@
<style name="BaseDialog" parent="android:Theme.Light">
<item name="android:windowFrame">@null</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:background">@android:color/transparent</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowContentOverlay">@null</item>


불러오는 중...
취소
저장