Browse Source

1.提交。

石慧云 4 years ago
parent
commit
edd2ae2538

+ 0 - 2
app/src/main/java/com/quansu/heifengwuliu/activity/WithdrawalActivity.kt

@@ -21,7 +21,6 @@ class WithdrawalActivity : MBActivity<WithdrawalVModel, ActivityWithdrawalBindin
         vm.getBankInfo()
         vm.getTips()
     }
-
     override fun binding(): ActivityWithdrawalBinding {
        return ActivityWithdrawalBinding.inflate(layoutInflater)
     }
@@ -33,7 +32,6 @@ class WithdrawalActivity : MBActivity<WithdrawalVModel, ActivityWithdrawalBindin
     override fun title(): String? {
         return "提现"
     }
-
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if(MIntentAction.REQUEST_CODE_ONE == requestCode && resultCode == Activity.RESULT_OK){

+ 8 - 8
app/src/main/java/com/quansu/heifengwuliu/adapter/CarEnterAdapter.kt

@@ -74,14 +74,14 @@ class CarEnterAdapter(val vm: OwnerMoreVModel,val fm:FragmentManager) : BAdapter
 
         holder.dataBinding?.tvChoseTime!!.setOnClickListener {
             //选择时间
-            PopupUtils.setChoseTime(context, object : ChoiceData {
-                override fun onRestuse(time: String?) {
-                    if (time != null) {
-                        holder.dataBinding?.tvChoseTime!!.text = time
-                        item.time = time
-                    }
-                }
-            })
+//            PopupUtils.setChoseTime(context, object : ChoiceData {
+//                override fun onRestuse(time: String?) {
+//                    if (time != null) {
+//                        holder.dataBinding?.tvChoseTime!!.text = time
+//                        item.time = time
+//                    }
+//                }
+//            })
 
 
             var view=holder.dataBinding?.tvChoseTime

+ 2 - 2
app/src/main/java/com/quansu/heifengwuliu/config/Config.kt

@@ -7,8 +7,8 @@ class Config : IConfig {
       // return "https://heifengwuliu.qs110.com/"
      // return "https://heifengwuliudev.qs110.com/"
 
-      return "https://xinyunbida.qs110.com/"
-     //  return "https://xinyunbidadev.qs110.com/"
+     // return "https://xinyunbida.qs110.com/"
+       return "https://xinyunbidadev.qs110.com/"
 
     }
 

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

@@ -24,7 +24,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"

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

@@ -92,7 +92,6 @@
                  android:layout_marginStart="10dp"
                  android:layout_height="14dp"/>
 
-
         </LinearLayout>
 
         <LinearLayout

+ 20 - 2
gaode/src/main/java/com/quansu/gaode/activity/PolylineActivity.java

@@ -92,6 +92,9 @@ public class PolylineActivity extends AppCompatActivity  {
         }.getType());
 
 
+        Log.e("-shy-", "item=: "+item.size() );
+
+
         imgBack = findViewById(R.id.img_back);
         tvStart = findViewById(R.id.tv_start);
         tvEnd = findViewById(R.id.tv_end);
@@ -194,8 +197,23 @@ public class PolylineActivity extends AppCompatActivity  {
         // 终点信息
         List<NaviLatLng> endList = new ArrayList<NaviLatLng>();
         endList.add(new NaviLatLng(Double.parseDouble(item.get(item.size()-1).latitude),Double.parseDouble(item.get(item.size()-1).longitude)));
-        // 经纬度算路
-        mAMapNavi.calculateDriveRoute(startList, endList, null,
+
+        //中间停靠点
+        List<NaviLatLng> centerList = null;
+        if(item.size()>2) {
+            centerList=new ArrayList<NaviLatLng>();
+            int i=0;
+            for (PositionBean ss : item) {
+                if(i>0||i<item.size()-1) {
+                    if (!TextUtils.isEmpty(ss.latitude) && !TextUtils.isEmpty(ss.longitude)) {
+                        centerList.add(new NaviLatLng(Double.parseDouble(ss.latitude), Double.parseDouble(ss.longitude)));
+                    }
+                }
+                i++;
+            }
+        }
+       // 经纬度算路
+        mAMapNavi.calculateDriveRoute(startList, endList, centerList,
                 PathPlanningStrategy.DRIVING_MULTIPLE_ROUTES_DEFAULT);