[bugfix] 修改邮问文字上限，添加header中的app版本号

owliao · owliao · commit 1d92573987de · 2022-04-13T19:54:41.000+08:00
diff --git a/build_logic/src/main/kotlin/versions/Dependencies.kt b/build_logic/src/main/kotlin/versions/Dependencies.kt
@@ -63,9 +63,11 @@ val android = listOf(
     "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle",
     "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle",
     "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle",
+    //解决PendingIntent对android12兼容问题
+    "androidx.work:work-runtime-ktx:2.7.1",
 )
 
-//"androidx.work:work-runtime-ktx:2.7.1",
+//,
 
 //    "androidx.navigation:navigation-runtime-ktx:2.4.1",
 //    "androidx.navigation:navigation-fragment-ktx:2.4.1",
diff --git a/lib_common/src/main/java/com/mredrock/cyxbs/common/BaseApp.kt b/lib_common/src/main/java/com/mredrock/cyxbs/common/BaseApp.kt
@@ -12,11 +12,16 @@ abstract class BaseApp : Application() {
     companion object {
         lateinit var appContext: Context
             private set
+        lateinit var version:String
+            private set
     }
 
     @CallSuper
     override fun onCreate() {
         super.onCreate()
         appContext = this
+        appContext.packageManager.getPackageInfo(appContext.packageName,0).let {
+            version = it.versionName
+        }
     }
 }
diff --git a/lib_common/src/main/java/com/mredrock/cyxbs/common/network/ApiGenerator.kt b/lib_common/src/main/java/com/mredrock/cyxbs/common/network/ApiGenerator.kt
@@ -1,5 +1,7 @@
 package com.mredrock.cyxbs.common.network
 
+import android.app.Application
+import android.content.pm.PackageManager
 import android.os.Handler
 import android.util.SparseArray
 import com.google.gson.Gson
@@ -23,6 +25,7 @@ import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.TimeUnit
 import android.os.Looper
 import android.util.Log
+import androidx.core.content.PackageManagerCompat
 import com.mredrock.cyxbs.common.BaseApp
 import com.mredrock.cyxbs.common.utils.LogLocal
 import com.mredrock.cyxbs.common.utils.extensions.toast
