Преглед на файлове

1.地图添加逆地理编辑。
2.添加收货、卸货.
2.修改UI。

石慧云 преди 4 години
родител
ревизия
9b969f834c

+ 0 - 1
app/build.gradle

@@ -122,5 +122,4 @@ dependencies {
 
     //微信sdk
     implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
-    implementation 'com.github.hackware1993:MagicIndicator:1.5.0'
 }

+ 35 - 0
app/src/main/java/com/quansu/heifengwuliu/adapter/BaseFragmentPagerAdapter.java

@@ -0,0 +1,35 @@
+package com.quansu.heifengwuliu.adapter;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+
+import java.util.List;
+
+/**
+ * Created by shihuiyun
+ * on 2020/9/12
+ */
+public class BaseFragmentPagerAdapter extends FragmentPagerAdapter {
+    private List<Fragment> mDataList;
+
+    public BaseFragmentPagerAdapter(FragmentManager fm) {
+        super(fm);
+    }
+
+
+    public BaseFragmentPagerAdapter(FragmentManager fm, List dataList) {
+        super(fm);
+        mDataList = dataList;
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        return mDataList.get(position);
+    }
+
+    @Override
+    public int getCount() {
+        return mDataList.size();
+    }
+}

+ 1 - 1
app/src/main/java/com/quansu/heifengwuliu/component/CpApp.kt

