1

app/src/main/java/com/polysoft/nafmii/fragment/AdvertisementFragment.java

@@ -68,13 +68,14 @@ public class AdvertisementFragment extends Fragment implements View.OnClickListe
     }
 
     private void initView(View view) {
-        view.findViewById(R.id.advertisement_pass).setOnClickListener(this);
+        View countLayout = view.findViewById(R.id.advertisement_pass);
+        countLayout.setOnClickListener(this);
         this.mImgView = view.findViewById(R.id.advertisement_imgview);
         this.mCountDown = view.findViewById(R.id.advertisement_countdown);
 
         this.mImgView.setOnClickListener(this);
 //        this.loadAdvertisementImageTest();
-        this.loadAdvertisementImage();
+        this.loadAdvertisementImage(countLayout);
     }
 
     @Override
@@ -88,7 +89,7 @@ public class AdvertisementFragment extends Fragment implements View.OnClickListe
         }
     }
 
-    private void loadAdvertisementImage() {
+    private void loadAdvertisementImage(View countLayout) {
         String json = getArguments().getString("data");
         if (TextUtils.isEmpty(json)) {
             this.dispatchActivityEvent();
@@ -107,6 +108,7 @@ public class AdvertisementFragment extends Fragment implements View.OnClickListe
             @Override
             public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
                 super.onResourceReady(resource, transition);
+                countLayout.setVisibility(View.VISIBLE);
                 startCountDown();
             }
         });

app/src/main/java/com/polysoft/nafmii/webview/HomeWebviewHandler.java

@@ -20,8 +20,10 @@ public class HomeWebviewHandler extends WebviewHandler {
 
     @Override
     public void setButtomMenu(MenuBean bean) {
-        HomeActivity activity = (HomeActivity) this.fragment.getActivity();
-        activity.setModuleStatus(bean);
+        if (getFragment().isVisible()) {
+            HomeActivity activity = (HomeActivity) this.fragment.getActivity();
+            activity.setModuleStatus(bean);
+        }
     }
 
     @Override

app/src/main/java/com/polysoft/nafmii/webview/NativeApi.java

@@ -4,6 +4,7 @@ import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
+import android.net.Uri;
 import android.text.TextUtils;
 import android.webkit.JavascriptInterface;
 
@@ -16,7 +17,6 @@ import com.polysoft.nafmii.bean.MenuBean;
 import com.polysoft.nafmii.bean.Result;
 import com.polysoft.nafmii.broadcast.PhotosReceiver;
 import com.polysoft.nafmii.broadcast.Receiver;
-import com.polysoft.nafmii.broadcast.ReceiverListener;
 import com.polysoft.nafmii.broadcast.ShareReceiver;
 import com.polysoft.nafmii.database.ObjectBox;
 import com.polysoft.nafmii.database.entity.DataEntity;
@@ -24,10 +24,8 @@ import com.polysoft.nafmii.enums.DatabaseEnum;
 import com.polysoft.nafmii.fragment.dialog.DownloadDialog;
 import com.polysoft.nafmii.fragment.dialog.FingerprintDialog;
 import com.polysoft.nafmii.jpush.JPushMgr;
-import com.polysoft.nafmii.net.OkhttpApi;
 import com.polysoft.nafmii.utils.BitmapUtils;
 import com.polysoft.nafmii.utils.CtxUtils;
-import com.polysoft.nafmii.utils.FileUtils;
 import com.polysoft.nafmii.utils.IntentUtils;
 import com.polysoft.nafmii.utils.PermissionUtils;
 import com.polysoft.nafmii.utils.StatusBarUtils;
@@ -35,7 +33,6 @@ import com.polysoft.nafmii.wechat.ShareBean;
 import com.polysoft.nafmii.wechat.WechatApi;
 import com.whaty.nafmii.activity.OutsideWebviewActivity;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -65,6 +62,7 @@ public class NativeApi {
     @JavascriptInterface
     public void nativeMenu(String params) {
         new JsInterfaceHandler(handler).parse(params, (data, js) -> {
+            js.success(null);
             MenuBean bean = TypeUtils.castToJavaBean(data, MenuBean.class);
             mActivity.runOnUiThread(() -> handler.setButtomMenu(bean));
         });
@@ -235,9 +233,19 @@ public class NativeApi {
     public void nativeOpenUrl(String param) {
         new JsInterfaceHandler(handler).parse(param, (data, js) -> {
             mActivity.runOnUiThread(() -> {
-                Intent intent = new Intent(mActivity, OutsideWebviewActivity.class);
-                intent.putExtra("data", data.toJSONString());
-                mActivity.startActivity(intent);
+                String type = data.getString("type");
+                if ("1".equals(type)) {
+                    Intent intent= new Intent();
+                    intent.setAction("android.intent.action.VIEW");
+                    String linkUrl = data.getString("linkUrl");
+                    Uri content_url = Uri.parse(linkUrl);
+                    intent.setData(content_url);
+                    mActivity.startActivity(intent);
+                } else {
+                    Intent intent = new Intent(mActivity, OutsideWebviewActivity.class);
+                    intent.putExtra("data", data.toJSONString());
+                    mActivity.startActivity(intent);
+                }
                 js.success(null);
             });
         });

app/src/main/res/layout/fragment_advertisement.xml

@@ -24,6 +24,7 @@
         android:layout_marginRight="20dp"
         android:background="@mipmap/advertisement_pass"
         android:gravity="center"
+        android:visibility="invisible"
         android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">

app/src/main/res/layout/layout_nav.xml

@@ -19,10 +19,15 @@
 
     <TextView
         android:id="@+id/nav_title"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textColor="@color/white"
         android:textSize="20sp"
+        android:ellipsize="end"
+        android:paddingLeft="25dp"
+        android:paddingRight="25dp"
+        android:singleLine="true"
+        android:gravity="center"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"