@@ -150,13 +153,19 @@ object ApiGenerator {
      */
     private fun Retrofit.Builder.configRetrofitBuilder(client: ((OkHttpClient.Builder) -> OkHttpClient)): Retrofit.Builder {
         return this.client(client.invoke(OkHttpClient().newBuilder().apply {
-                val logging = HttpLoggingInterceptor(object:HttpLoggingInterceptor.Logger{
-                    override fun log(message: String) {
-                        Log.d("OKHTTP","OKHTTP$message")
-                        LogLocal.log("OKHTTP","OKHTTP$message")
-                    }
-                })
+                val logging = HttpLoggingInterceptor { message ->
+                    LogUtils.d("OKHTTP",message)
+                    LogLocal.log("OKHTTP", "OKHTTP$message")
+                }
                 logging.level = HttpLoggingInterceptor.Level.BODY
+                addInterceptor(Interceptor {
+                    val response = proceedPoxyWithTryCatch {
+                        it.proceed(it.request().newBuilder()
+                            .addHeader("APPVersion", BaseApp.version)
+                            .build()
+                        )}
+                    response!!
+                })
                 addInterceptor(logging)
                 //这里是在debug模式下方便开发人员简单确认 http 错误码 和 url(magipoke开始切的)
                 if (BuildConfig.DEBUG){
@@ -194,6 +203,10 @@ object ApiGenerator {
     //不带token请求的OkHttp配置
     private fun OkHttpClient.Builder.configureCommonOkHttp(): OkHttpClient {
         return this.apply {
+            /**
+             * 发送版本号
+             */
+
             /**
              * 连接失败时切换备用url的Interceptor
              * 一旦切换，只有重启app才能切回来（因为如果请求得到的url不是原来的@{link getBaseUrl()}，则切换到新的url，而以后访问都用这个新的url了）
@@ -206,6 +219,17 @@ object ApiGenerator {
     //带token请求的OkHttp配置
     private fun OkHttpClient.Builder.configureTokenOkHttp(): OkHttpClient {
         return this.apply {
+            /**
+             * 发送版本号
+             */
+            interceptors().add(Interceptor {
+                val response = proceedPoxyWithTryCatch {
+                    it.proceed(it.request().newBuilder()
+                        .addHeader("version", BaseApp.version)
+                        .build()
+                    )}
+                return@Interceptor response!!
+            })
             /**
              * 连接失败时切换备用url的Interceptor
              * 一旦切换，只有重启app才能切回来（因为如果请求得到的url不是原来的@{link getBaseUrl()}，则切换到新的url，而以后访问都用这个新的url了）
diff --git a/module_qa/src/main/java/com/mredrock/cyxbs/qa/pages/quiz/ui/QuizActivity.kt b/module_qa/src/main/java/com/mredrock/cyxbs/qa/pages/quiz/ui/QuizActivity.kt
@@ -50,7 +50,7 @@ class QuizActivity : BaseViewModelActivity<QuizViewModel>() {
 
     companion object {
         // 允许发送动态的最大字数
-        const val MAX_CONTENT_SIZE = 500
+        const val MAX_CONTENT_SIZE = 1000
         const val MAX_SELECTABLE_IMAGE_COUNT = 8
         const val NOT_DRAFT = "0"
         const val UPDATE_DRAFT = "1"
diff --git a/module_qa/src/main/res/values/strings.xml b/module_qa/src/main/res/values/strings.xml
@@ -79,7 +79,7 @@
     <string name="qa_unfollow_circle" translatable="false">取消关注圈子成功</string>
     <string name="qa_draft_dialog_no_save" translatable="false">不保存</string>
     <string name="qa_draft_dialog_cancel" translatable="false">取消</string>
-    <string name="qa_edit_dynamic_num" translatable="false">0/500</string>
+    <string name="qa_edit_dynamic_num" translatable="false">0/1000</string>
     <string name="qa_choose_one_circle" translatable="false">请选择一个圈子</string>
     <string name="qa_dynamic_recommend" translatable="false">推荐</string>
     <string name="qa_my_follow_circle" translatable="false">我的关注</string>
diff --git a/module_schoolcar/src/main/java/com/mredrock/cyxbs/discover/schoolcar/SchoolCarActivity.kt b/module_schoolcar/src/main/java/com/mredrock/cyxbs/discover/schoolcar/SchoolCarActivity.kt
@@ -93,13 +93,19 @@ class SchoolCarActivity : BaseActivity(), View.OnClickListener {
                 aMap.animateCamera(update)
             }
             cv_positioning -> {
-                val update =
-                if (aMap.myLocation.longitude != 0.0 || aMap.myLocation.latitude !== 0.0){
-                     CameraUpdateFactory.newLatLngZoom(LatLng(aMap.myLocation.latitude, aMap.myLocation.longitude), 17f)
-                }else{
-                    CameraUpdateFactory.newLatLngZoom(LatLng(29.531876, 106.606789), 17f)
+                aMap.myLocation?.let { location->
+                    location.longitude?.let {
+                        location.latitude?.let {
+                            val update =
+                                if (aMap.myLocation.longitude != 0.0 || aMap.myLocation.latitude !== 0.0){
+                                    CameraUpdateFactory.newLatLngZoom(LatLng(aMap.myLocation.latitude, aMap.myLocation.longitude), 17f)
+                                }else{
+                                    CameraUpdateFactory.newLatLngZoom(LatLng(29.531876, 106.606789), 17f)
+                                }
+                            aMap.animateCamera(update)
+                        }
+                    }
                 }
-                aMap.animateCamera(update)
             }
             iv_cooperation_logo -> {
                 val intent = Intent()
diff --git a/module_schoolcar/src/main/java/com/mredrock/cyxbs/discover/schoolcar/widget/SchoolCarsSmoothMove.kt b/module_schoolcar/src/main/java/com/mredrock/cyxbs/discover/schoolcar/widget/SchoolCarsSmoothMove.kt
@@ -56,9 +56,9 @@ class SchoolCarsSmoothMove(private val schoolCarActivity: SchoolCarActivity?, pr
                                 val latLng = LatLng(data.lat,data.lon)
                                 val marker = buildMarker(data.id,data.type,latLng)
                                 marker?.let { marker ->
-                                    carMap[data.id] = SchoolCar(data.id,data.type,data.upDate,data.upDate,MovingPointOverlay(schoolCarActivity?.aMap,marker),marker,mutableListOf(latLng),getPolyline(data.type,latLng))
+                                    val smoothMarker = MovingPointOverlay(schoolCarActivity?.aMap,marker)
+                                    carMap[data.id] = SchoolCar(data.id,data.type,data.upDate,data.upDate,smoothMarker,marker,mutableListOf(latLng,smoothMarker.position),getPolyline(data.type,latLng))
                                 }
-                                carMap[data.id]?.let { car -> smoothMove(car) }
                             }else{
                                 //这里因为轮询是1s一次，所以说判断一下更新的时间，
                                 if(carMap[data.id]?.upDate != data.upDate){
@@ -92,10 +92,10 @@ class SchoolCarsSmoothMove(private val schoolCarActivity: SchoolCarActivity?, pr
     }
 
     private fun smoothMove(car:SchoolCar, mistime:Int = 3) {
-        if (car.latLngList.size > 4) {
+        if (car.latLngList.size > 3) {
             //停止上一次的移动，然后将上一次的位置加上之后再移动
             car.smoothMarker.stopMove()
-            val list = car.latLngList.subList(car.latLngList.size - 3, car.latLngList.size)
+            val list = car.latLngList.subList(car.latLngList.size - 2, car.latLngList.size)
             list[0] = car.smoothMarker.position
             val smoothMarker = MovingPointOverlay(schoolCarActivity?.aMap,car.marker)
             smoothMarker.setPoints(list)
diff --git a/module_todo/src/main/java/com/cyxbsmobile_single/module_todo/ui/widget/TodoWidget.kt b/module_todo/src/main/java/com/cyxbsmobile_single/module_todo/ui/widget/TodoWidget.kt
@@ -111,11 +111,13 @@ class TodoWidget : AppWidgetProvider() {
     private fun getPendingIntentFlags(isMutable: Boolean = false) =
         when {
             isMutable && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ->
-                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
-
+                PendingIntent.FLAG_MUTABLE
+            !isMutable && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ->
+                PendingIntent.FLAG_IMMUTABLE
+            isMutable && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ->
+                PendingIntent.FLAG_UPDATE_CURRENT
             !isMutable && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ->
-                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-
+                PendingIntent.FLAG_UPDATE_CURRENT
             else -> PendingIntent.FLAG_UPDATE_CURRENT
         }
 }
diff --git a/module_widget/src/main/java/com/mredrock/cyxbs/widget/util/Util.kt b/module_widget/src/main/java/com/mredrock/cyxbs/widget/util/Util.kt
@@ -5,6 +5,7 @@ import android.appwidget.AppWidgetManager
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
 import androidx.annotation.IdRes
@@ -182,7 +183,7 @@ fun getClickIntent(context: Context, widgetId: Int, viewId: Int, requestCode: In
     //放进需要设置的viewId
     bundle.putInt("Button", viewId)
     i.putExtras(bundle)
-    return PendingIntent.getBroadcast(context, requestCode, i, PendingIntent.FLAG_UPDATE_CURRENT)
+    return PendingIntent.getBroadcast(context, requestCode, i,getPendingIntentFlags())
 }
 
 fun formatTime(calendar: Calendar): String {
@@ -229,3 +230,15 @@ fun startOperation(dataBean: WidgetCourse.DataBean) {
         EventBus.getDefault().postSticky(WidgetCourseEvent(mutableListOf(dataBean)))
     }
 }
+private fun getPendingIntentFlags(isMutable: Boolean = false) =
+    when {
+        isMutable && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ->
+            PendingIntent.FLAG_MUTABLE
+        !isMutable && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ->
+            PendingIntent.FLAG_IMMUTABLE
+        isMutable && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ->
+            PendingIntent.FLAG_UPDATE_CURRENT
+        !isMutable && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ->
+            PendingIntent.FLAG_UPDATE_CURRENT
+        else -> PendingIntent.FLAG_UPDATE_CURRENT
+    }

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,16 @@ abstract class BaseApp : Application() {`
`12`	`12`	`companion object {`
`13`	`13`	`lateinit var appContext: Context`
`14`	`14`	`private set`
	`15`	`+ lateinit var version:String`
	`16`	`+ private set`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`@CallSuper`
`18`	`20`	`override fun onCreate() {`
`19`	`21`	`super.onCreate()`
`20`	`22`	`appContext = this`
	`23`	`+ appContext.packageManager.getPackageInfo(appContext.packageName,0).let {`
	`24`	`+ version = it.versionName`
	`25`	`+ }`
`21`	`26`	`}`
`22`	`27`	`}`