修复注入js失败

app/src/main/AndroidManifest.xml

@@ -791,7 +791,7 @@
             android:screenOrientation="portrait" />
         <!-- 小绵羊3.4.5 足迹  -->
         <activity
-            android:name="com.sheep.gamegroup.view.activity.ActFootMark"
+            android:name="com.sheep.gamegroup.view.activity.ActFootPrint"
             android:screenOrientation="portrait" />
     </application>
 

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -528,6 +528,24 @@ public class CommonUtil {
             case IDConstant.JUMP_GUIDE_NEW_USER://新手引导图文或视频
                 Jump2View.getInstance().goActGuideNewUser(activity);
                 break;
+            case IDConstant.JUMP_FOOT_PRINT://足迹
+                Jump2View.getInstance().goActFootPrint();
+                break;
+            case IDConstant.JUMP_APPRENTICE_RED_PACKET://收徒红包
+                G.showToast(R.string.coming_soon);
+                break;
+            case IDConstant.JUMP_EXCHANGE_MALL://兑换商城
+                G.showToast(R.string.coming_soon);
+                break;
+            case IDConstant.JUMP_EVERY_DAY_SHARE://每日分享
+                G.showToast(R.string.coming_soon);
+                break;
+            case IDConstant.JUMP_ENTERTAINMENT_LUCK_DRAW://娱乐抽奖
+                G.showToast(R.string.coming_soon);
+                break;
+            case IDConstant.JUMP_COIN_CENTER://金币中心
+                G.showToast(R.string.coming_soon);
+                break;
             default:
                 String url = jump.getUrl();
                 if (TextUtils.isEmpty(url))

app/src/main/java/com/sheep/gamegroup/util/IDConstant.java

@@ -44,6 +44,13 @@ public class IDConstant {
     public static final int JUMP_SIGN_SHEEP = 301;//301:签到
     public static final int JUMP_GUIDE_NEW_USER = 302;//302:新手引导
     public static final int JUMP_YM = 303;//有米积分
+    public static final int JUMP_FOOT_PRINT = 304;//足迹
+    public static final int JUMP_APPRENTICE_RED_PACKET = 305;//收徒红包
+    public static final int JUMP_EXCHANGE_MALL = 306;//兑换商城
+    public static final int JUMP_EVERY_DAY_SHARE = 307;//每日分享
+    public static final int JUMP_ENTERTAINMENT_LUCK_DRAW = 308;//娱乐抽奖
+    public static final int JUMP_COIN_CENTER = 309;//金币中心
+
     //TODO 这里移动积分兑换的id需要替换
     public static final int JUMP_EXCHANGE_CMCC = 1000025;//移动积分兑换
 }

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -52,7 +52,7 @@ import com.sheep.gamegroup.view.activity.ActCreditCardTaskList;
 import com.sheep.gamegroup.view.activity.ActCreditCardWeb;
 import com.sheep.gamegroup.view.activity.ActDownloadWelfareList;
 import com.sheep.gamegroup.view.activity.ActExchangeCMCC;
-import com.sheep.gamegroup.view.activity.ActFootMark;
+import com.sheep.gamegroup.view.activity.ActFootPrint;
 import com.sheep.gamegroup.view.activity.ActGameAccount;
 import com.sheep.gamegroup.view.activity.ActGameAgencyRecharge;
 import com.sheep.gamegroup.view.activity.ActGameCenter;
@@ -970,7 +970,7 @@ public class Jump2View {
         intent.putExtra(IJumpWeb.KEY_TITLE, TextUtils.isEmpty(title) ? "加载中..." : title);
         intent.putExtra(IJumpWeb.KEY_NEEDJSINTERACT, jumpWeb.needJsInteract());
         //判断是否注入js
-        boolean hasJsUrl = TextUtils.isEmpty(jumpWeb.getJsUrl());
+        boolean hasJsUrl = !TextUtils.isEmpty(jumpWeb.getJsUrl());
         if(hasJsUrl){
             intent.putExtra(IJumpWeb.KEY_JSURL, jumpWeb.getJsUrl());
         }
@@ -2274,9 +2274,9 @@ public class Jump2View {
     /**
      * 小绵羊3.4.5新增--跳转到足迹界面
      */
-    public void goActFootMark() {
+    public void goActFootPrint() {
         Activity activity = ActivityManager.getInstance().currentActivity();
-        Intent intent = new Intent(activity, ActFootMark.class);
+        Intent intent = new Intent(activity, ActFootPrint.class);
         activity.startActivity(intent);
     }
 }

app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -251,7 +251,7 @@ public class TestUtil {
                     public void onClick(DialogInterface dialog, int which) {
                         switch (items[which]) {
                             case "足迹":
-                                Jump2View.getInstance().goActFootMark();
+                                Jump2View.getInstance().goActFootPrint();
                                 break;
                             case "我的关注":
                                 Jump2View.getInstance().goActMyFocus();

app/src/main/java/com/sheep/gamegroup/view/activity/ActFootMark.java

@@ -3,18 +3,18 @@ package com.sheep.gamegroup.view.activity;
 import android.support.v4.app.Fragment;
 
 import com.sheep.gamegroup.absBase.BaseContainerActivity;
-import com.sheep.gamegroup.view.fragment.FgtFootMark;
+import com.sheep.gamegroup.view.fragment.FgtFootPrint;
 
 /**
  * Created by realicing on 2018/9/11.
  * realicing@sina.com
  * 小绵羊3.4.5新增--足迹
  */
-public class ActFootMark extends BaseContainerActivity {
+public class ActFootPrint extends BaseContainerActivity {
 
     @Override
     protected Fragment initFragment() {
-        return new FgtFootMark();
+        return new FgtFootPrint();
     }
 
 }

app/src/main/java/com/sheep/gamegroup/view/activity/ActWeb.java

@@ -57,7 +57,7 @@ public class ActWeb extends BaseActWeb {
     View layout_navigationBar;
 
     private String title;//title为空时，不显示整个标题栏
-    private boolean needJsInteract;//是否需要js交互
+    private boolean needJsInteract;//是否需要js交互,有js交互的会对url进行操作：拼接token到后面
     private WebSettings webViewSettings;
 
     @Override
@@ -312,14 +312,21 @@ public class ActWeb extends BaseActWeb {
             }
         });
         webViewSettings.setJavaScriptEnabled(true);
-        if (needJsInteract)
+        if (needJsInteract) {
             mWebView.addJavascriptInterface(new KFZSJs(this), "kfzsjs");
-        String loadUrl = addUrlToken(url);
-        LogUtil.println("ActWeb loadUrl = " + loadUrl);
-        if (CommonUtil.getInstance().judgeUrlPicture(url)) {
-            runWebviewUrl("file:///android_asset/loadImg.html");
+            String loadUrl = addUrlToken(url);
+            LogUtil.println("ActWeb loadUrl = " + loadUrl);
+            if (CommonUtil.getInstance().judgeUrlPicture(url)) {
+                runWebviewUrl("file:///android_asset/loadImg.html");
+            } else {
+                mWebView.loadUrl(loadUrl);
+            }
         } else {
-            mWebView.loadUrl(loadUrl);
+            if (CommonUtil.getInstance().judgeUrlPicture(url)) {
+                runWebviewUrl("file:///android_asset/loadImg.html");
+            } else {
+                mWebView.loadUrl(url);
+            }
         }
     }
 

app/src/main/java/com/sheep/gamegroup/view/activity/ActWebX5.java

@@ -57,7 +57,7 @@ public class ActWebX5 extends BaseActWeb {
     View layout_navigationBar;
 
     private String title;//title为空时，不显示整个标题栏
-    private boolean needJsInteract;//是否需要js交互
+    private boolean needJsInteract;//是否需要js交互,有js交互的会对url进行操作：拼接token到后面
     private WebSettings webViewSettings;
 
     @Override
@@ -312,14 +312,21 @@ public class ActWebX5 extends BaseActWeb {
             }
         });
         webViewSettings.setJavaScriptEnabled(true);
-        if (needJsInteract)
+        if (needJsInteract) {
             mWebView.addJavascriptInterface(new KFZSJs(this), "kfzsjs");
-        String loadUrl = addUrlToken(url);
-        LogUtil.println("ActWeb loadUrl = " + loadUrl);
-        if (CommonUtil.getInstance().judgeUrlPicture(url)) {
-            runWebviewUrl("file:///android_asset/loadImg.html");
+            String loadUrl = addUrlToken(url);
+            LogUtil.println("ActWeb loadUrl = " + loadUrl);
+            if (CommonUtil.getInstance().judgeUrlPicture(url)) {
+                runWebviewUrl("file:///android_asset/loadImg.html");
+            } else {
+                mWebView.loadUrl(loadUrl);
+            }
         } else {
-            mWebView.loadUrl(loadUrl);
+            if (CommonUtil.getInstance().judgeUrlPicture(url)) {
+                runWebviewUrl("file:///android_asset/loadImg.html");
+            } else {
+                mWebView.loadUrl(url);
+            }
         }
     }
 

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtFootMark.java

@@ -28,7 +28,7 @@ import io.reactivex.Observable;
  * realicing@sina.com
  * 小绵羊3.4.5新增--足迹
  */
-public class FgtFootMark extends BaseListFragment2<PunchLog> {
+public class FgtFootPrint extends BaseListFragment2<PunchLog> {
     CalendarView calendarView;
 
     @Override
@@ -39,7 +39,7 @@ public class FgtFootMark extends BaseListFragment2<PunchLog> {
                 .setTitle(getView(), "足迹");
         per_page = 100;
         view_list.setNestedScrollingEnabled(false);
-        View view = LayoutInflater.from(activity).inflate(R.layout.header_foot_mark, null);
+        View view = LayoutInflater.from(activity).inflate(R.layout.header_foot_print, null);
         view_list.addHeaderView(view);
         calendarView = view.findViewById(R.id.calendarView);
     }

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java

@@ -232,7 +232,7 @@ public class FgtPersonalCenter extends BaseFragment {
         if (!ListUtil.isEmpty(newList)) {
             userCenterModuleList.clear();
             userCenterModuleList.addAll(newList);
-            moduleList.getAdapter().notifyDataSetChanged();
+            ViewUtil.notifyDataSetChanged(moduleList);
             ViewUtil.setVisibility(moduleLayout, true);
         } else {
             ViewUtil.setVisibility(moduleLayout, !userCenterModuleList.isEmpty());