1 修复后台弹窗dialog在部分android10手机上无法显示的问题

2 运动地图页增加终点提示点击好的返回结束页操作

1 修复后台弹窗dialog在部分android10手机上无法显示的问题
2 运动地图页增加终点提示点击好的返回结束页操作
YangShuai
1 parent 211608d1
Showing 5 changed files with 53 additions and 11 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/widget/SelectDialog.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/widget/TipDialog.java
moudle_pedometer/src/main/res/layout/fragment_run_race_detail.xml
moudle_pedometer/src/main/res/layout/fragment_running_map.xml
 package com.cnlive.moudle.pedometer.frame.view;
  
+import android.app.Activity;
 import android.app.Service;
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -92,7 +93,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
         this.fragment = fragment;
     }
  
-    public Context getContext() {
+    public Activity getContext() {
         return fragment == null ? null : fragment.getActivity();
     }
  
@@ -319,12 +320,12 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
  
             } else {
                 //过滤定位精度
-                boolean isNeedZoomInRaduis= PhoneUtil.isNeedZoomInLoacRaduis();
-                if (isNeedZoomInRaduis){
+                boolean isNeedZoomInRaduis = PhoneUtil.isNeedZoomInLoacRaduis();
+                if (isNeedZoomInRaduis) {
                     if (location.getRadius() > Constant.Need_ZOOM_IN_RADUIS) {
                         return;
                     }
-                }else {
+                } else {
                     if (location.getRadius() > Constant.LOCA_ACCURACY) {
                         return;
                     }
@@ -431,6 +432,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
             @Override
             public void onClick(TipDialog dialog) {
                 dialog.dismiss();
+                getContext().finish();
             }
         });
         endTipDialog.setCancelable(false);
@@ -3,10 +3,14 @@ package com.cnlive.moudle.pedometer.ui.widget;
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
+
 import androidx.annotation.NonNull;
+
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.LinearLayout;
@@ -61,10 +65,10 @@ public class SelectDialog extends Dialog {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-
         //显示视图
         this.setContentView(view);
+        //android 后台弹窗，只显示灰色蒙层，不显示布局。
+        getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
     }
  
     private void initView(View rootView) {
@@ -87,6 +91,19 @@ public class SelectDialog extends Dialog {
         });
     }
  
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        Window window = getWindow();
+        if (hasFocus && window != null) {
+            View decorView = window.getDecorView();
+            if (decorView.getHeight() == 0 || decorView.getWidth() == 0) {
+                decorView.requestLayout();
+                Log.d("TAG", "布局异常，重新布局");
+            }
+        }
+    }
+
     public interface DialogInterface {
         void onClick(SelectDialog dialog);
     }
@@ -3,10 +3,14 @@ package com.cnlive.moudle.pedometer.ui.widget;
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
+
 import androidx.annotation.NonNull;
+
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.LinearLayout;
@@ -56,6 +60,9 @@ public class TipDialog extends Dialog {
         super.onCreate(savedInstanceState);
         //显示视图
         this.setContentView(view);
+        //android 后台弹窗，只显示灰色蒙层，不显示布局。
+        getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+
     }
  
     public void setTipMsg(String tipMsg) {
@@ -79,6 +86,19 @@ public class TipDialog extends Dialog {
         void onClick(TipDialog dialog);
     }
  
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        Window window = getWindow();
+        if (hasFocus && window != null) {
+            View decorView = window.getDecorView();
+            if (decorView.getHeight() == 0 || decorView.getWidth() == 0) {
+                decorView.requestLayout();
+                Log.d("TAG", "布局异常，重新布局");
+            }
+        }
+    }
+
     /**
      * 获取屏幕宽度
      *
@@ -104,4 +124,5 @@ public class TipDialog extends Dialog {
         int height = wm.getDefaultDisplay().getHeight();
         return height;
     }
+
 }
@@ -37,7 +37,8 @@
                     android:background="#0D000000"
                     android:clickable="false"
                     android:focusable="false"
-                    android:focusableInTouchMode="false"></LinearLayout>
+                    android:focusableInTouchMode="false"
+                    android:visibility="gone"></LinearLayout>
  
                 <ImageView
                     android:id="@+id/iv_back"
@@ -18,7 +18,8 @@
             android:background="#0D000000"
             android:clickable="false"
             android:focusable="false"
-            android:focusableInTouchMode="false"></LinearLayout>
+            android:focusableInTouchMode="false"
+            android:visibility="gone"></LinearLayout>
  
         <FrameLayout
             android:id="@+id/fl_back"
@@ -81,7 +82,7 @@
                 android:paddingRight="15dp"
                 android:textColor="@color/text_black"
                 android:textSize="12sp"
-                android:visibility="gone"/>
+                android:visibility="gone" />
             <!---->
         </LinearLayout>
  
@@ -181,8 +182,8 @@
                         android:id="@+id/tv_current_diatance"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="--"
                         android:layout_marginRight="5dp"
+                        android:text="--"
                         android:textColor="@color/black"
                         android:textSize="20sp"
                         android:textStyle="bold" />
@@ -191,8 +192,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="10dp"
-                        android:text="距离(km)"
                         android:layout_marginRight="5dp"
+                        android:text="距离(km)"
                         android:textColor="@color/black"
                         android:textSize="15sp" />
                 </LinearLayout>