kunfei 3 лет назад
Родитель
Сommit
c4ac73985d

+ 1 - 1
app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt

@@ -123,7 +123,7 @@ class AnalyzeUrl(
                     }
                 }
             }
-            result = evalJS(jsMatcher.group(2) ?: jsMatcher.group(1), result) as String
+            result = evalJS(jsMatcher.group(2) ?: jsMatcher.group(1), result).toString()
             start = jsMatcher.end()
         }
         if (ruleUrl.length > start) {

+ 3 - 3
rhino/src/main/java/com/script/rhino/RhinoScriptEngine.kt

@@ -342,7 +342,7 @@ class RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable {
                     scope: Scriptable,
                     thisObj: Scriptable,
                     args: Array<Any>
-                ): Any {
+                ): Any? {
                     var accCtxt: AccessControlContext? = null
                     val global = ScriptableObject.getTopLevelScope(scope)
                     val globalProto = global.prototype
@@ -358,7 +358,7 @@ class RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable {
                                 thisObj,
                                 args
                             )
-                        } as PrivilegedAction<Any>, accCtxt) else superDoTopCall(
+                        } as PrivilegedAction<*>, accCtxt) else superDoTopCall(
                         callable,
                         cx,
                         scope,
@@ -373,7 +373,7 @@ class RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable {
                     scope: Scriptable,
                     thisObj: Scriptable,
                     args: Array<Any>
-                ): Any {
+                ): Any? {
                     return super.doTopCall(callable, cx, scope, thisObj, args)
                 }
             })