Commit e29d07be authored by Seatel's avatar Seatel

update and develop

parent 85670245
{"agcgw_all":{"SG":"connect-dra.dbankcloud.cn","SG_back":"connect-dra.hispace.hicloud.com","CN":"connect-drcn.dbankcloud.cn","CN_back":"connect-drcn.hispace.hicloud.com","RU":"connect-drru.hispace.dbankcloud.ru","RU_back":"connect-drru.hispace.dbankcloud.cn","DE":"connect-dre.dbankcloud.cn","DE_back":"connect-dre.hispace.hicloud.com"},"websocketgw_all":{"SG":"connect-ws-dra.hispace.dbankcloud.cn","SG_back":"connect-ws-dra.hispace.dbankcloud.com","CN":"connect-ws-drcn.hispace.dbankcloud.cn","CN_back":"connect-ws-drcn.hispace.dbankcloud.com","RU":"connect-ws-drru.hispace.dbankcloud.ru","RU_back":"connect-ws-drru.hispace.dbankcloud.cn","DE":"connect-ws-dre.hispace.dbankcloud.cn","DE_back":"connect-ws-dre.hispace.dbankcloud.com"},"client":{"cp_id":"2640855000000062142","product_id":"736430079244434976","client_id":"357021702271534272","client_secret":"C0A00FEE37128168611BFB70866448C44483BD700367380AF694B0E7D337DFCB","project_id":"736430079244434976","app_id":"102169499","api_key":"CV7bNa0ccwYYmRsbQlQhoekfMt8p4m5t5lQL3JqugWOhlgysNqHPnpegygqNcUFDyG+QXIDZKKCvObgkZTCb1hQyLA2K","package_name":"com.seatel.mobilehall"},"oauth_client":{"client_id":"102169499","client_type":1},"app_info":{"app_id":"102169499","package_name":"com.seatel.mobilehall"},"configuration_version":"3.0","appInfos":[{"package_name":"com.seatel.mobilehall","client":{"app_id":"102169499"},"app_info":{"package_name":"com.seatel.mobilehall","app_id":"102169499"},"oauth_client":{"client_type":1,"client_id":"102169499"}}]}
\ No newline at end of file
......@@ -17,7 +17,7 @@ android {
storePassword 'seatel_Cambodia'
keyPassword 'seatel_Cambodia'
keyAlias 'seatel_cambodia'
storeFile file('/Users/seatel/android_project/android-yes/seashop.jks')
storeFile file('/Users/luckeavan/Documents/YES-Seatel/YesApp-Android/android-yes/seashop.jks')
}
}
compileSdk 34
......@@ -27,8 +27,8 @@ android {
applicationId "com.seatel.mobilehall"
minSdk 23
targetSdk 34
versionCode 201907119
versionName "2.3.18"
versionCode 202505301
versionName "2.3.19"
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
signingConfig signingConfigs.release
......@@ -105,17 +105,23 @@ configurations {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.aar'])
//noinspection GradleDependency
implementation 'androidx.core:core-ktx:1.8.0'
//noinspection GradleDependency
implementation 'androidx.appcompat:appcompat:1.4.2'
//noinspection GradleDependency
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
//noinspection GradleDependency
implementation 'androidx.navigation:navigation-fragment-ktx:2.4.2'
//noinspection GradleDependency
implementation 'androidx.navigation:navigation-ui-ktx:2.4.2'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'com.google.code.gson:gson:2.9.0'
implementation 'com.github.bumptech.glide:glide:4.13.0'
//noinspection GradleDependency
implementation 'com.google.firebase:firebase-messaging-ktx:23.1.2'
//noinspection GradleDependency
implementation 'androidx.work:work-runtime-ktx:2.8.1'
implementation 'com.google.android.gms:play-services-mlkit-barcode-scanning:18.3.1'
annotationProcessor 'com.github.bumptech.glide:compiler:4.13.0'
......@@ -124,21 +130,28 @@ dependencies {
implementation 'com.facebook.android:facebook-android-sdk:4.42.0'
implementation 'com.mcxiaoke.volley:library:1.0.19'
implementation 'com.jaredrummler:android-device-names:1.1.7'
//noinspection GradleDependency
implementation 'com.google.android.material:material:1.6.1'
implementation 'com.google.maps.android:android-maps-utils:0.5'
implementation 'com.google.android.gms:play-services-gcm:17.0.0'
//noinspection GradleDependency
implementation 'com.google.android.gms:play-services-auth:17.0.0'
//noinspection GradleDependency
implementation 'com.google.android.gms:play-services-maps:17.0.0'
//noinspection GradleDependency
implementation 'com.google.android.gms:play-services-location:17.0.0'
//noinspection GradleDependency
implementation 'com.google.android.gms:play-services-analytics:17.0.0'
//noinspection GradleDependency
implementation 'com.google.android.gms:play-services-measurement-api:21.1.0'
implementation 'com.google.android.gms:play-services-vision:20.1.3'
implementation("com.google.android.material:material:1.12.0")
//firebase
//noinspection GradleDependency
implementation platform('com.google.firebase:firebase-bom:31.2.3')
implementation 'com.google.firebase:firebase-analytics-ktx'
//noinspection GradleDependency
implementation 'com.google.firebase:firebase-ml-vision:24.0.3'
implementation 'com.google.firebase:firebase-ml-vision-barcode-model:16.1.2'
......@@ -147,14 +160,17 @@ dependencies {
api 'io.anyline:anylinesdk:18.1@aar'
customImplementation('io.anyline:anylinesdk:18.1@aar')
//noinspection GradleDependency
api 'org.apache.httpcomponents:httpcore:4.4.6'
//noinspection GradleDependency
api 'org.apache.httpcomponents:httpmime:4.3.6'
//noinspection GradleDependency
implementation 'org.apache.httpcomponents:httpcore:4.4.10'
implementation 'id.zelory:compressor:3.0.1'
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.23'
//noinspection GradleDependency
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
implementation 'de.hdodenhof:circleimageview:2.2.0'
......@@ -162,19 +178,26 @@ dependencies {
implementation("io.coil-kt:coil:2.2.2")
implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
implementation 'androidx.multidex:multidex:2.0.1'
//noinspection GradleDependency
implementation 'com.google.android.exoplayer:exoplayer:2.18.4'
implementation "com.airbnb.android:lottie:6.0.0"
// camera x
def camerax_version = "1.0.2"
//noinspection GradleDependency
implementation "androidx.camera:camera-core:${camerax_version}"
//noinspection GradleDependency
implementation "androidx.camera:camera-lifecycle:${camerax_version}"
//noinspection GradleDependency
implementation "androidx.camera:camera-camera2:${camerax_version}"
//noinspection GradleDependency
implementation "androidx.camera:camera-view:1.0.0-alpha32"
// mlkit face detection & gson
//noinspection GradleDependency
implementation "com.google.mlkit:face-detection:16.1.5"
//noinspection GradleDependency
implementation "com.google.code.gson:gson:2.8.6"
// Use a stable version for TensorFlow Lite
......@@ -202,7 +225,9 @@ dependencies {
// test
testImplementation 'junit:junit'
//noinspection GradleDependency
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
//noinspection GradleDependency
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
}
......@@ -70,7 +70,7 @@ public abstract class SeatelSuperRequest<T> extends CoreRequest<T> {
header.put("X-Longitude", "");
header.put("X-Timestamp", getTimestamp());
header.put("X-Timezone", getLocalTimezone());
header.put("X-Platform", "android");
header.put("X-Platform", "huawei");
header.put("Model", Devices.INSTANCE.getDeviceModel());
header.put("X-OS-Version", Devices.INSTANCE.getDeviceOSVersion());
header.put("X-UDID", Devices.INSTANCE.getDeviceID(getContext()));
......
......@@ -5,5 +5,5 @@ data class AbaFormModel(
val app_store: String,
val description: String,
val qrString: String,
val status: Status
val status: Status,
)
\ No newline at end of file
......@@ -15,7 +15,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.4'
classpath 'com.android.tools.build:gradle:8.10.1'
classpath "io.realm:realm-gradle-plugin:10.15.1"
classpath 'com.google.gms:google-services:4.3.15'
}
......
#Tue May 27 20:28:16 ICT 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment