Merge pull request #485 from cundong/dev

Add WebView Plugin
Qihoo360 · Jan 19, 2018 · a21eed6 · a21eed6
2 parents 44ff8f3 + 40c9545
commit a21eed6
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 5 deletions.
diff --git a/replugin-sample/host/app/src/main/assets/plugins/demo1.jar b/replugin-sample/host/app/src/main/assets/plugins/demo1.jar
diff --git a/replugin-sample/host/app/src/main/assets/plugins/webview.jar b/replugin-sample/host/app/src/main/assets/plugins/webview.jar
diff --git a/replugin-sample/host/app/src/main/java/com/qihoo360/replugin/sample/host/MainActivity.java b/replugin-sample/host/app/src/main/java/com/qihoo360/replugin/sample/host/MainActivity.java
@@ -86,6 +86,8 @@ public void onClick(View v) {
         findViewById(R.id.btn_start_demo4).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                // 示例：直接通过宿主打开WebView插件中的Activity
+                // FIXME: 后续可以将webview MainActivity URL 改为动态传入
                 // 若没有安装，则直接提示“错误”
                 if (RePlugin.isPluginInstalled("webview")) {
                     RePlugin.startActivity(MainActivity.this, RePlugin.createIntent("webview", "com.qihoo360.replugin.sample.webview.MainActivity"));

diff --git a/...pp/src/main/java/com/qihoo360/replugin/sample/demo1/activity/webview/WebViewActivity.java b/...pp/src/main/java/com/qihoo360/replugin/sample/demo1/activity/webview/WebViewActivity.java
@@ -28,7 +28,7 @@
 /**
  * @author RePlugin Team
  *
- * WebView 示例
+ * WebView 示例，具体业务逻辑由webView插件来实现
  */
 public class WebViewActivity extends Activity {
 

diff --git a/replugin-sample/plugin/plugin-webview/app/src/main/AndroidManifest.xml b/replugin-sample/plugin/plugin-webview/app/src/main/AndroidManifest.xml
@@ -17,12 +17,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.qihoo360.replugin.sample.webview">
 
-    <uses-permission android:name="android.permission.INTERNET"></uses-permission>
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:name="com.qihoo360.replugin.sample.webview.MainApp"
         android:allowBackup="false"
-        android:icon="@drawable/app_icon"
+        android:icon="@drawable/ic_launcher"
         android:label="@string/app_name">
 
         <meta-data
@@ -44,4 +44,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>
diff --git a/replugin-sample/plugin/plugin-webview/app/src/main/res/drawable/app_icon.png b/replugin-sample/plugin/plugin-webview/app/src/main/res/drawable/app_icon.png
diff --git a/replugin-sample/plugin/plugin-webview/app/src/main/res/drawable/ic_launcher.png b/replugin-sample/plugin/plugin-webview/app/src/main/res/drawable/ic_launcher.png
diff --git a/replugin-sample/plugin/plugin-webview/app/src/main/res/values/strings.xml b/replugin-sample/plugin/plugin-webview/app/src/main/res/values/strings.xml
@@ -15,5 +15,5 @@
   -->
 
 <resources>
-    <string name="app_name">Webview</string>
+    <string name="app_name">WebView</string>
 </resources>