.idea/gradle.xml
@@ -11,7 +11,6 @@ <option name="modules"> <set> <option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$/ChipsLayoutManager" /> <option value="$PROJECT_DIR$/app" /> <option value="$PROJECT_DIR$/easyfloat" /> <option value="$PROJECT_DIR$/rxnetty" /> ChipsLayoutManager/.gitignore
File was deleted ChipsLayoutManager/build.gradle
File was deleted ChipsLayoutManager/proguard-rules.pro
File was deleted ChipsLayoutManager/src/androidTest/java/com/beloo/widget/chipslayoutmanager/ParamsType.java
File was deleted ChipsLayoutManager/src/androidTest/java/com/beloo/widget/chipslayoutmanager/gravity/BottomGravityModifierTest.java
File was deleted ChipsLayoutManager/src/androidTest/java/com/beloo/widget/chipslayoutmanager/gravity/CenterInRowGravityModifierTest.java
File was deleted ChipsLayoutManager/src/androidTest/java/com/beloo/widget/chipslayoutmanager/gravity/GravityDataProvider.java
File was deleted ChipsLayoutManager/src/androidTest/java/com/beloo/widget/chipslayoutmanager/gravity/GravityModifierTest.java
File was deleted ChipsLayoutManager/src/androidTest/java/com/beloo/widget/chipslayoutmanager/gravity/RowGravityModifiersFactoryTest.java
File was deleted ChipsLayoutManager/src/androidTest/java/com/beloo/widget/chipslayoutmanager/gravity/TopGravityModifierTest.java
File was deleted ChipsLayoutManager/src/main/AndroidManifest.xml
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/ChildViewsIterable.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/ChipsLayoutManager.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/DeviceOrientation.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/DisappearingViewsManager.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/HorizontalScrollingController.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/IBorder.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/IChipsLayoutManagerContract.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/IDisappearingViewsManager.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/IPositionsContract.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/IScrollingContract.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/IScrollingController.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/IStateHolder.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/Orientation.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/ParcelableContainer.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/RowStrategy.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/ScrollingController.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/SpacingItemDecoration.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/SpanLayoutChildGravity.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/VerticalScrollingController.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/anchor/AbstractAnchorFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/anchor/AnchorViewState.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/anchor/ColumnsAnchorFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/anchor/IAnchorFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/anchor/RowsAnchorFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/cache/CacheParcelableContainer.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/cache/IViewCacheStorage.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/cache/ViewCacheFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/cache/ViewCacheStorage.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/BottomGravityModifier.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/CenterChildGravity.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/CenterInColumnGravityModifier.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/CenterInRowGravityModifier.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/ColumnFillSpaceCenterDenseStrategy.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/ColumnFillSpaceCenterStrategy.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/ColumnFillSpaceStrategy.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/ColumnFillStrategy.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/ColumnGravityModifiersFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/ColumnStrategyFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/CustomGravityResolver.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/EmptyRowStrategy.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/GravityUtil.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/IChildGravityResolver.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/IGravityModifier.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/IGravityModifiersFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/IRowStrategy.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/IRowStrategyFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/LTRRowFillSpaceCenterDenseStrategy.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/LTRRowFillSpaceCenterStrategy.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/LTRRowFillSpaceStrategy.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/LTRRowFillStrategy.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/LTRRowStrategyFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/LeftGravityModifier.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/RTLRowFillSpaceCenterDenseStrategy.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/RTLRowFillSpaceCenterStrategy.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/RTLRowFillSpaceStrategy.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/RTLRowFillStrategy.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/RTLRowStrategyFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/RightGravityModifier.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/RowGravityModifiersFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/SkipLastRowStrategy.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/StrategyDecorator.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/TopGravityModifier.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/AbstractLayouter.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/AbstractPositionIterator.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/ColumnSquare.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/ColumnsCreator.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/ColumnsStateFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/DecrementalPositionIterator.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/ICanvas.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/ILayouter.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/ILayouterCreator.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/ILayouterListener.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/IMeasureSupporter.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/IOrientationStateFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/IStateFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/IncrementalPositionIterator.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/Item.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/LTRDownLayouter.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/LTRRowsCreator.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/LTRRowsOrientationStateFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/LTRUpLayouter.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/LayouterFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/LeftLayouter.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/MeasureSupporter.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/RTLDownLayouter.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/RTLRowsCreator.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/RTLRowsOrientationStateFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/RTLUpLayouter.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/RightLayouter.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/RowSquare.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/RowsStateFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/Square.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/BackwardBreakerContract.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/CacheRowBreaker.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/ColumnBreakerFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/DecoratorBreakerFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/EmptyRowBreaker.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/ForwardBreakerContract.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/IBreakerFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/ILayoutRowBreaker.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/IRowBreaker.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/LTRBackwardColumnBreaker.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/LTRBackwardRowBreaker.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/LTRForwardColumnBreaker.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/LTRForwardRowBreaker.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/LTRRowBreakerFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/MaxViewsBreaker.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/RTLBackwardRowBreaker.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/RTLForwardRowBreaker.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/RTLRowBreakerFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/breaker/RowBreakerDecorator.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/AbstractCriteriaFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/ColumnsCriteriaFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/CriteriaAdditionalRow.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/CriteriaDownAdditionalHeight.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/CriteriaDownLayouterFinished.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/CriteriaLeftAdditionalWidth.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/CriteriaLeftLayouterFinished.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/CriteriaPolitePositionReached.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/CriteriaRightAdditionalWidth.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/CriteriaRightLayouterFinished.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/CriteriaUpAdditionalHeight.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/CriteriaUpLayouterFinished.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/EmtpyCriteria.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/FinishingCriteriaDecorator.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/ICriteriaFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/IFinishingCriteria.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/InfiniteCriteria.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/InfiniteCriteriaFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/PreLayoutCriteriaFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/criteria/RowsCriteriaFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/placer/AbstractPlacer.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/placer/DisappearingPlacerFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/placer/DisappearingViewAtEndPlacer.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/placer/DisappearingViewAtStartPlacer.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/placer/IPlacer.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/placer/IPlacerFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/placer/PlacerFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/placer/RealAtEndPlacer.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/placer/RealAtStartPlacer.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/layouter/placer/RealPlacerFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/util/AssertionUtils.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/util/LayoutManagerUtil.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/util/StateHelper.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/util/log/AndroidLog.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/util/log/FillLogger.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/util/log/IFillLogger.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/util/log/Log.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/util/log/LogSwitcherFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/util/log/LogWrapper.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/util/log/LoggerFactory.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/util/log/SilentLog.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/util/testing/EmptySpy.java
File was deleted ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/util/testing/ISpy.java
File was deleted ChipsLayoutManager/src/test/java/com/beloo/widget/chipslayoutmanager/layouter/AbstractPositionIteratorTest.java
File was deleted ChipsLayoutManager/src/test/java/com/beloo/widget/chipslayoutmanager/layouter/DecrementalPositionIteratorTest.java
File was deleted ChipsLayoutManager/src/test/java/com/beloo/widget/chipslayoutmanager/layouter/IncrementalPositionIteratorTest.java
File was deleted app/build.gradle
@@ -122,7 +122,7 @@ implementation 'com.google.zxing:core:3.3.0' implementation 'cn.jiguang.sdk:jpush:3.6.6' // 此处以JPush 3.6.6 版本为例。 implementation 'cn.jiguang.sdk:jcore:2.3.8' // 此处以JCore 2.3.8 版本为例。 implementation project(path: ':ChipsLayoutManager') implementation 'com.github.BelooS:ChipsLayoutManager:v0.3.7' //http日志拦截器 implementation 'com.squareup.okhttp3:logging-interceptor:3.8.1' implementation project(path: ':easyfloat') app/release/output.json
@@ -1 +1 @@ [{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":21,"versionName":"1.98","enabled":true,"outputFile":"xianning-1.98-2025-06-27.apk","fullName":"release","baseName":"release","dirName":""},"path":"xianning-1.98-2025-06-27.apk","properties":{}}] [{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":21,"versionName":"1.98","enabled":true,"outputFile":"xianning-1.98-2025-08-28.apk","fullName":"release","baseName":"release","dirName":""},"path":"xianning-1.98-2025-08-28.apk","properties":{}}] app/release/xianning-1.98-2025-08-28.apkBinary files differ
app/src/main/AndroidManifest.xml
@@ -109,6 +109,8 @@ <activity android:name="com.xianning.driver.ui.card.VerifyCardPwdActivity"/> <activity android:name="com.xianning.driver.ui.card.CommitPwdActivity"/> <activity android:name="com.xianning.driver.ui.card.CommitPwdTwoActivity"/> <activity android:name=".ui.main.small_cargo.SmallOverActivity" /> <activity android:name="com.xianning.driver.ui.main.GetOrderFragment" android:theme="@style/FadeDialog" /> @@ -170,7 +172,9 @@ <activity android:name=".ui.to_city.TripCityActivity" /> <activity android:name=".ui.to_city.SelectPeopleActivity" /> <activity android:name=".ui.to_city.CityOrderOverActivity" /> <activity android:name=".ui.main.CancelActivity" /> <!-- 微信 --> <activity android:name=".ui.main.CancelActivity" /> <activity android:name=".ui.to_city.SelectDriverActivity" /> <activity android:name=".ui.main.small_cargo.SmallCargoActivity" /> <!-- 微信 --> <!-- Since JCore2.0.0 Required SDK核心功能--> <!-- 可配置android:process参数将Service放在其他进程中；android:enabled属性不能是false --> app/src/main/java/com/xianning/driver/base/MyApplication.kt
@@ -205,7 +205,7 @@ if (orderSimpleData.status == 1) { val act = activities[activities.size - 1] when (orderSimpleData.orderType) { 1,2 -> { 1,2,3 ,4-> { (act as MyBaseActivity).showOrder( orderSimpleData.orderId.toString(), orderSimpleData.orderType.toString(), app/src/main/java/com/xianning/driver/base/MyBaseActivity.java
@@ -149,9 +149,12 @@ public void showOrder(String orderId, String orderType, int time, int type,String audio) { // MyApplication.Companion.getTTsManager().setVideoText("咸宁95128约车司机，有一条新的订单"); Intent intent; if (audio.isEmpty()) intent = new Intent(this, GetOrderFragment.class); else{ if (audio.isEmpty()){ if (orderType.equals("3")) intent = new Intent(this, GetCityFragment.class); else intent = new Intent(this, GetOrderFragment.class); } else{ intent = new Intent(this, VoiceOrderFragment.class); intent.putExtra("audio", audio); } app/src/main/java/com/xianning/driver/base/gaode/BaiduUtils.java
@@ -38,7 +38,7 @@ @Override public void onGetDrivingRouteResult(DrivingRouteResult drivingRouteResult) { //驾车 if (drivingRouteResult.getRouteLines().size()>0){ if (drivingRouteResult.getRouteLines()!=null&&drivingRouteResult.getRouteLines().size()>0){ DrivingRouteLine drivingRouteLine = drivingRouteResult.getRouteLines().get(0); ArrayList<LatLng> latLngs = new ArrayList<>(); for (int i=0;i<drivingRouteLine.getAllStep().size();i++){ app/src/main/java/com/xianning/driver/bean/LineDriverBean.kt
New file @@ -0,0 +1,14 @@ package com.xianning.driver.bean data class LineDriverBean( val code: Int, val `data`: List<LineDriverData>, val msg: String ) data class LineDriverData( val avatar: String, val id: String, val licensePlate: String, val name: String ) app/src/main/java/com/xianning/driver/netUtls/Api.java
@@ -60,6 +60,13 @@ public static String addCancelOrder = "api/order/addCancelOrder"; public static String setOrderCrossCitySort = "api/orderCrossCity/setOrderCrossCitySort"; ///api/orderCrossCity/setOrderCrossCitySort 修改订单顺序（跨城） public static String sendVerificationCode = "api/order/sendVerificationCode"; ///sendVerificationCode public static String makeUpTheDifference = "api/order/makeUpTheDifference"; ///api/order/makeUpTheDifference 设置小件物流差价 public static String fillInPickUpCode = "api/order/fillInPickUpCode"; ///api/order/fillInPickUpCode 设置小件物流取件码 /** * 消息 */ @@ -146,5 +153,8 @@ public static String queryCityOrderInfo = "api/orderCrossCity/queryOrderInfo"; //api/orderCrossCity/queryOrderInfo 获取订单跨城详情 public static String queryReassignMoney = "api/order/queryReassignMoney"; ///api/order/queryReassignMoney 获取改派支付金额 public static String reassign = "api/order/reassign"; ///api/order/reassign 提交改派申请 public static String querySameLineDriver = "api/orderCrossCity/querySameLineDriver"; ///api/order/reassign 提交改派申请 } app/src/main/java/com/xianning/driver/ui/DialogUtil.kt
@@ -136,7 +136,6 @@ return dialog } fun getNetListDialog(arrayList: ArrayList<String>,showView: View,context: Context,okclick:(allMode:String) -> Unit):EasyPopup{ var pop = getPopupwindow(context,R.layout.dialog_server_mode) pop.showDown(showView) app/src/main/java/com/xianning/driver/ui/adapter/MainAdapter.kt
@@ -12,6 +12,8 @@ import com.xianning.driver.ui.main.TripActivity import com.xianning.driver.ui.main.major.MajorSureMoneyActivity import com.xianning.driver.ui.main.major.MajorSureMoneyOfflineActivity import com.xianning.driver.ui.main.small_cargo.SmallCargoActivity import com.xianning.driver.ui.main.small_cargo.SmallOverActivity import com.xianning.driver.ui.mine.ComplainOrderActivity import com.xianning.driver.ui.to_city.TripCityActivity import kotlinx.android.synthetic.main.item_main_list.view.* @@ -72,10 +74,16 @@ if (item.type == 4 || item.type == 5){ when(item.state){ 1,2,3,4,5,7,8,9,12 ->{ context.startActivity<SmallCargoActivity>( "orderId" to item.id.toString(), "orderType" to item.type.toString() ) } 6,10->{ context.startActivity<SmallOverActivity>( "orderId" to item.id.toString(), "orderType" to item.type.toString() ) } 11 -> { toast("订单改派中") app/src/main/java/com/xianning/driver/ui/adapter/SelectDriverAdapter.kt
New file @@ -0,0 +1,32 @@ package com.xianning.driver.ui.adapter import android.view.View import com.xianning.driver.R import com.xianning.driver.base.BaseRvAdapter import com.xianning.driver.base.BaseViewHolder import com.xianning.driver.bean.LineDriverData import kotlinx.android.synthetic.main.item_select_driver.view.* class SelectDriverAdapter: BaseRvAdapter<LineDriverData>() { var selectItem = -1 override fun getLayoutResId(viewType: Int): Int { return R.layout.item_select_driver } override fun onBindItem(holder: BaseViewHolder?, view: View?, item: LineDriverData) { holder?.let { if (item.id.isEmpty()){ it.itemView.iv_avatar.setActualImageResource(R.mipmap.default_driver) it.itemView.tv_name.text = "平台转派" }else{ it.itemView.iv_avatar.setImageURI(item.avatar) it.itemView.tv_name.text = "${item.name}·${item.licensePlate}" } it.itemView.cb.setImageResource(if (holder.layoutPosition == selectItem) R.mipmap.icon_raidobutton_selected else R.mipmap.icon_raidobutton) } } } app/src/main/java/com/xianning/driver/ui/adapter/SelectPeopleAdapter.kt
@@ -20,7 +20,7 @@ override fun onBindItem(holder: BaseViewHolder?, view: View?, item: OrderCityBean.CityDataBean?) { holder?.let { it.itemView.tv_name.text = item!!.nickName it.itemView.tv_time.text = item!!.travelTime.substring(0,16)+"/"+item!!.peopleNumber+"人乘车" it.itemView.tv_time.text = item!!.travelTime.take(16)+"/"+item!!.peopleNumber+"人乘车" it.itemView.tv_start_address.text = item!!.startAddress it.itemView.tv_end_address.text = item!!.endAddress it.itemView.smooth_cb.isEnabled = item.orderState < 6 app/src/main/java/com/xianning/driver/ui/main/GetOrderFragment.kt
@@ -15,6 +15,7 @@ import com.xianning.driver.ui.UiUtil import com.google.gson.Gson import com.xianning.driver.base.gaode.BaiduUtils import com.xianning.driver.ui.main.small_cargo.SmallCargoActivity import kotlinx.android.synthetic.main.item_get_order.* import kotlinx.android.synthetic.main.item_map_market.view.* import org.jetbrains.anko.startActivity @@ -207,7 +208,10 @@ } "4", "5" -> { this.startActivity<SmallCargoActivity>( "orderId" to orderId, "orderType" to orderType ) } } } app/src/main/java/com/xianning/driver/ui/main/MainActivity.kt
@@ -198,8 +198,10 @@ if (RxPermissions(this).isGranted(Manifest.permission.ACCESS_FINE_LOCATION)){ listener = object :BDAbstractLocationListener(){ override fun onReceiveLocation(p0: BDLocation?) { MyApplication.aMapLocation = p0 CacheKey.putKeyStr("location",Gson().toJson(p0)) if (p0!=null&&p0.longitude!= 4.9E-324){ MyApplication.aMapLocation = p0 CacheKey.putKeyStr("location",Gson().toJson(p0)) } } } locationClient = AMapKit.initLocation(this, listener!!) app/src/main/java/com/xianning/driver/ui/main/ReassignActivity.kt
@@ -36,6 +36,10 @@ intent.getStringExtra("orderId") } val driverId by lazy { intent.getStringExtra("driverId") } val adapter by lazy { ReassignAdapter() } @@ -97,6 +101,8 @@ private fun callGp(payType: String) { var map = getMapByAny() if (!driverId.isNullOrEmpty()) map["newDriverId"] = driverId map["orderIds"] = orderId map["reason"] = adapter.array[adapter.selectPosition] if (!et_content.getContent().isNullOrEmpty()){ app/src/main/java/com/xianning/driver/ui/main/TripActivity.kt
@@ -41,6 +41,7 @@ import com.xianning.driver.base.gaode.gpsnav.BaiduNaviActivity import com.xianning.driver.bean.MajorMoneyBean import com.xianning.driver.ui.main.major.MajorSureMoneyOfflineActivity import com.xianning.driver.utils.Cache.CacheKey import com.ypx.imagepicker.utils.PBitmapUtils import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers @@ -393,8 +394,10 @@ listener = object :BDAbstractLocationListener(){ override fun onReceiveLocation(it: BDLocation?) { it?.let { MyApplication.aMapLocation = it carMarker!!.position = LatLng(it.latitude, it.longitude) if (it.longitude!= 4.9E-324){ MyApplication.aMapLocation = it carMarker!!.position = LatLng(it.latitude, it.longitude) } } orderBean.let { when (it.data.orderState) { app/src/main/java/com/xianning/driver/ui/main/small_cargo/SmallCargoActivity.kt
New file @@ -0,0 +1,765 @@ package com.xianning.driver.ui.main.small_cargo import android.os.Bundle import android.os.Handler import android.os.Looper import android.view.View import androidx.core.os.bundleOf import cn.sinata.xldutils.utils.* import com.baidu.location.BDAbstractLocationListener import com.baidu.location.BDLocation import com.baidu.location.LocationClient import com.baidu.mapapi.map.BaiduMap import com.baidu.mapapi.map.Marker import com.baidu.mapapi.map.Overlay import com.baidu.mapapi.model.LatLng import com.baidu.navisdk.adapter.BNRoutePlanNode import com.baidu.navisdk.adapter.BaiduNaviManagerFactory import com.baidu.navisdk.adapter.IBNRoutePlanManager import com.google.gson.Gson import com.trello.rxlifecycle3.android.ActivityEvent import com.xianning.driver.R import com.xianning.driver.base.BaseEvent import com.xianning.driver.base.MyApplication import com.xianning.driver.base.MyBaseActivity import com.xianning.driver.base.gaode.AMapKit import com.xianning.driver.base.gaode.AMapKit.addMarker import com.xianning.driver.base.gaode.AMapKit.getIcon import com.xianning.driver.base.gaode.AMapKit.getTimeType import com.xianning.driver.base.gaode.AMapKit.initMap import com.xianning.driver.base.gaode.AMapKit.moveCamera import com.xianning.driver.base.gaode.BaiduUtils import com.xianning.driver.bean.OrderBean import com.xianning.driver.bean.OrderSimpleData import com.xianning.driver.bean.RessignBean import com.xianning.driver.netUtls.Api import com.xianning.driver.netUtls.callNet import com.xianning.driver.netUtls.createView import com.xianning.driver.netUtls.getMapByAny import com.xianning.driver.ui.DialogUtil import com.xianning.driver.ui.main.FillOutActivity import com.xianning.driver.ui.main.OrderOverActivity import com.xianning.driver.ui.main.ReassignActivity import com.xianning.driver.utils.Cache.CacheKey import com.xianning.driver.utils.DateUtil import com.xianning.driver.utils.MyUtils import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers import kotlinx.android.synthetic.main.activity_trip.* import kotlinx.android.synthetic.main.activity_trip.iv_move import kotlinx.android.synthetic.main.activity_trip.iv_police import kotlinx.android.synthetic.main.activity_trip.iv_to_gd import kotlinx.android.synthetic.main.activity_trip.map_view import kotlinx.android.synthetic.main.activity_trip.slide_btn import kotlinx.android.synthetic.main.activity_trip_cargo.* import kotlinx.android.synthetic.main.dialog_select_pay_type.view.* import kotlinx.android.synthetic.main.dialog_show_cargo_money.view.* import kotlinx.android.synthetic.main.dialog_show_cha_money.view.* import kotlinx.android.synthetic.main.include_order_top_cargo.* import kotlinx.android.synthetic.main.item_map_market.view.* import org.greenrobot.eventbus.EventBus import org.jetbrains.anko.startActivity import org.jetbrains.anko.toast import java.util.* import java.util.concurrent.TimeUnit class SmallCargoActivity : MyBaseActivity() { /*** * 1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=送货中，6=已送达，7=待支付，8=需补差价，9=已取货，10=已取消，11=改派中，12=已支付差价 integer($int32) 订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付） */ /*** * // 流程操作状态（3=开始出发预约点，4=到达预约点，5=开始服务，6=服务结束） * 页面一共4个marker 1：预约地点 2：起点 3终点 4：司机点 */ val orderType by lazy { intent.getStringExtra("orderType") } val orderId by lazy { intent.getStringExtra("orderId") } var isTimeStart = false //限制计时器 var makeMarker: Marker? = null var startMarker: Marker? = null var endMarker: Marker? = null var carMarker: Marker? = null var markerLine: Overlay? = null lateinit var aMap: BaiduMap lateinit var orderBean: OrderBean private var listener:BDAbstractLocationListener? = null private var locationClient: LocationClient? = null var naviHandler: Handler? = null override fun setContentView() { setContentView(R.layout.activity_trip_cargo) } override fun initView() { setTitleText("准备出发-去接客户-等待客户-服务中") tv_Right.text = "申请改派" callOrder() initMineLocation() onclick() addSockectCancel() } private fun addSockectCancel() { checkOrderStatue() MyApplication.addOrderView(viewOrder) } var viewOrder = object : MyApplication.OrderStatueView { override fun orderInfo(data: OrderSimpleData?) { data?.let { if (it.orderType == 4 || it.orderType == 5){ if (it.status == 10 || it.status == 11) { Handler(Looper.getMainLooper()).post { if (it.status == 10) { MyApplication.getTTsManager().setVideoText("用户已取消订单") } else { MyApplication.getTTsManager().setVideoText("用户已改派订单") } finish() } } if (it.orderId.toString() == orderId && (it.status != 10 && it.status != 11)) { Handler(Looper.getMainLooper()).post { callOrder() } } } } } } var handler: Handler? = null fun checkOrderStatue() { var map = getMapByAny() map["orderId"] = orderId map["orderType"] = orderType callNet(false, Api.orderStateSocket, map) { val orderSimpleData = Gson().fromJson( it, OrderSimpleData::class.java ) orderSimpleData?.let { if (it.status == 10 || it.status == 12) { Handler(Looper.getMainLooper()).post { MyApplication.getTTsManager().setVideoText("用户已取消订单") finish() } } } } handler?.postDelayed({ checkOrderStatue() }, 3000) } override fun onBackPressed() { EventBus.getDefault().post(BaseEvent(BaseEvent.UPDATA_MAIN_CAR)) super.onBackPressed() } override fun finish() { EventBus.getDefault().post(BaseEvent(BaseEvent.UPDATA_MAIN_CAR)) super.finish() } private fun onclick() { tv_Right.clickDelay { var map = getMapByAny() map["orderId"] = orderId map["orderType"] = orderType callNet(Api.queryReassignMoney, map) { val data = gson.fromJson<RessignBean>(it, RessignBean::class.java) if (data.data.amount.isNullOrEmpty()) { startActivity<ReassignActivity>( "orderId" to orderId, "orderType" to orderType ) } else { DialogUtil.getDelAndSureDialog( this, "现在改派将收取" + data.data.amount + "元改派费，您是否要进行改派？", {}, { //跳转改派页面 startActivity<ReassignActivity>( "orderId" to orderId, "orderType" to orderType, "money" to data.data.amount.toString() ) }) } } } tv_gap_money.clickDelay { if (orderBean.data.orderState == 12) { toast("用户已支付差价，不能修改") return@clickDelay } var dialog = DialogUtil.getDialog(this, R.layout.dialog_show_cha_money) var viewContent = DialogUtil.getView(dialog) viewContent.view_hint_close_car_cha.setOnClickListener { dialog.dismiss() } viewContent.tv_car_num_close_cha.setOnClickListener { dialog.dismiss() } viewContent.tv_sure_car_num_cha.setOnClickListener { var num = viewContent.et_num_zg_cha.getContent() if (num.isEmpty()) { toast("请输入金额") return@setOnClickListener } if (num.toDouble() > 9999) { toast("金额不能大于9999元") return@setOnClickListener } if (num.toDouble() <= 0) { toast("金额不能小于0元") return@setOnClickListener } callseatmoney(num) { dialog.dismiss() tv_gap_money.gone() ll_gp_money.visible() tv_dif.text = "￥" + doubleTwo(num.toDouble()) + " 差价" orderBean.let { it.data.orderState = 8 } toast("设置成功") } } } ll_gp_money.clickDelay { tv_gap_money.callOnClick() } iv_move.setOnClickListener { orderBean.let { when (it.data.orderState) { 2, 3 -> { moveCamera(aMap, makeMarker!!.position, carMarker!!.position) } 4 -> { moveCamera(aMap, carMarker!!.position) } 5, 6 -> { moveCamera(aMap, carMarker!!.position, endMarker!!.position) } } } } iv_police.clickDelay { orderBean.let { MyUtils.getInstans().CallPhone(this, it.data.emergencyCall) } } iv_to_gd.clickDelay { orderBean.let { when (it.data.orderState) { 2, 3 -> { startNavi(carMarker!!.position,makeMarker!!.position) } 4 -> { showToast("没有终点，无法导航") } 5, 6 -> { startNavi(carMarker!!.position,endMarker!!.position) } } } } // * 1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=送货中，6=已送达，7=待支付，8=需补差价，9=已取货，10=已取消，11=改派中，12=已支付差价 slide_btn.onSwipeListener = { orderBean.let { when (it.data.orderState) { 2, 3, 4 -> { it.data.orderState++ callStatue(it.data.orderState) {} showStatueMapUI(it) } 5, 6 -> { sendCode() { it.data.orderState = 6 var dialog = DialogUtil.getDialog(this, R.layout.dialog_show_cargo_money) var viewContent = DialogUtil.getView(dialog) viewContent.view_hint_close_car.setOnClickListener { dialog.dismiss() } viewContent.tv_car_num_close.setOnClickListener { dialog.dismiss() } viewContent.tv_sure_car_num.setOnClickListener { var num = viewContent.et_num_zg.getContent() if (num.isEmpty()) { toast("请输入验证码") return@setOnClickListener } callNumberCargo(num) { dialog.dismiss() callStatue(orderBean.data.orderState) { startActivity<SmallOverActivity>( "orderId" to orderId, "orderType" to orderType ) finish() } } } } } 12 -> { it.data.orderState = 5 callStatue(it.data.orderState) {} showStatueMapUI(it) } 8 -> { toast("等待用户支付差价") } else -> { } } } } iv_phone.clickDelay { orderBean.let { Utils.callPhone(this, it.data.phone) } } } private fun sendCode(function: () -> Unit) { var map = getMapByAny() map["orderId"] = orderId callNet(Api.sendVerificationCode, map) { function() } } private fun callNumberCargo(num: String, click: () -> Unit) { var map = getMapByAny() map["orderId"] = orderId map["pickUpCode"] = num callNet(Api.fillInPickUpCode, map) { click() } } private fun callseatmoney(num: String, click: () -> Unit) { var map = getMapByAny() map["orderId"] = orderId map["difference"] = doubleTwo(num.toDouble()) callNet(Api.makeUpTheDifference, map) { click() } } private fun callStatue(i: Int, click: () -> Unit) { var map = getMapByAny() map["orderId"] = orderId map["orderType"] = orderType map["state"] = i map["lat"] = MyApplication.getLocation().latitude map["lon"] = MyApplication.getLocation().longitude callNet(Api.process, map) { click() } } private fun showMoneyTypeDialog() { var pop = DialogUtil.getPopupwindow(this, R.layout.dialog_select_pay_type) var payType = 1 //支付方式（1=OK平台收款，2=其他方式收款） pop.showDown(window.decorView) pop.contentView.tv_cancel.setOnClickListener { pop.dismiss() } pop.contentView.tv_ok.setOnClickListener { pop.dismiss() if (payType == 1) { callStatue(6) { startActivity<FillOutActivity>("orderId" to orderId, "orderType" to orderType) finish() } } else { DialogUtil.getDelAndSureDialog(this, "请确定是否收款？", {}, { pop.dismiss() val map = getMapByAny() map["orderId"] = orderId map["orderType"] = orderType map["type"] = payType callStatue(6) { callNet(Api.confirmFees, map) { finish() startActivity<OrderOverActivity>( "orderId" to orderId, "orderType" to orderType ) } } }) } } pop.contentView.tv_select_ok.setOnClickListener { pop.contentView.tv_select_ok.alpha = 1f pop.contentView.tv_select_ok.textSize = 16f pop.contentView.tv_select_or.alpha = 0.6f pop.contentView.tv_select_or.textSize = 14f payType = 1 } pop.contentView.tv_select_or.setOnClickListener { pop.contentView.tv_select_ok.alpha = 0.6f pop.contentView.tv_select_ok.textSize = 14f pop.contentView.tv_select_or.alpha = 1f pop.contentView.tv_select_or.textSize = 16f payType = 2 } } /*** * 定位时司机与线路的改变 */ private fun initMineLocation() { listener = object : BDAbstractLocationListener(){ override fun onReceiveLocation(it: BDLocation?) { it?.let { if (it.longitude!= 4.9E-324){ MyApplication.aMapLocation = it carMarker!!.position = LatLng(it.latitude, it.longitude) } } orderBean.let { when (it.data.orderState) { 2, 3 -> { changeCarThree(false) } 5, 6 -> { changeCarFive(false) } } } } } locationClient = AMapKit.initLocation(this, listener!!) } private fun changeCarThree(isMove: Boolean) { if (makeMarker != null && carMarker != null) { BaiduUtils.initRouteLine(carMarker!!.position,makeMarker!!.position,null,object : BaiduUtils.Callback{ override fun onGetDrivingRouteResult( latLngs: ArrayList<LatLng>?, lineTance: Float, lineTime: Long ) { var view = creatCarView("距预约点" + AMapKit.getTance(lineTance)) carMarker!!.setIcon(AMapKit.getIcon(view)) addline(latLngs?: arrayListOf()) if (isMove) moveCamera(aMap, makeMarker!!.position, carMarker!!.position) } }) } } private fun changeCarFive(isMove: Boolean) { if (carMarker != null && endMarker != null) { BaiduUtils.initRouteLine(carMarker!!.position,endMarker!!.position,null,object :BaiduUtils.Callback{ override fun onGetDrivingRouteResult( latLngs: ArrayList<LatLng>, lineTance: Float, lineTime: Long ) { addline(latLngs) var view = creatCarView("剩余" + AMapKit.getTance(lineTance) + "\n" + "预计还需" + lineTime.toInt() + "分钟") carMarker!!.setIcon(AMapKit.getIcon(view)) if (isMove) { AMapKit.moveCamera3( aMap, carMarker!!.position, endMarker!!.position, carMarker!!.position ) } } }) } } private fun callOrder() { var map = getMapByAny() map["orderId"] = orderId map["orderType"] = orderType callNet(Api.queryOrderInfo, map) { orderBean = gson.fromJson(it, OrderBean::class.java) showUi(orderBean) } } private fun showUi(orderBean: OrderBean?) { orderBean?.let { tv_name.text = orderBean.data.nickName tv_car_num.text = it.data.historyNum.toString() + "次寄物" tv_time.text = it.data.travelTime_ tv_start_address.text = it.data.startAddress tv_end_address.text = it.data.endAddress showStatueMapUI(it) var cargoStrType = if (orderBean.data.cargoType == "1") "普通小件X" else "贵重物品X" tv_tv_num_cargo.text = cargoStrType + orderBean.data.peopleNumber tv_people_cargo.text = orderBean.data.nickName + "-" + orderBean.data.phone if (orderBean.data.tipMoney != null && orderBean.data.tipMoney > 0.0) { tv_money_cargo.text = doubleTwo(orderBean.data.tipMoney) + "元加急费" } else { tv_money_cargo.gone() } if (!it.data.differenceMoney.isNullOrEmpty() && it.data.differenceMoney.toDouble() > 0) { tv_gap_money.gone() ll_gp_money.visible() tv_dif.text = "￥" + doubleTwo(it.data.differenceMoney.toDouble()) + " 差价" } } } private fun getAllMark(it: OrderBean) { if (makeMarker == null) { val view = createView(R.layout.item_map_market_make, this) view.iv_img.setImageResource(R.mipmap.trip_yuyue) makeMarker = addMarker(aMap, it.data.startLat, it.data.startLon, view, "") as Marker } makeMarker!!.isVisible = false if (startMarker == null) { val view = createView(R.layout.item_map_market, this) view.iv_img.setImageResource(R.mipmap.starting_point) startMarker = addMarker(aMap, it.data.startLat, it.data.startLon, view, "") as Marker } startMarker!!.isVisible = false if (endMarker == null) { val view = createView(R.layout.item_map_market, this) view.iv_img.setImageResource(R.mipmap.end_point) endMarker = addMarker(aMap, it.data.endLat, it.data.endLon, view, "") as Marker } endMarker!!.isVisible = false if (carMarker == null) { val carView = creatCarView("") carMarker = addMarker( aMap, MyApplication.getLocation().latitude, MyApplication.getLocation().longitude, carView, "" ) as Marker } carMarker!!.isVisible = false if (markerLine != null) { markerLine!!.isVisible = false } } fun creatCarView(content: String): View { val carView = createView(R.layout.item_map_market, this) carView.iv_img.setImageResource(R.mipmap.car_trip) carView.tv_hint.visible() carView.tv_hint.text = content return carView } fun creatCarViewHint(content: String): View { val carView = createView(R.layout.item_map_market, this) carView.iv_img.setImageResource(R.mipmap.car_trip) carView.tv_hint.visible() carView.tv_hint.setColorBuild(this, content, R.color.main_yellow, 4, content.length) return carView } // 流程操作状态（3=开始出发预约点，4=到达预约点，5=开始服务，6=服务结束） private fun showStatueMapUI(it: OrderBean) { getAllMark(it) tv_gap_money.gone() ll_gp_money.gone() if (it.data.orderState == 4 || it.data.orderState == 8 || it.data.orderState == 12) { tv_gap_money.visible() } tv_Right.visible() when (it.data.orderState) { 2, 3 -> { if (it.data.reassign == 1) { tv_Right.gone() } iv_to_gd.visible() makeMarker?.isVisible = true carMarker?.isVisible = true changeCarThree(true) closeTimeStart() if (it.data.orderState == 2) { slide_btn.changeButtonText("出发前往预约地点") setTitleText("准备出发") } else { slide_btn.changeButtonText("到达预约地点") setTitleText("去领取货物") } } 4, 8, 12 -> { iv_to_gd.gone() if (it.data.reassign == 1) { tv_Right.gone() } closeLine() carMarker?.isVisible = true startTimeStart( ((System.currentTimeMillis() - DateUtil.dateToStamp( DateUtil.TYPE0, it.data.waitTime )) / 1000).toInt() ) moveCamera(aMap, carMarker!!.position) setTitleText("等待取货") slide_btn.changeButtonText("确认收货") } 5, 6 -> { closeTimeStart() iv_to_gd.visible() tv_Right.gone() startMarker?.isVisible = true endMarker?.isVisible = true carMarker?.isVisible = true changeCarFive(true) setTitleText("送货中") slide_btn.changeButtonText("确认送达") } } } private fun startTimeStart(waitTime: Int) { if (!isTimeStart) { isTimeStart = true refreshTime(waitTime) { var view = creatCarViewHint("您已等待" + getTimeType(it)) carMarker!!.setIcon(getIcon(view)) } } } private var timeDisposable: Disposable? = null private fun refreshTime(waitTime: Int, click: (num: Int) -> Unit) { if (null != timeDisposable && !timeDisposable!!.isDisposed) { timeDisposable!!.dispose() } timeDisposable = Observable .interval(1, TimeUnit.SECONDS) .take(100000000) .subscribeOn(Schedulers.computation()) .observeOn(AndroidSchedulers.mainThread()) .compose(bindUntilEvent(ActivityEvent.DESTROY)) .subscribe { aLong -> var num = waitTime + aLong click(num.toInt()) } } private fun closeTimeStart() { if (timeDisposable != null) { timeDisposable!!.dispose() } } override fun onDestroy() { super.onDestroy() if (handler != null) { handler?.removeCallbacksAndMessages(null) } MyApplication.removeOrderView(viewOrder) closeTimeStart() } private fun addline(allLine: MutableList<LatLng>) { closeLine() markerLine = AMapKit.drawLine(this, aMap, allLine) } fun closeLine() { if (markerLine != null) { markerLine!!.remove() } } override fun setOnclick() { } private fun startNavi(start:LatLng,end:LatLng){ val list = arrayListOf<BNRoutePlanNode>() val startNode = BNRoutePlanNode.Builder() .longitude(start.longitude) .latitude(start.latitude) .build() val endNode = BNRoutePlanNode.Builder() .longitude(end.longitude) .latitude(end.latitude) .build() list.add(startNode) list.add(endNode) BaiduNaviManagerFactory.getRoutePlanManager().routePlan( list, IBNRoutePlanManager.RoutePlanPreference.ROUTE_PLAN_PREFERENCE_DEFAULT, bundleOf(), naviHandler) } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) aMap = initMap(savedInstanceState, map_view) } override fun onEventMainThread(event: BaseEvent?) { super.onEventMainThread(event) when (event!!.code) { BaseEvent.REAGASSIGN_SUCCESS -> { finish() } BaseEvent.BACK_CAR_OVER -> { finish() } } } } app/src/main/java/com/xianning/driver/ui/main/small_cargo/SmallOverActivity.kt
New file @@ -0,0 +1,170 @@ package com.xianning.driver.ui.main.small_cargo import android.os.Looper import cn.sinata.xldutils.utils.clickDelay import cn.sinata.xldutils.utils.gone import cn.sinata.xldutils.utils.visible import com.google.gson.Gson import com.xianning.driver.R import com.xianning.driver.base.BaseEvent import com.xianning.driver.base.MyApplication import com.xianning.driver.base.MyBaseActivity import com.xianning.driver.bean.OrderBean import com.xianning.driver.bean.OrderSimpleData import com.xianning.driver.netUtls.Api import com.xianning.driver.netUtls.callNet import com.xianning.driver.netUtls.getMapByAny import com.xianning.driver.ui.main.major.MajorMoneyDetailActivity import com.xianning.driver.utils.MyUtils import kotlinx.android.synthetic.main.activity_order_cancel.* import kotlinx.android.synthetic.main.activity_order_over.* import kotlinx.android.synthetic.main.include_order_money.* import kotlinx.android.synthetic.main.include_order_top_cargo.* import org.greenrobot.eventbus.EventBus import org.jetbrains.anko.startActivity class SmallOverActivity : MyBaseActivity() { val orderType by lazy { intent.getStringExtra("orderType") } val orderId by lazy { intent.getStringExtra("orderId") } lateinit var orderBean: OrderBean override fun setContentView() { setContentView(R.layout.activity_order_over_small) } override fun initView() { setTitleText("已送达") ll_order_cancel.gone() MyApplication.currentOrderType = "" MyApplication.currentOrderId = "" tv_show_pay_over.gone() callOrder() } private fun callOrder() { var map = getMapByAny() map["orderId"] = orderId map["orderType"] = orderType callNet(Api.queryOrderInfo, map) { orderBean = gson.fromJson(it, OrderBean::class.java) showUi(orderBean) } } private fun showUi(orderBean: OrderBean?) { orderBean?.let { setTitleText("已完成") tv_name.text = it.data.nickName tv_car_num.text = it.data.historyNum.toString() + "次寄物" iv_phone.visible() iv_phone.clickDelay { MyUtils.getInstans().CallPhone(this, it.data.phone.toString()) } tv_time.text = it.data.travelTime tv_start_address.text = it.data.startAddress tv_end_address.text = it.data.endAddress tv_money_cargo.text = it.data.tipMoney.toString() + "元加急费" if (it.data.tipMoney==null || it.data.tipMoney <= 0.0) { tv_money_cargo.gone() tv_pay_result_small_money.gone() } var cargoStrType = if (orderBean.data.cargoType == "1") "普通小件X" else "贵重物品X" tv_tv_num_cargo.text = cargoStrType+orderBean.data.peopleNumber tv_people_cargo.text = it.data.nickName + "-" + it.data.phone tv_show_pay_over.visible() tv_pay_result_money.text = "￥" + it.data.orderMoney.toString() tv_pay_result_small_money.text = "其中含加急费用：¥" + it.data.tipMoney.toString() setTitleText(getSmallStatue(it.data.orderState)) } } private fun getSmallStatue(state: Int): String? { when (state) { 1 -> return "待接单" 2 -> return "待出发" 3 -> return "待到达预约地点" 4 -> return "待取货" 5 -> return "送货中" 6 -> return "已送达" 7 -> return "待支付" 8 -> return "需补差价" 9 -> return "已取货" 10 -> return "已取消" 11 -> return "改派中" 12 -> return "已支付差价" } return "" } var handler: android.os.Handler? = null fun checkOrderStatue() { var map = getMapByAny() map["orderId"] = orderId map["orderType"] = orderType callNet(false, Api.orderStateSocket, map) { val orderSimpleData = Gson().fromJson( it, OrderSimpleData::class.java ) orderSimpleData?.let { if (orderSimpleData.status == 8) { orderBean.data.orderState = 8 showUi(orderBean) } } } handler?.postDelayed({ checkOrderStatue() }, 3000) } override fun onDestroy() { super.onDestroy() handler?.removeCallbacksAndMessages(null) } fun showPayResultText(it: OrderBean, statue: Int) { ll_pay_result.visible() if (statue in 6..7) { tv_pay_result_title.text = "待乘客支付" setTitleText("待支付") } else { tv_pay_result_title.text = "乘客已支付" setTitleText("已完成") } tv_pay_result_money.text = "￥" + it.data.orderMoney.toString() when (orderType) { "2" -> { tv_pay_result_small_money.text = "其中含红包费用：¥" + it.data.tipMoney.toString() } "1" -> { tv_pay_result_small_money.text = "查看收费明细" tv_pay_result_small_money.clickDelay { startActivity<MajorMoneyDetailActivity>( "orderId" to orderId, "orderType" to orderType ) } } } } override fun onBackPressed() { super.onBackPressed() EventBus.getDefault().post(BaseEvent(BaseEvent.CALL_NUM_MAIN)) EventBus.getDefault().post(BaseEvent(BaseEvent.BACK_CAR_OVER)) } override fun setOnclick() { } } app/src/main/java/com/xianning/driver/ui/pub/BecomeDriverActivity.kt
@@ -38,8 +38,8 @@ var selectPhone = 0 //1 身份证 2：头像 3：驾驶证 4：网约车资格证 var array = arrayListOf("出租车","城际出行") var arrayType = arrayListOf(2, 3) var array = arrayListOf("出租车","城际出行","同城小件物流") var arrayType = arrayListOf(2, 3,4) val upBean by lazy { DriverBean() app/src/main/java/com/xianning/driver/ui/to_city/GetCityFragment.kt
@@ -13,11 +13,9 @@ import com.xianning.driver.base.gaode.AMapKit import com.xianning.driver.base.gaode.BaiduUtils import com.xianning.driver.bean.OrderBean import com.xianning.driver.netUtls.Api import com.xianning.driver.netUtls.callNet import com.xianning.driver.netUtls.createView import com.xianning.driver.netUtls.getMapByAny import com.xianning.driver.netUtls.* import com.xianning.driver.ui.UiUtil import com.xianning.driver.ui.main.TripActivity import kotlinx.android.synthetic.main.item_get_order.* import kotlinx.android.synthetic.main.item_map_market.view.* import org.jetbrains.anko.startActivity @@ -31,6 +29,13 @@ intent?.getStringExtra("orderType") } val timeDown by lazy { intent?.getIntExtra("time", 30)?:30 } val type by lazy { intent?.getIntExtra("type", -1) } lateinit var time: CountDownTimer @@ -39,17 +44,44 @@ //实例化语音引擎 aMap = AMapKit.initMap(savedInstanceState, map_view) var strBtn = "确定" if (type == 1){ strBtn = "抢单" time = timeOver((timeDown.toLong() * 1000L)) { if (it == 0) { finish() } else { tv_sure.text = strBtn + it.toString() + "S" } } } tv_sure.text = strBtn tv_close.clickDelay { finish() } callOrderDetail() tv_sure.clickDelay { this.startActivity<TripCityActivity>("orderId" to orderId, "orderType" to orderType) finish() if (type == 1) { showGetOrder() } else{ this.startActivity<TripCityActivity>("orderId" to orderId, "orderType" to orderType) finish() } } } fun showGetOrder() { var map = getMapByAny() map["orderId"] = orderId map["orderType"] = orderType callNet(this, Api.grabOrder, map) { Toast.create(this).show("抢单成功") onBackPressed() when (orderType) { "3" -> { this.startActivity<TripCityActivity>("orderId" to orderId, "orderType" to orderType) } } } } override fun initView() { } app/src/main/java/com/xianning/driver/ui/to_city/SelectDriverActivity.kt
New file @@ -0,0 +1,104 @@ package com.xianning.driver.ui.to_city import android.view.View import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import cn.sinata.xldutils.utils.clickDelay import com.xianning.driver.R import com.xianning.driver.base.BaseRecyclerActivity import com.xianning.driver.base.BaseRvAdapter import com.xianning.driver.bean.LineDriverBean import com.xianning.driver.bean.LineDriverData import com.xianning.driver.bean.OrderCityBean import com.xianning.driver.bean.RessignBean import com.xianning.driver.netUtls.Api import com.xianning.driver.netUtls.callNet import com.xianning.driver.netUtls.createView import com.xianning.driver.netUtls.getMapByAny import com.xianning.driver.ui.DialogUtil import com.xianning.driver.ui.adapter.SelectDriverAdapter import com.xianning.driver.ui.adapter.SelectPeopleAdapter import com.xianning.driver.ui.main.ReassignActivity import kotlinx.android.synthetic.main.view_btn_sure.view.* import org.jetbrains.anko.startActivity import org.jetbrains.anko.toast import java.util.HashMap /** * @ClassName SelectPeopleActivity * @Description 选择乘客 * @Author Administrator * @Date 2020/10/23 14:48 * @Version 1.0 */ class SelectDriverActivity : BaseRecyclerActivity<LineDriverData>() { val orderType by lazy { intent.getStringExtra("orderType") } val orderId by lazy { intent.getStringExtra("orderId") } val money by lazy { intent.getStringExtra("money") } val selectAdapter by lazy { SelectDriverAdapter() } override fun getDatas(t: String?): List<LineDriverData> { val arrayListOf = arrayListOf<LineDriverData>() arrayListOf.addAll(gson.fromJson<LineDriverBean>(t, LineDriverBean::class.java).data) arrayListOf.add(LineDriverData("","","","")) return arrayListOf } override fun pathUrl(): String? { return Api.querySameLineDriver } override fun mapObject(): HashMap<String?, Any?>? { var map = getMapByAny() map["orderIds"] = orderId return map } override fun getAdapter(): BaseRvAdapter<LineDriverData>? { return selectAdapter } override fun getlayoutManager(): RecyclerView.LayoutManager? { return LinearLayoutManager(this) } override fun setOnItemClickListener(view: View?, position: Int) { selectAdapter.selectItem = position selectAdapter.notifyDataSetChanged() } override fun initView() { setTitleText("选择司机") var view = createView(R.layout.view_btn_sure_driver, this) addMainBottomViewSimple(view) view.tv_sure_view.clickDelay { if (selectAdapter.selectItem == -1) { toast("请选择司机") return@clickDelay } //跳转改派页面 startActivity<ReassignActivity>( "orderId" to orderId, "orderType" to orderType, "money" to money, "driverId" to selectAdapter.data[selectAdapter.selectItem].id ) } } override fun setOnclick() { } } app/src/main/java/com/xianning/driver/ui/to_city/SelectPeopleActivity.kt
@@ -89,9 +89,10 @@ callNet(Api.queryReassignMoney, map) { val data = gson.fromJson<RessignBean>(it, RessignBean::class.java) if (data.data.amount.isNullOrEmpty()) { startActivity<ReassignActivity>( startActivity<SelectDriverActivity>( "orderId" to selectAdapter.selectIds(), "orderType" to orderType "orderType" to orderType, "money" to "0.0" ) finish() } else { @@ -101,7 +102,7 @@ {}, { //跳转改派页面 startActivity<ReassignActivity>( startActivity<SelectDriverActivity>( "orderId" to selectAdapter.selectIds(), "orderType" to orderType, "money" to data.data.amount.toString() app/src/main/java/com/xianning/driver/ui/to_city/TripCityActivity.kt
@@ -527,8 +527,10 @@ listener = object :BDAbstractLocationListener(){ override fun onReceiveLocation(it: BDLocation?) { it?.let { MyApplication.aMapLocation = it carMarker!!.position = LatLng(it.latitude, it.longitude) if (it.longitude!=4.9E-324){ MyApplication.aMapLocation = it carMarker!!.position = LatLng(it.latitude, it.longitude) } } currentOrderBean.let { when (it.orderState) { app/src/main/res/drawable/bg_cj_bz.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> <solid android:color="#ffee6108" /> <corners android:topLeftRadius="6dp" android:topRightRadius="0dp" android:bottomLeftRadius="6dp" android:bottomRightRadius="0dp" /> <solid android:color="#FF8100" /> <corners android:radius="40dp"/> </shape> app/src/main/res/drawable/bg_white_right6.xml
New file @@ -0,0 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> <corners android:bottomRightRadius="6dp" android:topRightRadius="6dp" android:bottomLeftRadius="40dp" android:topLeftRadius="40dp"/> <solid android:color="@color/white"/> </shape> app/src/main/res/layout/activity_mine.xml
@@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="#F3F4F5"> <RelativeLayout @@ -177,10 +177,11 @@ </LinearLayout> <ScrollView android:layout_below="@id/ll_center" android:layout_width="match_parent" android:layout_marginBottom="52dp" android:layout_height="match_parent"> android:layout_height="match_parent" android:layout_below="@id/ll_center" android:layout_marginBottom="52dp"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -290,6 +291,8 @@ </RelativeLayout> <include layout="@layout/include_line_left_15" /> <RelativeLayout android:id="@+id/rl_set_order" android:layout_width="match_parent" @@ -322,36 +325,40 @@ <View android:layout_width="match_parent" android:layout_height="4dp" android:background="@color/white" /> <RelativeLayout android:id="@+id/rl_line_car" android:layout_width="match_parent" android:layout_height="43dp"> android:background="@color/white" /> <include layout="@layout/include_line_left_15" /> <TextView <RelativeLayout android:id="@+id/rl_line_car" android:layout_width="match_parent" android:layout_height="43dp" android:alpha="0.8" android:background="@color/white" android:drawableEnd="@mipmap/more_black" android:drawablePadding="10dp" android:gravity="center_vertical" android:paddingStart="42dp" android:paddingEnd="15dp" android:text="线路班次管理" android:textColor="@color/black" android:textSize="15sp" android:textStyle="bold" /> android:layout_height="43dp"> <ImageView android:layout_width="16dp" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="15dp" android:src="@mipmap/icon_me_line" /> <TextView android:layout_width="match_parent" android:layout_height="43dp" android:alpha="0.8" android:background="@color/white" android:drawableEnd="@mipmap/more_black" android:drawablePadding="10dp" android:gravity="center_vertical" android:paddingStart="42dp" android:paddingEnd="15dp" android:text="线路班次管理" android:textColor="@color/black" android:textSize="15sp" android:textStyle="bold" /> </RelativeLayout> <ImageView android:layout_width="16dp" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="15dp" android:src="@mipmap/icon_me_line" /> </RelativeLayout> <View @@ -360,10 +367,6 @@ android:background="@color/white" /> <include layout="@layout/include_line_left_15" /> <View android:layout_width="match_parent" android:layout_height="4dp" android:background="#F3F4F5" /> <RelativeLayout android:id="@+id/rl_change_car" @@ -548,8 +551,8 @@ <View android:layout_width="match_parent" android:layout_height="4dp" android:visibility="gone" android:background="@color/white" /> android:background="@color/white" android:visibility="gone" /> <include layout="@layout/include_line_left_15" /> @@ -586,10 +589,11 @@ android:layout_width="match_parent" android:layout_height="4dp" android:background="@color/white" /> <Space android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1"/> android:layout_weight="1" /> </LinearLayout> @@ -597,14 +601,15 @@ </RelativeLayout> <RelativeLayout android:id="@+id/rl_login_out" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/white" app:layout_constraintBottom_toBottomOf="parent" android:layout_marginTop="2dp" android:elevation="2dp"> android:background="@color/white" android:elevation="2dp" app:layout_constraintBottom_toBottomOf="parent"> <TextView android:layout_width="match_parent" @@ -617,9 +622,10 @@ android:textStyle="bold" /> </RelativeLayout> <View android:layout_width="match_parent" android:layout_height="4dp" app:layout_constraintBottom_toTopOf="@id/rl_login_out" android:background="#F3F4F5" /> android:background="#F3F4F5" app:layout_constraintBottom_toTopOf="@id/rl_login_out" /> </androidx.constraintlayout.widget.ConstraintLayout> app/src/main/res/layout/activity_trip_cargo.xml
@@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_height="match_parent"> @@ -10,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> <com.amap.api.maps.MapView <com.baidu.mapapi.map.MapView android:id="@+id/map_view" android:layout_width="match_parent" android:layout_height="match_parent"/> @@ -41,25 +42,64 @@ <TextView android:id="@+id/tv_gap_money" android:layout_width="wrap_content" android:layout_height="40dp" android:layout_height="wrap_content" android:text="补差价" android:padding="10dp" android:gravity="center" android:paddingStart="6dp" android:drawablePadding="6dp" android:paddingRight="6dp" android:background="@drawable/bg_cj_bz" android:drawableStart="@mipmap/bz_money" android:drawableTop="@mipmap/bz_money" android:textColor="@color/write" android:layout_above="@+id/iv_to_gd" android:textSize="10sp" android:layout_marginTop="10dp" android:layout_alignEnd="@+id/slide_btn" /> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/ll_gp_money" android:layout_width="wrap_content" android:orientation="horizontal" android:layout_marginTop="10dp" android:background="@drawable/bg_white_right6" android:elevation="2dp" android:visibility="gone" android:layout_alignEnd="@+id/slide_btn" android:layout_height="wrap_content"> <ImageView android:layout_width="30dp" android:layout_height="30dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" android:src="@mipmap/bz_money_2"/> <TextView android:layout_width="80dp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="36dp" android:text="￥0差价" android:textSize="12sp" android:textColor="@color/textColor" android:textStyle="bold" android:id="@+id/tv_dif" android:layout_height="wrap_content"/> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="@id/tv_dif" android:text="修改" android:textSize="12sp" android:textStyle="bold" android:layout_marginEnd="5dp" app:layout_constraintBaseline_toBaselineOf="@id/tv_dif" android:textColor="@color/main_yellow_qian"/> </androidx.constraintlayout.widget.ConstraintLayout> <ImageView android:id="@+id/iv_police" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" android:layout_marginEnd="10dp" android:layout_alignParentEnd="true" android:layout_width="40dp" android:layout_height="40dp" android:layout_marginBottom="10dp" android:layout_alignEnd="@+id/slide_btn" android:layout_above="@+id/iv_to_gd" android:src="@mipmap/img110"/> </RelativeLayout> app/src/main/res/layout/item_select_driver.xml
New file @@ -0,0 +1,55 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="@color/write" android:layout_height="wrap_content"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content"> <com.facebook.drawee.view.SimpleDraweeView android:layout_width="40dp" android:layout_height="40dp" android:layout_marginStart="14dp" android:layout_marginTop="12dp" android:id="@+id/iv_avatar" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:roundAsCircle="true" app:placeholderImage="@color/page_bg" android:layout_marginBottom="8dp"/> <TextView android:id="@+id/tv_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="14dp" android:textStyle="bold" android:text="可乐" android:textColor="#ff000000" android:textSize="14sp" app:layout_constraintTop_toTopOf="@id/iv_avatar" app:layout_constraintBottom_toBottomOf="@id/iv_avatar" app:layout_constraintStart_toEndOf="@id/iv_avatar"/> <ImageView android:id="@+id/cb" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/iv_avatar" app:layout_constraintBottom_toBottomOf="@id/iv_avatar" android:layout_marginEnd="14dp" android:layout_width="20dp" android:layout_height="20dp" android:src="@mipmap/icon_raidobutton"/> </androidx.constraintlayout.widget.ConstraintLayout> <include layout="@layout/include_line_14"/> </LinearLayout> app/src/main/res/layout/item_small_user_img.xml
New file @@ -0,0 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_marginEnd="@dimen/dp_4" android:layout_height="wrap_content"> <ImageView android:id="@+id/iv_img_user" android:layout_width="36dp" android:layout_height="24dp"/> </RelativeLayout> app/src/main/res/layout/view_btn_sure_driver.xml
New file @@ -0,0 +1,32 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content"> <TextView android:id="@+id/tv_sure_view" android:layout_width="match_parent" android:layout_height="40dp" android:layout_marginStart="14dp" android:layout_marginBottom="10dp" android:layout_marginEnd="14dp" android:background="@drawable/main_color_eight" android:gravity="center" android:text="确定" android:layout_alignParentBottom="true" android:textColor="@color/write" android:textSize="14sp" /> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="转派给司机前请先与司机协商一致" android:drawableStart="@mipmap/ic_warning" android:drawablePadding="2dp" android:textColor="@color/end_red" android:layout_centerHorizontal="true" android:layout_marginBottom="30dp" android:textSize="14sp" android:layout_above="@id/tv_sure_view"/> </RelativeLayout> app/src/main/res/mipmap-xxhdpi/bz_money.pngapp/src/main/res/mipmap-xxhdpi/bz_money_2.png
@@ -1,11 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext.kotlin_version = '1.4.30' ext.kotlin_version = '1.3.61' repositories { maven { url 'https://jitpack.io' } google() jcenter() mavenCentral() maven { url "http://maven.aliyun.com/nexus/content/groups/public/" } maven { url 'https://maven.aliyun.com/repository/google/' } @@ -24,7 +23,6 @@ repositories { maven { url 'https://jitpack.io' } google() jcenter() maven { url "http://maven.aliyun.com/nexus/content/groups/public/" } maven { url 'https://maven.aliyun.com/repository/google/' } maven { url 'https://maven.aliyun.com/repository/jcenter/' } settings.gradle
@@ -1,3 +1,3 @@ include ':easyfloat' rootProject.name='Xianningtrip' include ':app', ':xldUtils', ':rxnetty', ':ChipsLayoutManager' include ':app', ':xldUtils', ':rxnetty'
