diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index a6008fa..7213e63 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index a6008fa..7213e63 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index 49a5b5e..977370f 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -78,7 +78,7 @@ * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg */ @Multipart - @POST("/imageUpload") + @POST("/upload/image") suspend fun uploadImage( @Header("token") token: String, @Part file: MultipartBody.Part diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index a6008fa..7213e63 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index 49a5b5e..977370f 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -78,7 +78,7 @@ * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg */ @Multipart - @POST("/imageUpload") + @POST("/upload/image") suspend fun uploadImage( @Header("token") token: String, @Part file: MultipartBody.Part diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index 036c39d..4aaaf9e 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -14,7 +14,8 @@ Manifest.permission.READ_PHONE_STATE ) - const val SERVER_BASE_URL = "http://192.168.43.66:8083" + const val SERVER_BASE_URL = "http://192.168.43.66:12210" +// const val SERVER_BASE_URL = "http://111.198.10.15:12210" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val ACCOUNT = "account" const val PASSWORD = "password" @@ -23,4 +24,6 @@ const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 + + val GENDER = arrayListOf("男", "女") } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index a6008fa..7213e63 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index 49a5b5e..977370f 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -78,7 +78,7 @@ * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg */ @Multipart - @POST("/imageUpload") + @POST("/upload/image") suspend fun uploadImage( @Header("token") token: String, @Part file: MultipartBody.Part diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index 036c39d..4aaaf9e 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -14,7 +14,8 @@ Manifest.permission.READ_PHONE_STATE ) - const val SERVER_BASE_URL = "http://192.168.43.66:8083" + const val SERVER_BASE_URL = "http://192.168.43.66:12210" +// const val SERVER_BASE_URL = "http://111.198.10.15:12210" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val ACCOUNT = "account" const val PASSWORD = "password" @@ -23,4 +24,6 @@ const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 + + val GENDER = arrayListOf("男", "女") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index e872af1..7cdde14 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -80,6 +80,7 @@ eventViewModel = ViewModelProvider(this).get(EventViewModel::class.java) imageAdapter = EditableImageAdapter(this, 3) + imageAdapter.setImageMargins(10f, 10f, 3f) addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter } @@ -287,16 +288,7 @@ } private fun analyticalSelectResults(result: LocalMedia) { - //压缩图片 -// val realPath = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { -// result.realPath -// } else { -// result.sandboxPath -// } -// Log.d(kTag, "初始路径:" + result.path) -// Log.d(kTag, "绝对路径:" + result.realPath) -// Log.d(kTag, "原图路径:" + result.originalPath) -// Log.d(kTag, "沙盒路径:" + result.sandboxPath) + //压缩图片后上传 result.realPath.compressImage(this, object : OnImageCompressListener { override fun onSuccess(file: File) { Log.d(kTag, "onSuccess: " + file.absolutePath) diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index a6008fa..7213e63 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index 49a5b5e..977370f 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -78,7 +78,7 @@ * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg */ @Multipart - @POST("/imageUpload") + @POST("/upload/image") suspend fun uploadImage( @Header("token") token: String, @Part file: MultipartBody.Part diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index 036c39d..4aaaf9e 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -14,7 +14,8 @@ Manifest.permission.READ_PHONE_STATE ) - const val SERVER_BASE_URL = "http://192.168.43.66:8083" + const val SERVER_BASE_URL = "http://192.168.43.66:12210" +// const val SERVER_BASE_URL = "http://111.198.10.15:12210" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val ACCOUNT = "account" const val PASSWORD = "password" @@ -23,4 +24,6 @@ const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 + + val GENDER = arrayListOf("男", "女") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index e872af1..7cdde14 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -80,6 +80,7 @@ eventViewModel = ViewModelProvider(this).get(EventViewModel::class.java) imageAdapter = EditableImageAdapter(this, 3) + imageAdapter.setImageMargins(10f, 10f, 3f) addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter } @@ -287,16 +288,7 @@ } private fun analyticalSelectResults(result: LocalMedia) { - //压缩图片 -// val realPath = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { -// result.realPath -// } else { -// result.sandboxPath -// } -// Log.d(kTag, "初始路径:" + result.path) -// Log.d(kTag, "绝对路径:" + result.realPath) -// Log.d(kTag, "原图路径:" + result.originalPath) -// Log.d(kTag, "沙盒路径:" + result.sandboxPath) + //压缩图片后上传 result.realPath.compressImage(this, object : OnImageCompressListener { override fun onSuccess(file: File) { Log.d(kTag, "onSuccess: " + file.absolutePath) diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 59ed628..a3dd855 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -29,7 +29,6 @@ class WorkSiteTabActivity : KotlinBaseActivity() { - private val kTag = "WorkSiteTabActivity" private lateinit var aMap: AMap private lateinit var workSiteViewModel: WorkSiteViewModel private val geocoderSearch by lazy { GeocodeSearch(this) } diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index a6008fa..7213e63 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index 49a5b5e..977370f 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -78,7 +78,7 @@ * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg */ @Multipart - @POST("/imageUpload") + @POST("/upload/image") suspend fun uploadImage( @Header("token") token: String, @Part file: MultipartBody.Part diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index 036c39d..4aaaf9e 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -14,7 +14,8 @@ Manifest.permission.READ_PHONE_STATE ) - const val SERVER_BASE_URL = "http://192.168.43.66:8083" + const val SERVER_BASE_URL = "http://192.168.43.66:12210" +// const val SERVER_BASE_URL = "http://111.198.10.15:12210" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val ACCOUNT = "account" const val PASSWORD = "password" @@ -23,4 +24,6 @@ const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 + + val GENDER = arrayListOf("男", "女") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index e872af1..7cdde14 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -80,6 +80,7 @@ eventViewModel = ViewModelProvider(this).get(EventViewModel::class.java) imageAdapter = EditableImageAdapter(this, 3) + imageAdapter.setImageMargins(10f, 10f, 3f) addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter } @@ -287,16 +288,7 @@ } private fun analyticalSelectResults(result: LocalMedia) { - //压缩图片 -// val realPath = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { -// result.realPath -// } else { -// result.sandboxPath -// } -// Log.d(kTag, "初始路径:" + result.path) -// Log.d(kTag, "绝对路径:" + result.realPath) -// Log.d(kTag, "原图路径:" + result.originalPath) -// Log.d(kTag, "沙盒路径:" + result.sandboxPath) + //压缩图片后上传 result.realPath.compressImage(this, object : OnImageCompressListener { override fun onSuccess(file: File) { Log.d(kTag, "onSuccess: " + file.absolutePath) diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 59ed628..a3dd855 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -29,7 +29,6 @@ class WorkSiteTabActivity : KotlinBaseActivity() { - private val kTag = "WorkSiteTabActivity" private lateinit var aMap: AMap private lateinit var workSiteViewModel: WorkSiteViewModel private val geocoderSearch by lazy { GeocodeSearch(this) } diff --git a/app/src/main/res/layout/activity_apply_enter.xml b/app/src/main/res/layout/activity_apply_enter.xml index 72c0486..1b12447 100644 --- a/app/src/main/res/layout/activity_apply_enter.xml +++ b/app/src/main/res/layout/activity_apply_enter.xml @@ -36,7 +36,13 @@ style="@style/LinearLayoutTextViewStyle" android:text="性别" /> - + @@ -84,13 +90,11 @@ + android:textColor="@color/subTextColor" /> - + @@ -84,13 +90,11 @@ + android:textColor="@color/subTextColor" />