From f56dd15f8a7ee8289d882892bd22cd5e637c3180 Mon Sep 17 00:00:00 2001
From: wds <wds811@126.com>
Date: Tue, 3 Aug 2021 18:14:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/navinfo/outdoor/fragment/TreasureFragment.java   | 9 +++++++++
 .../java/com/navinfo/outdoor/ui/view/ContactView.java    | 7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
index afd81e9..930c5f2 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
@@ -203,6 +203,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
         uiSettings.setLogoScale(0.7f);
         uiSettings.setRotateGesturesEnabled(false);//禁止地图旋转手势.
         uiSettings.setTiltGesturesEnabled(false);//禁止倾斜手势.
+        showLoadingDialog();
         //开启定位权限
         checkNetWork();
         //检查是否有没有填完的页面
@@ -216,6 +217,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
             @Override
             public void onMapLoaded() {
                 if (Constant.currentLocation != null) {
+
                     // 地图中心点位置设置为当前用户所在位置
                     CameraUpdate cameraSigma =
                             CameraUpdateFactory.newCameraPosition(new CameraPosition(
@@ -226,6 +228,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                     tencentMap.animateCamera(cameraSigma, new TencentMap.CancelableCallback() {
                         @Override
                         public void onFinish() {
+                            dismissLoadingDialog();
                             // 移动到当前位置后，开始请求地图数据
                             initList(Constant.currentLocation);
                         }
@@ -235,6 +238,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
 
                         }
                     });
+                }else {
+                    dismissLoadingDialog();
                 }
                 tencentMap.setOnMarkerClickListener(new TencentMap.OnMarkerClickListener() {
                     @Override
@@ -1503,9 +1508,11 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
      * 检查网络状态
      */
     private void checkNetWork() {
+
         if (NetWorkUtils.iConnected(getContext())) { // 当前网络可用
             checkMyLocation();
         } else { // 当前网络不可用
+            dismissLoadingDialog();
             ToastUtil.showShort(getContext(), Constant.NETWORK_UNAVAILABLE);
         }
     }
@@ -1534,6 +1541,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                             initLocation();
 
                         } else {
+                            dismissLoadingDialog();
                             Toast.makeText(getActivity(), "申请权限失败", Toast.LENGTH_SHORT).show();
                         }
                     }
@@ -1541,6 +1549,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                     @Override
                     public void onDenied(List<String> permissions, boolean never) {
                         if (never) {
+                            dismissLoadingDialog();
                             Toast.makeText(getActivity(), "被永久拒绝授权，请手动授予定位权限", Toast.LENGTH_SHORT).show();
                             // 如果是被永久拒绝就跳转到应用权限系统设置页面
                             XXPermissions.startPermissionActivity(getActivity(), permissions);
diff --git a/app/src/main/java/com/navinfo/outdoor/ui/view/ContactView.java b/app/src/main/java/com/navinfo/outdoor/ui/view/ContactView.java
index 6e62a58..7bb7da4 100644
--- a/app/src/main/java/com/navinfo/outdoor/ui/view/ContactView.java
+++ b/app/src/main/java/com/navinfo/outdoor/ui/view/ContactView.java
@@ -66,7 +66,12 @@ public class ContactView {
 //                        rootView.removeViewAt(i);
                     }
                 });
-                holder.editPhoneNumber.setText(poiBean.getPhone()+"");
+                if (poiBean.getPhone()==null){
+                    holder.editPhoneNumber.setText("");
+                }else {
+                    holder.editPhoneNumber.setText(poiBean.getPhone()+"");
+                }
+
                 holder.editPhoneNumber.addTextChangedListener(new TextWatcher() {
 
                     @Override