1.对接一装一卸的地图选点。

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

@@ -1,5 +1,6 @@
 package com.quansu.heifengwuliu.component
 
+import android.util.Log
 import com.billy.cc.core.component.CC
 import com.billy.cc.core.component.CCResult
 import com.billy.cc.core.component.IComponent
@@ -30,6 +31,8 @@ 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())

app/src/main/java/com/quansu/heifengwuliu/fragment/OwnerSingleFragment.kt

@@ -16,6 +16,8 @@ import com.quansu.heifengwuliu.config.ConfigRx
 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
 import com.ysnows.base.base.BViewModel
 import com.ysnows.base.ccretrofit.CCRetrofit
@@ -41,6 +43,7 @@ class OwnerSingleFragment : MBFragment<BViewModel<BRepository>, FragmentOwnersin
     var cats= emptyArray<String>()
     private var outtabs = 0
     private var selectViewpage = 0
+    private var type=1
 
 
     override fun init(savedInstanceState: Bundle?) {
@@ -55,17 +58,49 @@ class OwnerSingleFragment : MBFragment<BViewModel<BRepository>, FragmentOwnersin
     private fun initData() {
 
         //卸货信息
-        binding.viewEnter.tvCity.hint = "请选择卸货地址"
+         binding.viewEnter.tvCity.setHint("请选择卸货地址")
          binding.viewEnter.llChoseMap.setOnClickListener {
             //地图选点
-            CCRetrofit.instance()
-                    .with(context)
-                    .create(IGaode::class.java)
-                    .selectLocation()
-                    .subscribe()
+
+             type=2
+             choseMap()
+
+        }
+
+
+        binding.viewOut.llChoseMap.setOnClickListener {
+            //地图选点
+            type=1
+            choseMap()
+
+
+
         }
     }
 
+
+    private fun choseMap(){
+
+        AndPermission.with(repository().context)
+                .runtime()
+                .permission(Permission.ACCESS_COARSE_LOCATION,
+                        Permission.ACCESS_FINE_LOCATION,
+                        Permission.WRITE_EXTERNAL_STORAGE,
+                        Permission.READ_EXTERNAL_STORAGE,
+                        Permission.READ_PHONE_STATE
+                )
+                .onGranted { data ->
+                    CCRetrofit.instance()
+                            .with(context)
+                            .create(IGaode::class.java)
+                            .selectLocation()
+                            .subscribe()
+
+                }
+                .start()
+
+    }
+
     private fun initViewPager() {
         val tabs: AList<TAB> = AList()
         for (cat in cats) {
@@ -161,9 +196,10 @@ class OwnerSingleFragment : MBFragment<BViewModel<BRepository>, FragmentOwnersin
     fun getPosition(bean: PositionBean) {
 
         var provincename=bean.provincename
-        var cityname=bean.cityname
-        var areaname=bean.areaname
-        Log.e("-shy-", "areaname=: "+areaname )
+        var latitude=bean.latitude
+        var longitude=bean.longitude
+        if(type==2) binding.viewEnter.etDetailedAddress.setText(bean.position)  else binding.viewOut.etDetailedAddress.setText(bean.position)
+
 
 
     }

gaode/src/main/java/com/quansu/gaode/activity/GaodeActivity.java

@@ -225,7 +225,6 @@ 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();

gaode/src/main/java/com/quansu/gaode/componnent/CpGaode.java

@@ -8,48 +8,27 @@ import com.billy.cc.core.component.CC;
 import com.billy.cc.core.component.CCResult;
 import com.billy.cc.core.component.IComponent;
 
+import com.quansu.gaode.activity.GaodeActivity;
 import com.yanzhenjie.permission.Action;
 import com.yanzhenjie.permission.AndPermission;
 import com.yanzhenjie.permission.runtime.Permission;
 import com.ysnows.base.base.BApp;
 import com.ysnows.base.ccextension.BIComponent;
 
-import java.util.List;
 
 
 public class CpGaode extends BIComponent implements IComponent {
 
     public boolean selectLocation(CC cc) {
 
-        Log.e("-shy-", "---3333- " );
+        Log.e("-shy-", "---3333- ");
 
-        AndPermission.with(BApp.instance().getApplicationContext())
-                .runtime()
-                .permission(Permission.ACCESS_COARSE_LOCATION,
-                        Permission.ACCESS_FINE_LOCATION,
-                        Permission.WRITE_EXTERNAL_STORAGE,
-                        Permission.READ_EXTERNAL_STORAGE,
-                        Permission.READ_PHONE_STATE
-                )
-                .onGranted(new Action<List<String>>() {
-                    /**
-                     * @param data
-                     */
-                    @Override
-                    public void onAction(List<String> data) {
+        Intent intent = new Intent(BApp.instance().getApplicationContext(), GaodeActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+        BApp.instance().getApplicationContext().startActivity(intent);
 
-                        Log.e("-shy-", "---- " );
+        // UiSwitch.single(BaseApp.getInstance().getApplicationContext(), com.quansu.gaode.activity.GaodeActivity.class);
 
-                        Intent intent = new Intent(BApp.instance().getApplicationContext(),com.quansu.gaode.activity.GaodeActivity.class);
-                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
-                        BApp.instance().getApplicationContext().startActivity(intent);
-
-
-                        // UiSwitch.single(BaseApp.getInstance().getApplicationContext(), com.quansu.gaode.activity.GaodeActivity.class);
-
-                    }
-
-                }).start();
 
         CC.sendCCResult(cc.getCallId(), CCResult.success());