|
@@ -48,7 +48,7 @@ import java.nio.charset.Charset
|
|
|
*/
|
|
|
class RoamWebActivity : MBActivity<RoamWebVModel, ActivityRoamWebBinding>() {
|
|
|
|
|
|
- var token:String?=null
|
|
|
+ var token: String? = null
|
|
|
|
|
|
var uploadMessageAboveL: ValueCallback<Array<Uri>>? = null
|
|
|
var uploadMessage: ValueCallback<Uri>? = null
|
|
@@ -60,7 +60,7 @@ class RoamWebActivity : MBActivity<RoamWebVModel, ActivityRoamWebBinding>() {
|
|
|
|
|
|
initWeb()
|
|
|
vm.getInfo()
|
|
|
- vm.url.observe(this){
|
|
|
+ vm.url.observe(this) {
|
|
|
|
|
|
binding.webView.loadUrl(it)
|
|
|
|
|
@@ -69,9 +69,9 @@ class RoamWebActivity : MBActivity<RoamWebVModel, ActivityRoamWebBinding>() {
|
|
|
|
|
|
override fun listeners() {
|
|
|
super.listeners()
|
|
|
- binding.imgClose.onClick{
|
|
|
- finish()
|
|
|
- }
|
|
|
+ binding.imgClose.onClick {
|
|
|
+ finish()
|
|
|
+ }
|
|
|
// titleBar()?.tvRight?.onClick {
|
|
|
// finish()
|
|
|
// }
|
|
@@ -110,7 +110,12 @@ class RoamWebActivity : MBActivity<RoamWebVModel, ActivityRoamWebBinding>() {
|
|
|
): Boolean { // 重写此方法表明点击网页里面的链接还是在当前的webview里跳转,不跳到浏览器那边
|
|
|
|
|
|
// view.loadUrl(url)
|
|
|
- Log.e("-web-", "url=: " + url)
|
|
|
+ if (url!!.contains(BApp.instance()!!.config()!!.searchUrl() + "h5")) {
|
|
|
+ finishActivity()
|
|
|
+ return false
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
return false
|
|
@@ -122,23 +127,26 @@ class RoamWebActivity : MBActivity<RoamWebVModel, ActivityRoamWebBinding>() {
|
|
|
super.onLoadResource(view, url)
|
|
|
Log.e("-web-", "url2=: " + url)
|
|
|
|
|
|
+ if (url!!.contains(BApp.instance()!!.config()!!.searchUrl() + "h5")) {
|
|
|
+ finishActivity()
|
|
|
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
})
|
|
|
|
|
|
- binding.webView.setWebChromeClient(object :WebChromeClient(){
|
|
|
+ binding.webView.setWebChromeClient(object : WebChromeClient() {
|
|
|
|
|
|
override fun onPermissionRequest(request: PermissionRequest?) {
|
|
|
- if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP){
|
|
|
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
|
|
request?.grant(request.resources);
|
|
|
request?.origin
|
|
|
}
|
|
|
|
|
|
}
|
|
|
+
|
|
|
fun openFileChooser(valueCallback: ValueCallback<Uri>?) {
|
|
|
uploadMessage = valueCallback
|
|
|
openImageChooserActivity()
|
|
@@ -171,8 +179,8 @@ class RoamWebActivity : MBActivity<RoamWebVModel, ActivityRoamWebBinding>() {
|
|
|
Log.e("-shy-", "list=: ")
|
|
|
val acceptTypes = fileChooserParams.acceptTypes
|
|
|
|
|
|
- for(item in acceptTypes){
|
|
|
- Log.e("-shy-", "acceptTypes=: "+item )
|
|
|
+ for (item in acceptTypes) {
|
|
|
+ Log.e("-shy-", "acceptTypes=: " + item)
|
|
|
|
|
|
}
|
|
|
openImageChooserActivity()
|
|
@@ -186,20 +194,12 @@ class RoamWebActivity : MBActivity<RoamWebVModel, ActivityRoamWebBinding>() {
|
|
|
// }
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
return true
|
|
|
}
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -215,17 +215,17 @@ class RoamWebActivity : MBActivity<RoamWebVModel, ActivityRoamWebBinding>() {
|
|
|
) is PermissionResult.PermissionGranted
|
|
|
) {
|
|
|
|
|
|
- PopuchoseImgUtils.show(context(),binding.webView,object : ChoiceData {
|
|
|
+ PopuchoseImgUtils.show(context(), binding.webView, object : ChoiceData {
|
|
|
override fun onRestuse(id: String?) {
|
|
|
|
|
|
- if(null!=uploadMessageAboveL){
|
|
|
+ if (null != uploadMessageAboveL) {
|
|
|
uploadMessageAboveL!!.onReceiveValue(null)
|
|
|
- uploadMessageAboveL=null
|
|
|
+ uploadMessageAboveL = null
|
|
|
}
|
|
|
|
|
|
- if(null!=uploadMessage){
|
|
|
+ if (null != uploadMessage) {
|
|
|
uploadMessage!!.onReceiveValue(null)
|
|
|
- uploadMessage=null
|
|
|
+ uploadMessage = null
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -250,14 +250,14 @@ class RoamWebActivity : MBActivity<RoamWebVModel, ActivityRoamWebBinding>() {
|
|
|
if (resultCode != Activity.RESULT_OK) {
|
|
|
|
|
|
if (Activity.RESULT_OK != resultCode) {
|
|
|
- if(null!=uploadMessageAboveL){
|
|
|
+ if (null != uploadMessageAboveL) {
|
|
|
uploadMessageAboveL!!.onReceiveValue(null)
|
|
|
- uploadMessageAboveL=null
|
|
|
+ uploadMessageAboveL = null
|
|
|
}
|
|
|
|
|
|
- if(null!=uploadMessage){
|
|
|
+ if (null != uploadMessage) {
|
|
|
uploadMessage!!.onReceiveValue(null)
|
|
|
- uploadMessage=null
|
|
|
+ uploadMessage = null
|
|
|
}
|
|
|
return
|
|
|
}
|
|
@@ -334,14 +334,14 @@ class RoamWebActivity : MBActivity<RoamWebVModel, ActivityRoamWebBinding>() {
|
|
|
if (binding.webView.url!!.equals(vm.url)) { //获取当前的网址,与初始网址界面是否相同
|
|
|
finish() //相同表示为第一次进入的网址,上一级为源生
|
|
|
} else {
|
|
|
- if(null!=uploadMessageAboveL){
|
|
|
+ if (null != uploadMessageAboveL) {
|
|
|
uploadMessageAboveL!!.onReceiveValue(null)
|
|
|
- uploadMessageAboveL=null
|
|
|
+ uploadMessageAboveL = null
|
|
|
}
|
|
|
|
|
|
- if(null!=uploadMessage){
|
|
|
+ if (null != uploadMessage) {
|
|
|
uploadMessage!!.onReceiveValue(null)
|
|
|
- uploadMessage=null
|
|
|
+ uploadMessage = null
|
|
|
}
|
|
|
|
|
|
|
|
@@ -355,9 +355,6 @@ class RoamWebActivity : MBActivity<RoamWebVModel, ActivityRoamWebBinding>() {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
override fun onTouchEvent(event: MotionEvent?): Boolean {
|
|
|
return false;
|
|
|
}
|