Merge branch 'feat/bridge' into develop

team-JMT · Mar 7, 2023 · aa04d94 · aa04d94
2 parents 30e5486 + b51abec
commit aa04d94
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 8 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -20,19 +20,20 @@
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.LoginActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+            android:exported="false">
         </activity>
         <activity
             android:name=".view.WebViewActivity"
             android:exported="false" />
         <activity
             android:name=".view.MainActivity"
-            android:exported="false">
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
     </application>
 

diff --git a/app/src/main/assets/webviewexam.html b/app/src/main/assets/webviewexam.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta name="viewport" content="initial-scale=1.0">
+    <meta charset="utf-8">
+</head>
+<body>
+<p>
+    로딩이 완료된 웹뷰 입니다.
+</p>
+
+<input type="button" value="Say hello" onClick="showAndroidToast('Hello Black Jin World!')"/>
+<script type="text/javascript">
+    function showAndroidToast(toast) {
+        Android.showToast(toast);
+    }
+
+</script>
+</body>
+</html>
diff --git a/app/src/main/java/com/dogdduddy/jmt/view/WebAppInterface.kt b/app/src/main/java/com/dogdduddy/jmt/view/WebAppInterface.kt
@@ -0,0 +1,15 @@
+package com.dogdduddy.jmt.view
+
+import android.content.Context
+import android.webkit.JavascriptInterface
+import android.widget.Toast
+
+/** Instantiate the interface and set the context  */
+class WebAppInterface(private val mContext: Context) {
+
+    /** Show a toast from the web page  */
+    @JavascriptInterface
+    fun showToast(toast: String) {
+        Toast.makeText(mContext, toast, Toast.LENGTH_SHORT).show()
+    }
+}
diff --git a/app/src/main/java/com/dogdduddy/jmt/view/WebViewActivity.kt b/app/src/main/java/com/dogdduddy/jmt/view/WebViewActivity.kt
@@ -20,10 +20,14 @@ class WebViewActivity : AppCompatActivity() {
 
         webView = binding.webView
         webViewInit()
-
+        /*
         intent.extras?.let {
             binding.webView.loadUrl(it.getString("url")!!)
         }
+        // https://jmt-matzip.dev/
+         */
+        //binding.webView.loadUrl("file:///android_asset/webviewexam.html")
+        binding.webView.loadUrl("https://jmt-matzip.dev/")
 
         val actionBar: ActionBar? = supportActionBar
         actionBar!!.hide()
@@ -35,5 +39,6 @@ class WebViewActivity : AppCompatActivity() {
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) //화면이 계속 켜짐
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_FULL_USER
         webView.setWebViewClient(WebViewClient())
+        webView.addJavascriptInterface(WebAppInterface(this), "Android")
     }
 }