zhanghongrui 2 viikkoa sitten
vanhempi
commit
f39f11e54a

+ 4 - 0
app/src/main/AndroidManifest.xml

@@ -144,5 +144,9 @@
             android:name="com.sjkj.appthreefloor_tsgz.activity.ExoPlayerActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="unspecified" />
+        <activity
+            android:name="com.amap.api.navi.AmapRouteActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize|navigation"
+            android:theme="@android:style/Theme.NoTitleBar" />
     </application>
 </manifest>

+ 17 - 0
app/src/main/java/com/sjkj/appthreefloor_tsgz/fragment/EventDetailsFragment.java

@@ -1,6 +1,7 @@
 package com.sjkj.appthreefloor_tsgz.fragment;
 
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -20,6 +21,7 @@ import com.sjkj.appthreefloor_tsgz.net.EventChooseStatusRequest;
 import com.sjkj.appthreefloor_tsgz.net.EventDetailsRequest;
 import com.sjkj.base_lib.entity.Params;
 import com.sjkj.base_lib.net.domain.interactor.ProcessErrorSubscriber;
+import com.sjkj.base_lib.utils.LocationUtils;
 import com.sjkj.base_lib.utils.ToastUtils;
 import com.sjkj.base_lib.view.BaseFragment;
 import com.sjkj.base_lib.weight.LoadingDialog;
@@ -78,6 +80,19 @@ public class EventDetailsFragment extends BaseFragment {
                 ChangeStatus("40");
             }
         });
+        binding.mapLocation.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Log.d("zhr111", viewModel.longitude.get() + "====" + viewModel.latitude.get());
+                if (viewModel.longitude.get() != 0 && viewModel.latitude.get() != 0) {
+//                    if (viewModel.markListBean.get() != null) {
+//                        MapActivity.open(EventDetailsActivity.this, viewModel.markListBean.get());
+//                    }
+                    LocationUtils.getInstance().mapNav(viewModel.latitude.get(), viewModel.longitude.get(), "");
+                }
+
+            }
+        });
     }
 
     private void ChangeStatus(String status) {
@@ -133,6 +148,8 @@ public class EventDetailsFragment extends BaseFragment {
                     viewModel.title.set(bean.getEventName());
                     viewModel.time.set(bean.getCreateTime());
                     viewModel.remark.set(bean.getRemark());
+                    viewModel.longitude.set(Double.parseDouble(bean.getLongitude()));
+                    viewModel.latitude.set(Double.parseDouble(bean.getLatitude()));
                     MessageEvent event = new MessageEvent();
                     event.setEventType(bean.getEventType());
                     event.setEventName(bean.getEventName());

+ 0 - 1
app/src/main/java/com/sjkj/appthreefloor_tsgz/fragment/EventNearByFragment.java

@@ -280,7 +280,6 @@ public class EventNearByFragment extends BaseFragment {
         tagValeText = tagText;
         if (isFirst) {
             DistancelistChoose.clear();
-            Log.d("zhr1121", distanceList.size() + "===");
             for (int i = 0; i < distanceList.size(); i++) {
                 commonDateBean = new CommonDateBean();
                 commonDateBean.setType(1);

+ 1 - 0
app/src/main/res/layout/fragment_event_details.xml

@@ -188,6 +188,7 @@
 
 
                 <ImageView
+                    android:id="@+id/map_location"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"

+ 27 - 28
app/src/main/res/layout/fragment_event_nearby.xml

@@ -19,22 +19,7 @@
             android:layout_height="match_parent" />
 
 
-        <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="right|bottom"
-            android:layout_marginBottom="280dp">
-
-            <ImageView
-
-                android:id="@+id/iv_location"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:layout_margin="15dp"
-                android:background="@drawable/icon_current" />
-        </FrameLayout>
+
 
         <LinearLayout
             android:id="@+id/bottom_sheet"
@@ -44,22 +29,36 @@
             android:orientation="vertical"
 
             app:behavior_hideable="true"
-            app:behavior_middleHeight="300dp"
+            app:behavior_middleHeight="400dp"
 
-            app:behavior_peekHeight="300dp"
+            app:behavior_peekHeight="200dp"
             app:layout_behavior=".utils.GaoDeBottomSheetBehavior">
 
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <ImageView
+                    android:layout_marginRight="15dp"
+                    android:id="@+id/iv_location"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:background="@drawable/icon_current" />
+
+                <ImageView
+                    android:id="@+id/layout_bottom_sheet"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="10dp"
+                    android:background="@drawable/icon_xia"
+                    android:gravity="center"
+                    android:orientation="vertical" />
+            </RelativeLayout>
 
-            <ImageView
-                android:id="@+id/layout_bottom_sheet"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="10dp"
-                android:background="@drawable/icon_xia"
-                android:gravity="center"
-                android:orientation="vertical" />
 
             <LinearLayout
                 android:layout_width="match_parent"