| ChipsLayoutManager/build.gradle | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/build.gradle | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/fuban/driver/base/MyApplication.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/fuban/driver/ui/main/MainActivity.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/fuban/driver/ui/main/OrderOverActivity.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/fuban/driver/ui/main/TripActivity.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/fuban/driver/ui/to_city/TripCityActivity.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| build.gradle | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| gradle/wrapper/gradle-wrapper.properties | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ChipsLayoutManager/build.gradle
@@ -1,33 +1,4 @@ plugins { id "com.jfrog.bintray" version "1.7.3" id "com.github.dcendents.android-maven" version "1.5" } apply plugin: 'com.android.library' //upload settings to bintray ext { bintrayRepo = 'widget' bintrayName = 'ChipsLayoutManager' libraryName = 'ChipsLayoutManager' publishedGroupId = 'com.beloo.widget' artifact = 'ChipsLayoutManager' libraryVersion = "rootProject.ext.libraryVersion" libraryDescription = 'Android. A custom layout manager for RecyclerView which mimicric TextView span behaviour, flow layouts behaviour with support of amazing recyclerView features' siteUrl = 'https://github.com/BelooS/ChipsLayoutManager' gitUrl = 'https://github.com/BelooS/ChipsLayoutManager.git' developerId = 'beloo' developerName = 'Beloy Oleg' developerEmail = 'beloyoleg@gmail.com' licenseName = 'The Apache Software License, Version 2.0' licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt' allLicenses = ["Apache-2.0"] } android { compileSdkVersion 29 @@ -69,28 +40,6 @@ } task androidJavadocs(type: Javadoc) { source = android.sourceSets.main.java.srcDirs } task androidJavadocsJar(type: Jar) { classifier = 'javadoc' baseName = artifact from androidJavadocs.destinationDir } task androidSourcesJar(type: Jar) { classifier = 'sources' baseName = artifact from android.sourceSets.main.java.srcDirs } artifacts { archives androidSourcesJar archives androidJavadocsJar } def supportVersion = "25+"; dependencies { @@ -104,90 +53,4 @@ androidTestCompile 'com.android.support.test:runner:0.5' androidTestCompile "com.android.support:support-annotations:$supportVersion" androidTestCompile 'pl.pragmatists:JUnitParams:1.0.5' } group = publishedGroupId // Maven Group ID for the artifact version = libraryVersion install { repositories.mavenInstaller { // This generates POM.xml with proper parameters pom { project { packaging 'aar' groupId publishedGroupId artifactId artifact version libraryVersion // Add your description here name libraryName description libraryDescription url siteUrl // Set your license licenses { license { name licenseName url licenseUrl } } developers { developer { id developerId name developerName email developerEmail } } scm { connection gitUrl developerConnection gitUrl url siteUrl } }.writeTo("$buildDir/poms/pom-default.xml") } } } Properties properties = new Properties() properties.load(project.rootProject.file('local.properties').newDataInputStream()) bintray { user = properties.getProperty("bintray.user") key = properties.getProperty("bintray.apikey") configurations = ['archives'] //When uploading configuration files dryRun = false //[Default: false] Whether to run this as dry-run, without deploying publish = true //[Default: false] Whether version should be auto published after an upload override = true //[Default: false] Whether to override version artifacts already published //Package configuration. The plugin will use the repo and name properties to check if the package already exists. In that case, there's no need to configure the other package properties (like userOrg, desc, etc). pkg { repo = bintrayRepo name = bintrayName desc = libraryDescription websiteUrl = siteUrl issueTrackerUrl = 'https://github.com/BelooS/ChipsLayoutManager/issues' vcsUrl = gitUrl licenses = allLicenses publish = true publicDownloadNumbers = true githubRepo = 'BelooS/ChipsLayoutManager' githubReleaseNotesFile = 'README.md' //Optional version descriptor version { name = libraryVersion //Bintray logical version name desc = '' //Optional - Version-specific description' vcsTag = libraryVersion gpg { sign = true //Determines whether to GPG sign the files. The default is false passphrase = properties.getProperty("bintray.gpg.password") //Optional. The passphrase for GPG signing' } } } } app/build.gradle
@@ -24,8 +24,8 @@ applicationId "com.fuban.driver" minSdkVersion 21 targetSdkVersion 29 versionCode 4 versionName "3.0.1" versionCode 5 versionName "3.0.2" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { app/src/main/AndroidManifest.xml
@@ -147,7 +147,7 @@ <meta-data android:name="com.amap.api.v2.apikey" android:value="8651390ff58605b2c404776027ef3188" /> android:value="6e1184657026c43a133498cd0fde18e7" /> <activity android:name="com.fuban.driver.base.gaode.gpsnav.GPSNaviActivity" />
@@ -234,7 +234,7 @@ var serviceId = serviceIdS.toLong() var terminalName = CacheKey.getTerminalName() // 唯一标识某个用户或某台设备的名称 aMapTrackClient = AMapTrackClient(applicationContext); aMapTrackClient.setInterval(5, 30) aMapTrackClient.setInterval(30, 30) aMapTrackClient.queryTerminal(QueryTerminalRequest(serviceId, terminalName), object : OnTripTrackListener() { override fun onQueryTerminalCallback(p0: QueryTerminalResponse?) { app/src/main/java/com/fuban/driver/ui/main/MainActivity.kt
@@ -339,5 +339,6 @@ override fun onDestroy() { super.onDestroy() MyApplication.canPlayVoice = false MyApplication.removeOrderView(qeeOrderView) } } app/src/main/java/com/fuban/driver/ui/main/OrderOverActivity.kt
@@ -107,7 +107,16 @@ } private fun addSocketLisener() { MyApplication.addOrderView(object : MyApplication.OrderStatueView { MyApplication.addOrderView(listener) // if (handler == null) { // handler = android.os.Handler(mainLooper) // handler!!.postDelayed({ // checkOrderStatue() // }, 3000) // } } private val listener= object : MyApplication.OrderStatueView { override fun orderInfo(data: OrderSimpleData?) { data?.let { if (it.status == 8) { @@ -118,16 +127,7 @@ } } } }) // if (handler == null) { // handler = android.os.Handler(mainLooper) // handler!!.postDelayed({ // checkOrderStatue() // }, 3000) // } } var handler: android.os.Handler? = null fun checkOrderStatue() { var map = getMapByAny() @@ -152,6 +152,7 @@ override fun onDestroy() { super.onDestroy() handler?.removeCallbacksAndMessages(null) MyApplication.removeOrderView(listener) } fun showPayResultText(it: OrderBean, statue: Int) { app/src/main/java/com/fuban/driver/ui/main/TripActivity.kt
@@ -86,7 +86,9 @@ private fun addSockectCancel() { checkOrderStatue() MyApplication.addOrderView(object : MyApplication.OrderStatueView { MyApplication.addOrderView(listener) } private val listener=object : MyApplication.OrderStatueView { override fun orderInfo(data: OrderSimpleData?) { data?.let { when(it.orderType){ @@ -104,9 +106,7 @@ } } } }) } var handler: Handler? = null fun checkOrderStatue() { var map = getMapByAny() @@ -601,6 +601,7 @@ handler?.removeCallbacksAndMessages(null) } closeTimeStart() MyApplication.removeOrderView(listener) }
@@ -153,12 +153,10 @@ override fun onBackPressed() { EventBus.getDefault().post(BaseEvent(BaseEvent.UPDATA_MAIN_CAR)) MyApplication.removeOrderView(qeeOrderView) super.onBackPressed() } override fun finish() { MyApplication.removeOrderView(qeeOrderView) EventBus.getDefault().post(BaseEvent(BaseEvent.UPDATA_MAIN_CAR)) super.finish() } @@ -796,6 +794,7 @@ handler?.removeCallbacksAndMessages(null) } closeTimeStart() MyApplication.removeOrderView(qeeOrderView) }
@@ -3,12 +3,21 @@ buildscript { ext.kotlin_version = '1.3.61' repositories { // 阿里云镜像（推荐） maven { url 'https://maven.aliyun.com/repository/jcenter' } maven { url 'https://maven.aliyun.com/repository/google' } maven { url 'https://maven.aliyun.com/repository/public' } maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } //jitpack maven { url "https://jitpack.io" } // 腾讯云镜像 maven { url 'https://mirrors.cloud.tencent.com/nexus/repository/maven-public/' } // 官方源（作为保底） 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/' } maven { url 'https://jitpack.io' } mavenCentral() gradlePluginPortal() maven { url 'https://dl.bintray.com/umsdk/release' } maven { url 'http://mirrors.huaweicloud.com/repository/maven/huaweicloudsdk/' } } @@ -22,15 +31,23 @@ allprojects { repositories { // 阿里云镜像（推荐） maven { url 'https://maven.aliyun.com/repository/jcenter' } maven { url 'https://maven.aliyun.com/repository/google' } maven { url 'https://maven.aliyun.com/repository/public' } maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } //jitpack maven { url "https://jitpack.io" } // 腾讯云镜像 maven { url 'https://mirrors.cloud.tencent.com/nexus/repository/maven-public/' } // 官方源（作为保底） 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/' } maven { url 'https://jitpack.io' } mavenCentral() gradlePluginPortal() maven { url 'https://dl.bintray.com/umsdk/release' } maven { url 'http://mirrors.huaweicloud.com/repository/maven/huaweicloudsdk/' } mavenCentral() flatDir { dirs 'libs' } gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-5.6.4-all.zip