@@ -32,7 +32,7 @@ open class CpApp() : IComponent, BIComponent() {
     fun setDatas(cc: CC, item: PositionBean): Boolean{
 
         var areaname=item.areaname
-         Log.e("-shy-", "areaname11=: "+areaname )
+
         RxBus.get().post(ConfigRx.ADD_POSITION, item)
 
         CC.sendCCResult(cc.callId, CCResult.success())

+ 157 - 112
app/src/main/java/com/quansu/heifengwuliu/fragment/OwnerSingleFragment.kt

@@ -1,22 +1,23 @@
 package com.quansu.heifengwuliu.fragment
 
-import android.content.Context
+import android.graphics.Color
+import android.graphics.Typeface
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import android.view.animation.AccelerateInterpolator
-import android.view.animation.DecelerateInterpolator
+import androidx.fragment.app.Fragment
 import com.hwangjr.rxbus.annotation.Subscribe
 import com.hwangjr.rxbus.annotation.Tag
-import com.quansu.heifengwuliu.R
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+import com.qmuiteam.qmui.widget.tab.QMUITab
+import com.qmuiteam.qmui.widget.tab.QMUITabIndicator
+import com.qmuiteam.qmui.widget.tab.QMUITabSegment
 import com.quansu.heifengwuliu.activity.AddressActivity
-import com.quansu.heifengwuliu.adapter.FragmentAdapter
+import com.quansu.heifengwuliu.adapter.BaseFragmentPagerAdapter
 import com.quansu.heifengwuliu.base.MBFragment
 import com.quansu.heifengwuliu.config.ConfigRx
 import com.quansu.heifengwuliu.config.MIntentAction
 import com.quansu.heifengwuliu.databinding.FragmentOwnersingleBinding
-import com.quansu.heifengwuliu.utils.AList
-import com.quansu.heifengwuliu.utils.TAB
 import com.yanzhenjie.permission.AndPermission
 import com.yanzhenjie.permission.runtime.Permission
 import com.ysnows.base.base.BRepository
@@ -26,44 +27,160 @@ import com.ysnows.base.model.PositionBean
 import com.ysnows.base.route.IGaode
 import com.ysnows.base.utils.B
 import com.ysnows.base.utils.UiSwitch
-import net.lucode.hackware.magicindicator.ViewPagerHelper
-import net.lucode.hackware.magicindicator.buildins.UIUtil
-import net.lucode.hackware.magicindicator.buildins.commonnavigator.CommonNavigator
-import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter
-import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerIndicator
-import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerTitleView
-import net.lucode.hackware.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator
-import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView
 
 /**
  * 一装一卸
  *Created by shihuiyun
  *on 2020/9/11
  */
-class OwnerSingleFragment : MBFragment<BViewModel<BRepository>, FragmentOwnersingleBinding>(){
-    var cats= emptyArray<String>()
+class OwnerSingleFragment : MBFragment<BViewModel<BRepository>, FragmentOwnersingleBinding>() {
+    var cats = emptyArray<String>()
+    private var type = 1
+
     private var outtabs = 0
     private var selectViewpage = 0
-    private var type=1
-
 
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
-        setIndicator()
-        binding.viewPager.offscreenPageLimit = 0
-        initViewPager()
+
+        initTab()
         initData()
+    }
+
+    private fun initTab() {
+
+        cats = arrayOf("1", "2", "3", "4", "5", "6", "11", "23", "18", "30", "33", "100", "101", "1003")
+
+        //设置viewpager
+        val fragments = ArrayList<Fragment>()
+        for (cat in cats) {
+
+            var ownerImgFragment = OwnerImgFragment()
+            ownerImgFragment.arguments = B().putString("img", "12233").ok()
+            fragments.add(ownerImgFragment)
+        }
+        val adapter = BaseFragmentPagerAdapter(childFragmentManager, fragments)
+        binding.qmViewPager.adapter = adapter
+
+        //设置tab
+        binding.tabs.setIndicator(QMUITabIndicator(QMUIDisplayHelper.dp2px(context(), 2), false, true))
+        val space: Int = QMUIDisplayHelper.dp2px(context, 16)
+        binding.tabs.setPadding(space, 0, space, 0)
+        binding.tabs.mode = QMUITabSegment.MODE_SCROLLABLE
+//        val space: Int = QMUIDisplayHelper.dp2px(context, 16)
+//        binding.tabs.mode = QMUITabSegment.MODE_SCROLLABLE //MODE_SCROLLABLE 自适应宽度+滚动   MODE_FIXED  均分
+//        binding.tabs.setItemSpaceInScrollMode(space)
+//        binding.tabs.setupWithViewPager(binding.qmViewPager, false)
+//        binding.tabs.setPadding(space, 0, space, 0)
+//
+
+        val builder = binding.tabs.tabBuilder()
+        builder
+                .skinChangeWithTintColor(false)
+                .setSelectColor(Color.parseColor("#2E4E71"))
+                .setNormalColor(Color.parseColor("#666666"))
+                .setTypeface(Typeface.DEFAULT_BOLD, Typeface.DEFAULT)
+                .setDynamicChangeIconColor(false)
+
+        val tabs = ArrayList<QMUITab>()
+        for (cat in cats) {
+            val item = builder
+                    .setText(cat)
+                    .build(context())
+
+            tabs.add(item)
+        }
+        tabs.forEach {
+            binding.tabs.addTab(it)
+        }
+        binding.tabs.addOnTabSelectedListener(object : QMUITabSegment.OnTabSelectedListener {
+            //mTabSegment选项被选中的监听
+            /**
+             * 当某个 Tab 被选中时会触发
+             *
+             * @param index 被选中的 Tab 下标
+             */
+            override fun onTabSelected(index: Int) {
+                outtabs=index
+            }
+
+            /**
+             * 当某个 Tab 被取消选中时会触发
+             *
+             * @param index 被取消选中的 Tab 下标
+             */
+            override fun onTabUnselected(index: Int) {}
+
+            /**
+             * 当某个 Tab 处于被选中状态下再次被点击时会触发
+             *
+             * @param index 被再次点击的 Tab 下标
+             */
+            override fun onTabReselected(index: Int) {
+                outtabs=index
+            }
+
+            /**
+             * 当某个 Tab 被双击时会触发
+             *
+             * @param index 被双击的 Tab 下标
+             */
+            override fun onDoubleTap(index: Int) {
+                outtabs=index
+            }
+        })
+
+
+
+        binding.tabs.setupWithViewPager(binding.qmViewPager, false)
+
+
+        binding.imgNext.setOnClickListener {
+
+
+            selectViewpage = binding.qmViewPager.currentItem
+            if (outtabs != 0) {
+                if (selectViewpage < outtabs) {
+                   // binding.tabs.selectTab(selectViewpage + 1)
+                   binding.qmViewPager.currentItem = selectViewpage + 1
+                }
+            }
+        }
+        //向右
+        binding.imgDown.setOnClickListener {
+            toast("222")
+
+            selectViewpage = binding.qmViewPager.currentItem
+            if (outtabs != 0) {
+                if (selectViewpage < outtabs) {
+                   // binding.tabs.selectTab(selectViewpage + 1)
+                    binding.qmViewPager.currentItem = selectViewpage + 1
+                }
+            }
+        }
+
+        //向左
+        binding.imgUp.setOnClickListener {
+            toast("111")
+            selectViewpage = binding.qmViewPager.currentItem
+            if (outtabs != 0) {
+                if (selectViewpage < outtabs) {
+                   // binding.tabs.selectTab(selectViewpage - 1)
+                    binding.qmViewPager.currentItem = selectViewpage - 1
+                }
+            }
+        }
 
     }
 
     private fun initData() {
 
         //卸货信息
-         binding.viewEnter.tvCity.setHint("请选择卸货地址")
-         binding.viewEnter.llChoseMap.setOnClickListener {
+        binding.viewEnter.tvCity.setHint("请选择卸货地址")
+        binding.viewEnter.llChoseMap.setOnClickListener {
             //地图选点
-             type=2
-             choseMap()
+            type = 2
+            choseMap()
         }
 
 
@@ -84,11 +201,10 @@ class OwnerSingleFragment : MBFragment<BViewModel<BRepository>, FragmentOwnersin
         }
 
 
-
     }
 
 
-    private fun choseMap(){
+    private fun choseMap() {
 
         AndPermission.with(repository().context)
                 .runtime()
@@ -110,87 +226,9 @@ class OwnerSingleFragment : MBFragment<BViewModel<BRepository>, FragmentOwnersin
 
     }
 
-    private fun initViewPager() {
-        val tabs: AList<TAB> = AList()
-        for (cat in cats) {
-
-            var ownerImgFragment=OwnerImgFragment();
-
-            tabs.add(TAB(cat, ownerImgFragment,  B.with().putString("img","12344").ok()))
-
-        }
-        outtabs = tabs.ok().size- 1
-        val fragmentAdapter = FragmentAdapter(childFragmentManager, tabs.ok())
-        binding.viewPager.adapter = fragmentAdapter
-
-    }
-
-    private fun setIndicator() {
-        cats=arrayOf("1","2","3","4","5","6","11","23","18","30","33","100","101","1003")
-
-        val commonNavigator = CommonNavigator(context)
-        commonNavigator.adapter = object : CommonNavigatorAdapter() {
-            override fun getCount(): Int {
-                return if (cats == null) 0 else cats.size
-            }
-
-            override fun getTitleView(context: Context, index: Int): IPagerTitleView {
-                val colorTransitionPagerTitleView = ColorTransitionPagerTitleView(context)
-                colorTransitionPagerTitleView.normalColor = context.resources.getColor(R.color.tv_subtitle)
-                colorTransitionPagerTitleView.selectedColor = context.resources.getColor(R.color.tv_title)
-                colorTransitionPagerTitleView.text = cats.get(index)
-                colorTransitionPagerTitleView.setOnClickListener { binding.viewPager.setCurrentItem(index) }
-                return colorTransitionPagerTitleView
-            }
-
-            override fun getIndicator(context: Context): IPagerIndicator {
-                val indicator = LinePagerIndicator(context)
-                indicator.mode = LinePagerIndicator.MODE_EXACTLY
-                indicator.lineHeight = UIUtil.dip2px(context, 3.0).toFloat()
-                indicator.lineWidth = UIUtil.dip2px(context, 40.0).toFloat()
-                indicator.roundRadius = UIUtil.dip2px(context, 2.0).toFloat()
-                indicator.startInterpolator = AccelerateInterpolator()
-                indicator.endInterpolator = DecelerateInterpolator(2.0f)
-                indicator.setColors(context.resources.getColor(R.color.bg_button_red))
-                return indicator
-            }
-        }
-        binding.slIndicator.navigator = commonNavigator
-
-        ViewPagerHelper.bind( binding.slIndicator, binding.viewPager)
-
-        binding.imgNext.setOnClickListener{
-            selectViewpage =  binding.viewPager.getCurrentItem()
-            if (outtabs != 0) {
-                if (selectViewpage < outtabs) {
-                    binding.viewPager.setCurrentItem(selectViewpage + 1)
-                }
-            }
-        }
-        //向右
-        binding.imgDown.setOnClickListener {
-            selectViewpage =  binding.viewPager.getCurrentItem()
-            if (outtabs != 0) {
-                if (selectViewpage < outtabs) {
-                    binding.viewPager.setCurrentItem(selectViewpage + 1)
-                }
-            }
-        }
-
-        //向左
-        binding.imgUp.setOnClickListener {
-            selectViewpage =  binding.viewPager.getCurrentItem()
-            if (outtabs != 0) {
-                if (selectViewpage < outtabs) {
-                    binding.viewPager.setCurrentItem(selectViewpage -1)
-                }
-            }
-        }
-
-    }
 
     override fun binding(inflater: LayoutInflater, container: ViewGroup?): FragmentOwnersingleBinding {
-       return FragmentOwnersingleBinding.inflate(layoutInflater)
+        return FragmentOwnersingleBinding.inflate(layoutInflater)
     }
 
     override fun title(): String? {
@@ -204,12 +242,19 @@ class OwnerSingleFragment : MBFragment<BViewModel<BRepository>, FragmentOwnersin
     @Subscribe(tags = [Tag(ConfigRx.ADD_POSITION)])
     fun getPosition(bean: PositionBean) {
 
-        var provincename=bean.provincename
-        var latitude=bean.latitude
-        var longitude=bean.longitude
-        if(type==2) binding.viewEnter.etDetailedAddress.setText(bean.position)  else binding.viewOut.etDetailedAddress.setText(bean.position)
-
+        var provincename = bean.provincename
+        var latitude = bean.latitude
+        var longitude = bean.longitude
+        if (type == 2) {
+            binding.viewEnter.etDetailedAddress.setText(bean.position)
+            binding.viewEnter.tvCity.text = bean.provincename + bean.cityname + bean.areaname
+        } else {
+            binding.viewOut.etDetailedAddress.setText(bean.position)
+            binding.viewOut.tvCity.text = bean.provincename + bean.cityname + bean.areaname
+        }
 
 
     }
+
+
 }

+ 2 - 0
app/src/main/java/com/quansu/heifengwuliu/fragment/WayBillFragment.kt

@@ -69,4 +69,6 @@ class WayBillFragment : MBTabFragment<BViewModel<BRepository>, FragmentWaybillBi
 
     }
 
+
+
 }

+ 25 - 20
app/src/main/res/layout/fragment_ownersingle.xml

@@ -16,6 +16,8 @@
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
             android:scrollbars="none">
 
 
@@ -31,25 +33,32 @@
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
-                    <net.lucode.hackware.magicindicator.MagicIndicator
-                        android:id="@+id/sl_indicator"
-                        android:layout_width="0dp"
-                        android:layout_height="40dp"
-                        android:layout_weight="1">
 
-                    </net.lucode.hackware.magicindicator.MagicIndicator>
+                    <com.qmuiteam.qmui.widget.tab.QMUITabSegment
+                        android:id="@+id/tabs"
+                        android:layout_width="0dp"
+                        android:layout_height="@dimen/title_bar_height"
+                        android:layout_weight="1"
+                        android:background="@color/white"
+                        android:textSize="12sp" />
 
                     <ImageView
                         android:id="@+id/img_next"
                         android:layout_width="20dp"
                         android:layout_height="20dp"
                         android:src="@drawable/mine_right" />
-
                 </LinearLayout>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="8dp"
+                    android:background="@color/color_page" />
+
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="100dp"
+                    android:layout_marginTop="10dp"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -61,14 +70,11 @@
                         android:layout_marginEnd="10dp"
                         android:src="@drawable/img_left" />
 
-                    <androidx.viewpager.widget.ViewPager
-                        android:id="@+id/view_pager"
+                    <com.qmuiteam.qmui.widget.QMUIViewPager
+                        android:id="@+id/qm_view_pager"
                         android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1">
-
-                    </androidx.viewpager.widget.ViewPager>
-
+                        android:layout_height="100dp"
+                        android:layout_weight="1" />
 
                     <ImageView
                         android:id="@+id/img_down"
@@ -80,12 +86,13 @@
 
                 </LinearLayout>
 
+
+
+
                 <com.quansu.heifengwuliu.widget.AddressItemView
                     android:id="@+id/view_out"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    >
-                </com.quansu.heifengwuliu.widget.AddressItemView>
+                    android:layout_height="wrap_content"></com.quansu.heifengwuliu.widget.AddressItemView>
 
 
                 <TextView
@@ -101,9 +108,7 @@
                     android:id="@+id/view_enter"
 
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    >
-                </com.quansu.heifengwuliu.widget.AddressItemView>
+                    android:layout_height="wrap_content"></com.quansu.heifengwuliu.widget.AddressItemView>
 
 
                 <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout

+ 4 - 0
base/src/main/java/com/ysnows/base/base/BTabFragment.kt

@@ -15,6 +15,7 @@ import com.qmuiteam.qmui.widget.tab.QMUITabIndicator
 import com.qmuiteam.qmui.widget.tab.QMUITabSegment
 import com.ysnows.base.R
 import com.ysnows.base.inter.IPagerAdapter
+import com.ysnows.base.utils.UiSwitch
 
 /**
  * Mine Base Fragment
@@ -73,5 +74,8 @@ abstract class BTabFragment<VM : BViewModel<*>, B : ViewDataBinding> : BFragment
         }
 
     }
+    override fun <T> single(clazz: Class<T>?) {
+        UiSwitch.single(context(), clazz)
+    }
 
 }

+ 86 - 69
gaode/src/main/java/com/quansu/gaode/activity/GaodeActivity.java

@@ -56,17 +56,13 @@ import com.quansu.gaode.view.SegmentedGroup;
 import com.ysnows.base.ccretrofit.CCRetrofit;
 import com.ysnows.base.model.PositionBean;
 import com.ysnows.base.route.IApp;
-import com.ysnows.base.utils.Toasts;
 import com.ysnows.base.utils.UiSwitch;
-
 import java.util.ArrayList;
 import java.util.List;
 
 
 public class GaodeActivity extends AppCompatActivity implements LocationSource,
-        AMapLocationListener, GeocodeSearch.OnGeocodeSearchListener,
-
-        PoiSearch.OnPoiSearchListener {
+        AMapLocationListener, GeocodeSearch.OnGeocodeSearchListener, PoiSearch.OnPoiSearchListener {
 
     private static final int REQUEST_SEARCH_CODE = 1;
 
@@ -137,7 +133,10 @@ public class GaodeActivity extends AppCompatActivity implements LocationSource,
     private TextView tv;
 
     private Double lat, lng;
-   ;
+    private boolean isChose=false;
+
+
+
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -216,24 +215,31 @@ public class GaodeActivity extends AppCompatActivity implements LocationSource,
 
             Toast.makeText(this, "选择了" + chosepoiItem.getTitle(),Toast.LENGTH_SHORT).show();
 
-            String latitude = String.valueOf(chosepoiItem.getLatLonPoint().getLatitude());
-            String longitude = String.valueOf(chosepoiItem.getLatLonPoint().getLongitude());
-            String provincename = chosepoiItem.getProvinceName();
-            String cityname = chosepoiItem.getCityName();
-            String areaname = chosepoiItem.getAdName();
-
+            //逆地址编码
+            getAddressByLatlng(chosepoiItem.getLatLonPoint().getLatitude(),chosepoiItem.getLatLonPoint().getLongitude());
 
-            Log.e("-shy-", "provincename=: " + provincename + "/cityname=" + cityname + "/areaname=" + areaname);
 
 
-            PositionBean positionBean = new PositionBean(chosepoiItem.getTitle(), latitude, longitude, provincename, cityname, areaname);
+//            String latitude = String.valueOf(chosepoiItem.getLatLonPoint().getLatitude());
+//            String longitude = String.valueOf(chosepoiItem.getLatLonPoint().getLongitude());
+//            String provincename = chosepoiItem.getProvinceName();
+//            String cityname = chosepoiItem.getCityName();
+//            String areaname = chosepoiItem.getAdName();
+//
+//
+//            Log.e("-shy-", "provincename=: " + provincename + "/cityname=" + cityname + "/areaname=" + areaname);
+//
+//
+//            PositionBean positionBean = new PositionBean(chosepoiItem.getTitle(), latitude, longitude, provincename, cityname, areaname);
+//
+//            CCRetrofit.instance()
+//                    .create(IApp.class)
+//                    .setDatas(positionBean)
+//                    .subscribe();
+//
+//            finish();
 
-            CCRetrofit.instance()
-                    .create(IApp.class)
-                     .setDatas(positionBean)
-                    .subscribe();
 
-            finish();
 
         });
 
@@ -255,29 +261,30 @@ public class GaodeActivity extends AppCompatActivity implements LocationSource,
 
                 Toast.makeText(this, "选择了当前定位位置",Toast.LENGTH_SHORT).show();
 
-                String latitude = String.valueOf(lat);
-                String longitude = String.valueOf(lng);
-                String title = "经度:" + longitude + "/维度:" + latitude;
 
-                //省市区大概的位置是不会变的
-                String provincename = chosepoiItem.getProvinceName();
-                String cityname = chosepoiItem.getCityName();
-                String areaname = chosepoiItem.getAdName();
-                //AMapLocation
-
-
-
-                Log.e("-shy-", "provincename=: " + provincename + "/cityname=" + cityname + "/areaname=" + areaname);
-
-                PositionBean positionBean = new PositionBean(title, latitude, longitude,
-                        provincename, cityname, areaname);
-
-                CCRetrofit.instance()
-                        .create(IApp.class)
-                        .setDatas(positionBean)
-                        .subscribe();
-
-                finish();
+                getAddressByLatlng(chosepoiItem.getLatLonPoint().getLatitude(),chosepoiItem.getLatLonPoint().getLongitude());
+
+//                String latitude = String.valueOf(lat);
+//                String longitude = String.valueOf(lng);
+//                String title = "经度:" + longitude + "/维度:" + latitude;
+//
+//                //省市区大概的位置是不会变的
+//                String provincename = chosepoiItem.getProvinceName();
+//                String cityname = chosepoiItem.getCityName();
+//                String areaname = chosepoiItem.getAdName();
+//                //AMapLocation
+//
+//                Log.e("-shy-", "provincename=: " + provincename + "/cityname=" + cityname + "/areaname=" + areaname);
+//
+//                PositionBean positionBean = new PositionBean(title, latitude, longitude,
+//                        provincename, cityname, areaname);
+//
+//                CCRetrofit.instance()
+//                        .create(IApp.class)
+//                        .setDatas(positionBean)
+//                        .subscribe();
+//
+//                finish();
 
             } else {
 
@@ -318,15 +325,10 @@ public class GaodeActivity extends AppCompatActivity implements LocationSource,
      */
     private void setUpMap() {
         aMap.getUiSettings().setZoomControlsEnabled(false);
-        MyLocationStyle myLocationStyle = new MyLocationStyle();//初始化定位蓝点样式类
-        myLocationStyle.myLocationType(MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE);//连续定位、且将视角移动到地图中心点,定位点依照设备方向旋转,并且会跟随设备移动。(1秒1次定位)如果不设置myLocationType,默认也会执行此种模式。
-        myLocationStyle.interval(2000); //设置连续定位模式下的定位间隔,只在连续定位模式下生效,单次定位模式下不会生效。单位为毫秒。
-        aMap.setMyLocationStyle(myLocationStyle);//设置定位蓝点的Style
         aMap.setLocationSource(this);// 设置定位监听
         aMap.getUiSettings().setMyLocationButtonEnabled(true);// 设置默认定位按钮是否显示
         aMap.setMyLocationEnabled(true);// 设置为true表示显示定位层并可触发定位,false表示隐藏定位层并不可触发定位,默认是false
-      //  aMap.setMyLocationType(AMap.LOCATION_TYPE_LOCATE);
-//        aMap.setInfoWindowAdapter(this);//将自定义的 InfoWindow 样式给map
+        aMap.setMyLocationType(AMap.LOCATION_TYPE_LOCATE);
 
     }
 
@@ -564,26 +566,6 @@ public class GaodeActivity extends AppCompatActivity implements LocationSource,
 
                 searchLatlonPoint = new LatLonPoint(curLatlng.latitude, curLatlng.longitude);
 
-//                amapLocation.getLocationType();//获取当前定位结果来源,如网络定位结果,详见定位类型表
-//                            amapLocation.getLatitude();//获取纬度
-//                          amapLocation.getLongitude();//获取经度
-//                            amapLocation.getAccuracy();//获取精度信息
-//                           amapLocation.getAddress();//地址,如果option中设置isNeedAddress为false,则没有此结果,网络定位结果中会有地址信息,GPS定位不返回地址信息。
-//                         amapLocation.getCountry();//国家信息
-//                          amapLocation.getProvince();//省信息
-//                          amapLocation.getCity();//城市信息
-//                           amapLocation.getDistrict();//城区信息
-//                          amapLocation.getStreet();//街道信息
-//                         amapLocation.getStreetNum();//街道门牌号信息
-//                            amapLocation.getCityCode();//城市编码
-//                       amapLocation.getAdCode();//地区编码
-//                            amapLocation.getAoiName();//获取当前定位点的AOI信息
-//                           amapLocation.getBuildingId();//获取当前室内定位的建筑物Id
-//                           amapLocation.getFloor();//获取当前室内定位的楼层
-//                          amapLocation.getGpsAccuracyStatus();//获取GPS的当前状态
-                Log.e("--shy==", amapLocation.getProvince()+amapLocation.getCity() +amapLocation.getDistrict());
-
-
                 aMap.moveCamera(CameraUpdateFactory.newLatLngZoom(curLatlng, 16f));
 
 
@@ -594,18 +576,53 @@ public class GaodeActivity extends AppCompatActivity implements LocationSource,
         }
     }
 
