Merge remote-tracking branch 'origin/main'

Author: AndroidCoderPeng

app/src/main/java/com/pengxh/kt/lib/fragments/widget/TitleBarViewFragment.kt

@@ -23,7 +23,7 @@ class TitleBarViewFragment : KotlinBaseFragment<FragmentWidgetTitleBarViewBindin
             }
 
             override fun onRightClick() {
-                "onRightClick".show(requireContext())
+                binding.titleView.getTitle().show(requireContext())
             }
         })
     }

lite/src/main/java/com/pengxh/kt/lite/utils/RetrofitFactory.kt

@@ -17,25 +17,30 @@ object RetrofitFactory {
      * @param timeout 网络请求超时时间，单位：秒
      * */
     inline fun <reified T> createRetrofit(
-        httpConfig: String, timeout: Long = Constant.HTTP_TIMEOUT
+        httpConfig: String, timeout: Long = Constant.HTTP_TIMEOUT, debug: Boolean = true
     ): T {
-        val interceptor = HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger {
-            override fun log(message: String) {
-                Log.d(kTag, ">>>>> $message")
-            }
-        })
-        interceptor.setLevel(HttpLoggingInterceptor.Level.BODY)
         val httpClientBuilder = OkHttpClient.Builder()
-            .addInterceptor(interceptor)
             .connectTimeout(timeout, TimeUnit.SECONDS)
             .readTimeout(timeout, TimeUnit.SECONDS)
             .writeTimeout(timeout, TimeUnit.SECONDS)
+        val httpClient = if (debug) {
+            val interceptor = HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger {
+                override fun log(message: String) {
+                    Log.d(kTag, ">>>>> $message")
+                }
+            })
+            interceptor.setLevel(HttpLoggingInterceptor.Level.BODY)
+            httpClientBuilder.addInterceptor(interceptor).build()
+        } else {
+            httpClientBuilder.build()
+        }
         return Retrofit.Builder()
             .baseUrl(httpConfig)
             .addConverterFactory(ScalarsConverterFactory.create())          //字符串转换器
             .addConverterFactory(GsonConverterFactory.create())             //Gson转换器
             .addCallAdapterFactory(CoroutineCallAdapterFactory.invoke())    //协程请求适配器
-            .client(httpClientBuilder.build()) //log拦截器
-            .build().create(T::class.java)
+            .client(httpClient)
+            .build()
+            .create(T::class.java)
     }
 }

lite/src/main/java/com/pengxh/kt/lite/widget/TitleBarView.kt

@@ -131,6 +131,13 @@ class TitleBarView constructor(context: Context, attrs: AttributeSet) :
         invalidate()
     }
 
+    /**
+     * 获取当前显示标题文字
+     * */
+    fun getTitle(): String {
+        return textView.text.toString()
+    }
+
     private var listener: OnClickListener? = null
 
     fun setOnClickListener(listener: OnClickListener?) {