liukai %!s(int64=3) %!d(string=hai) anos
pai
achega
155b3a405c

+ 1 - 1
app/src/main/java/com/hongyegroup/nucleicacidtest/MyApplication.kt

@@ -25,7 +25,7 @@ class MyApplication : BaseApplication() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             val processName = getProcessName(this)
             if ("com.monstarlab.yyjobs" != processName) {
-                WebView.setDataDirectorySuffix(processName)
+                WebView.setDataDirectorySuffix(processName ?: "app")
             }
         }
     }

+ 1 - 2
build.gradle

@@ -2,7 +2,7 @@
 apply from: "dependent.gradle"
 
 buildscript {
-    ext.kotlin_version = '1.4.21'
+    ext.kotlin_version = '1.5.0'
     ext.booster_version = '2.4.0'
 
     repositories {
@@ -64,7 +64,6 @@ allprojects {
         maven { url 'http://maven.aliyun.com/nexus/content/repositories/gradle-plugin' }
         maven { url 'https://jitpack.io' }
         google()
-        maven { url 'https://dl.bintray.com/umsdk/release' }
         maven { url "https://androidx.dev/snapshots/builds/6543454/artifacts/repository/" }
     }
 }

+ 5 - 2
cpt_pensonal/src/main/java/com/hongyegroup/cpt_pensonal/mvvm/PensonalAppointmentMakeViewModel.kt

@@ -2,6 +2,7 @@ package com.hongyegroup.cpt_pensonal.mvvm
 
 import android.app.Activity
 import android.app.DatePickerDialog
+import androidx.hilt.lifecycle.ViewModelInject
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.guadou.cs_cptservices.binding.BaseDataBindingAdapter
@@ -12,8 +13,10 @@ import com.hongyegroup.cpt_pensonal.R
 import com.hongyegroup.cpt_pensonal.bean.MakeAppointmentTime
 import java.util.*
 
-@Suppress("NAME_SHADOWING")
-class PensonalAppointmentMakeViewModel : BaseViewModel() {
+
+class PensonalAppointmentMakeViewModel  @ViewModelInject constructor(
+
+) : BaseViewModel() {
 
     var mDatas = mutableListOf<MakeAppointmentTime>()
     val mAdapter by lazy { BaseDataBindingAdapter(R.layout.item_make_appointment_time, BR.item, mDatas) }

+ 1 - 0
cs_baselib/src/main/java/com/guadou/lib_baselib/ext/CommonExt.kt

@@ -349,6 +349,7 @@ fun Bitmap.saveToAlbum(
                 Bitmap.CompressFormat.PNG -> ".png"
                 Bitmap.CompressFormat.JPEG -> ".jpg"
                 Bitmap.CompressFormat.WEBP -> ".webp"
+                else -> ""
             }
             val target = File(
                 dirPath,

+ 1 - 1
cs_cptServices/src/main/java/com/guadou/cs_cptservices/ui/GlobalWebActivity.kt

@@ -103,7 +103,7 @@ class GlobalWebActivity : YYBaseVDBActivity<EmptyViewModel, ActivityGlobalWebBin
         })
 
         if (!TextUtils.isEmpty(mWeburl))
-            mWebView!!.loadUrl(mWeburl)
+            mWebView!!.loadUrl(mWeburl!!)
 
         mBinding.flContent.addView(mWebView)
 

+ 4 - 4
dependent.gradle

@@ -1,10 +1,10 @@
 ext {
 
     versions = [
-            'minSdk'           : 21,
-            'targetSdk'        : 29,
-            'compileSdk'       : 29,
-            'buildToolsVersion': '30.0.1'
+            'minSdk'           : 19,
+            'targetSdk'        : 30,
+            'compileSdk'       : 30,
+            'buildToolsVersion': '30.0.3'
     ]
     deps = [
             //android和kt依赖资源