+
+    private void getAddressByLatlng(double latitude,double longitude ) {
+
+        lat=latitude;
+        lng=longitude;
+
+        isChose=true;
+        //逆地理编码查询条件:逆地理编码查询的地理坐标点、查询范围、坐标类型。
+        LatLonPoint latLonPoint = new LatLonPoint(latitude, longitude);
+        RegeocodeQuery query = new RegeocodeQuery(latLonPoint, 500f, GeocodeSearch.AMAP);
+        //异步查询
+        geocoderSearch.getFromLocationAsyn(query);
+    }
+
+
     @Override
     public void onRegeocodeSearched(RegeocodeResult result, int rCode) {
         dismissDialog();
         if (rCode == AMapException.CODE_AMAP_SUCCESS) {
             if (result != null && result.getRegeocodeAddress() != null
                     && result.getRegeocodeAddress().getFormatAddress() != null) {
-                String address = result.getRegeocodeAddress().getProvince() + result.getRegeocodeAddress().getCity() + result.getRegeocodeAddress().getDistrict() + result.getRegeocodeAddress().getTownship();
 //                firstItem = new PoiItem("regeo", searchLatlonPoint, address, address);
 //                chosepoiItem=firstItem;
 
+                if(isChose){
+
+                    PositionBean positionBean = new PositionBean(chosepoiItem.getTitle(),
+                    String.valueOf(lat),  String.valueOf(lng), result.getRegeocodeAddress().getProvince(), result.getRegeocodeAddress().getCity(), result.getRegeocodeAddress().getDistrict());
+
+                    String address = result.getRegeocodeAddress().getProvince() +
+                            result.getRegeocodeAddress().getCity() +
+                            result.getRegeocodeAddress().getDistrict() +
+                            result.getRegeocodeAddress().getTownship();
+
+                    Log.e("shy", "address="+address);
+                    Log.e("shy", "lat="+lat+"//lng="+lng);
+
+                    CCRetrofit.instance()
+                            .create(IApp.class)
+                            .setDatas(positionBean)
+                            .subscribe();
+
+                    finish();
+
+                    return;
+                }
 
-                Log.e("shy", "address="+address);
 
 
                 doSearchQuery();

+ 0 - 1
gaode/src/main/java/com/quansu/gaode/adapter/SearchResultAdapter.java

@@ -106,7 +106,6 @@ public class SearchResultAdapter extends BaseAdapter {
             textTitle.setText(poiItem.getTitle());
             textSubTitle.setText(poiItem.getProvinceName()+poiItem.getCityName() + poiItem.getAdName() + poiItem.getSnippet());
 
-            Log.e("-shy-", "provincename=: " + poiItem.getProvinceName());
 
 
             imageCheck.setVisibility(position == selectedPosition ? View.VISIBLE : View.INVISIBLE);