xiongxiaohe лет назад: 8
Родитель
Сommit
1a5fff5c9e

+ 3 - 0
.idea/misc.xml

@@ -27,6 +27,9 @@
       </value>
     </option>
   </component>
+  <component name="ProjectPlainTextFileTypeManager">
+    <file url="file://$PROJECT_DIR$/app/src/main/assets/poster.html" />
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>

+ 7 - 10
app/src/main/assets/poster.html

@@ -35,12 +35,12 @@
 </head>
 <body>
     <div>
-        <img style="position: absolute;top: 0;z-index: -2" width="100%" src="img/fenxiang_bg.png"/>
+        <img style="position: absolute;top: 0;z-index: -2" width="100%" src="https://qiniu.kuaifazs.com/fenxiang_bg.png"/>
         <div id="imgInvitation">
             <p><b>邀请码</b></p>
             <p><b>728392</b></p>
             <img id="Invitation" src="http://pan.baidu.com/share/qrcode?w=300&h=300&url=http://staticcdn.kuaifazs.com/upload/game/201802/02/c0/68/qrXn9G.html?inviteCode=728392" alt="">
-            <img id="imgicon" src="img/icon.png"/>
+            <img id="imgicon" src="https://qiniu.kuaifazs.com/xiaominayangicon.png"/>
         </div>
     </div>
 </body>
@@ -48,15 +48,12 @@
 <script>
     $(function () {
       window.PublicJavaScript.getCode();
-      function showCode(Link) {
+     
+    })
+	
+	
+	 function showCode(Link) {
         alert(Link)
       }
-    })
-
- function display_alert()
-  {
-     alert("I am an alert box!!")
-  }
-
 </script>
 </html>

+ 2 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/net/Url.java

@@ -70,5 +70,7 @@ public interface Url {
       //重置密码中的发送验证码
      String  GET_RESET_PWD_CODE=Config.instance().mBaseUrl + "/v1/user/findPwd";
 
+      //线下面对面推广
+     String FACE_2_FACE = Config.instance().mBaseUrl + "/static/poster.html";
 
 }

+ 1 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/AskFriendActivity.java

@@ -142,7 +142,7 @@ public class AskFriendActivity extends BaseActivity implements View.OnClickListe
                 break;
             case R.id.rl_face:
                 Intent i=new  Intent(this,WebActivity.class);
-                i.putExtra(WebActivity.INTENT_URL,"file:///android_asset/poster.html");
+                i.putExtra(WebActivity.INTENT_URL,Url.FACE_2_FACE);
                 i.putExtra(WebActivity.INTENT_TITLE,"ditui");
                 startActivity(i);
                 break;

+ 18 - 12
app/src/main/java/com/sheep/jiuyan/samllsheep/page/WebActivity.java

@@ -2,10 +2,13 @@ package com.sheep.jiuyan.samllsheep.page;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.os.Build;
+import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.view.View;
 import android.webkit.JavascriptInterface;
 import android.webkit.JsResult;
+import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
@@ -48,7 +51,7 @@ public class WebActivity extends BaseActivity {
     public final static String INTENT_NEW_USER = "INTENT_NEW_USER";//新手引导
     public final static String TASK_COUNT = "TASK_COUNT";//任务完成数
     private SlowlyProgressBar slowlyProgressBar;
-    private String  mLinkUrl;
+    private static String  mLinkUrl;
 
     @Override
     protected int getLayoutId() {
@@ -85,13 +88,6 @@ public class WebActivity extends BaseActivity {
             }
         });
 
-        mWeb.setWebChromeClient(new WebChromeClient() {
-            @Override
-            public boolean onJsAlert(WebView view, String url, String message, JsResult result) {
-                Toast.makeText(WebActivity.this, message, Toast.LENGTH_SHORT).show();
-                return super.onJsAlert(view, url, message, result);
-            }
-        });
         mWeb.getSettings().setJavaScriptEnabled(true);
         mWeb.setWebViewClient(new WebViewClient() {
             @Override
@@ -118,8 +114,6 @@ public class WebActivity extends BaseActivity {
 
 
 
-
-
     /**
      * JS调用方法
      */
@@ -171,10 +165,22 @@ public class WebActivity extends BaseActivity {
             TitleBarUtils.getInstance().setTitle(WebActivity.this, title);
         }
 
+        @RequiresApi(api = Build.VERSION_CODES.KITKAT)
         @JavascriptInterface
         public void getCode() {
-            String url = "javascript:display_alert()";
-            mWeb.loadUrl(url);
+                mWeb.post(new Runnable() {
+                    @Override
+                    public void run() {
+
+                        // 注意调用的JS方法名要对应上
+
+
+                        mWeb.loadUrl( "javascript:showCode('" + mLinkUrl + "')");
+                    }
+                });
+
+
+
         }