王鹏鹏 пре 2 година
родитељ
комит
29213ec6f2

+ 2 - 0
.idea/misc.xml

@@ -5,6 +5,8 @@
       <map>
         <entry key="..\:/workspace/hcp-pad/webview/src/main/res/layout/activity_bridge_web.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/webview/src/main/res/layout/activity_webview.xml" value="0.22826086956521738" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_workbenches.xml" value="0.22826086956521738" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_game_list.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/yingyangfly/app/src/main/res/layout/activity_main.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/yingyangfly/app/src/main/res/layout/activity_push.xml" value="0.22239583333333332" />
         <entry key="..\:/workspace/yingyangfly/baselib/src/main/res/drawable/bg_center_toast.xml" value="0.2265" />

+ 4 - 13
webview/src/main/java/com/yingyangfly/webview/WebviewActivity.kt

@@ -47,23 +47,14 @@ class WebviewActivity : BaseActivity<ActivityWebviewBinding>() {
          */
         webSettings?.domStorageEnabled = true
 
+
         // 通过addJavascriptInterface()将Java对象映射到JS对象 下面一行代码是 JS调用原生方法
-//        binding.web.addJavascriptInterface(AndroidToJs(this), "javascript:callJavaFunc")
+        binding.web.addJavascriptInterface(AndroidToJs(this), "callbackHandle")
 //        binding.web.addJavascriptInterface(AndroidToJs(this), "callbackImgHandle")
 //        binding.web.addJavascriptInterface(AndroidToJs(this), "callbackBackHandle")
 
-//        binding.web.evaluateJavascript("javascript:callJavaFunc()"
-//        ) { value -> Log.e("wpp", "----------------------------" + value) }
-        binding.web.evaluateJavascript(
-            "callJavaFunc(" + "funcName" + "," + "params" + "," + "receiveCall" + ")",
-            object :
-                ValueCallback<String> {
-                override fun onReceiveValue(value: String?) {
-                    Log.e("wpp", "666---------------------------------" + value)
-                }
-
-            })
-
+        binding.web.evaluateJavascript("callbackHandle"
+        ) { value -> Log.e("wpp", "----" + value) }
 
         binding.web.isDrawingCacheEnabled = true
         binding.web.buildDrawingCache()

+ 3 - 2
workbenches/src/main/res/layout/activity_workbenches.xml

@@ -210,8 +210,9 @@
 
                     <TextView
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="0dp"
                         android:layout_marginTop="@dimen/divider_9px"
+                        android:layout_weight="1"
                         android:text="50分钟"
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/divider_32px"
@@ -221,9 +222,9 @@
                         android:id="@+id/btnCheck"
                         android:layout_width="@dimen/divider_140px"
                         android:layout_height="@dimen/divider_50px"
-                        android:layout_marginTop="@dimen/divider_30px"
                         android:background="@drawable/bg_check_button"
                         android:text="@string/view"
+                        android:layout_marginBottom="@dimen/divider_38px"
                         android:textColor="@color/color_FF3B92DC"
                         android:textSize="@dimen/divider_28px" />
 

+ 2 - 1
workbenches/src/main/res/values/themes.xml

@@ -24,8 +24,9 @@
         <item name="layout_constraintHorizontal_chainStyle">spread</item>
         <item name="layout_constraintBottom_toBottomOf">parent</item>
         <item name="layout_constraintTop_toTopOf">parent</item>
-        <item name="android:textSize">@dimen/divider_18px</item>
+        <item name="android:textSize">@dimen/divider_28px</item>
         <item name="android:textColor">@color/color_FF5467FF</item>
+        <item name="android:textStyle">bold</item>
     </style>
 
     <style name="workbenches_home_button">