소스 검색

简化示例代码

drake 4 년 전
부모
커밋
c6342d8364
20개의 변경된 파일37개의 추가작업 그리고 223개의 파일을 삭제
  1. 1 3
      sample/src/main/java/com/drake/net/sample/ui/activity/MainActivity.kt
  2. 1 13
      sample/src/main/java/com/drake/net/sample/ui/fragment/AsyncTaskFragment.kt
  3. 1 12
      sample/src/main/java/com/drake/net/sample/ui/fragment/ConfigDialogFragment.kt
  4. 1 11
      sample/src/main/java/com/drake/net/sample/ui/fragment/CoroutineScopeFragment.kt
  5. 1 12
      sample/src/main/java/com/drake/net/sample/ui/fragment/CustomConvertFragment.kt
  6. 4 10
      sample/src/main/java/com/drake/net/sample/ui/fragment/DownloadFileFragment.kt
  7. 1 13
      sample/src/main/java/com/drake/net/sample/ui/fragment/DownloadImageFragment.kt
  8. 1 12
      sample/src/main/java/com/drake/net/sample/ui/fragment/ErrorHandlerFragment.kt
  9. 1 12
      sample/src/main/java/com/drake/net/sample/ui/fragment/ExceptionTraceFragment.kt
  10. 1 12
      sample/src/main/java/com/drake/net/sample/ui/fragment/FastestFragment.kt
  11. 1 12
      sample/src/main/java/com/drake/net/sample/ui/fragment/InterceptorFragment.kt
  12. 1 12
      sample/src/main/java/com/drake/net/sample/ui/fragment/ParallelNetworkFragment.kt
  13. 1 12
      sample/src/main/java/com/drake/net/sample/ui/fragment/PullRefreshFragment.kt
  14. 1 12
      sample/src/main/java/com/drake/net/sample/ui/fragment/PushRefreshFragment.kt
  15. 1 12
      sample/src/main/java/com/drake/net/sample/ui/fragment/ReadCacheFragment.kt
  16. 6 6
      sample/src/main/java/com/drake/net/sample/ui/fragment/RequestMethodFragment.kt
  17. 1 13
      sample/src/main/java/com/drake/net/sample/ui/fragment/StateLayoutFragment.kt
  18. 10 9
      sample/src/main/java/com/drake/net/sample/ui/fragment/SuperIntervalFragment.kt
  19. 1 13
      sample/src/main/java/com/drake/net/sample/ui/fragment/SwitchDispatcherFragment.kt
  20. 1 12
      sample/src/main/java/com/drake/net/sample/ui/fragment/UploadFileFragment.kt

+ 1 - 3
sample/src/main/java/com/drake/net/sample/ui/activity/MainActivity.kt

@@ -29,12 +29,10 @@ import kotlinx.android.synthetic.main.activity_main.*
 /**
  * 以下代码设置导航, 和框架本身无关无需关心, 请查看[com.drake.net.sample.ui.fragment]内的Fragment
  */
-class MainActivity : AppCompatActivity() {
+class MainActivity : AppCompatActivity(R.layout.activity_main) {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-
         immersiveDark(toolbar)
         setSupportActionBar(toolbar)
         toolbar.setupWithNavController(

+ 1 - 13
sample/src/main/java/com/drake/net/sample/ui/fragment/AsyncTaskFragment.kt

@@ -17,25 +17,13 @@
 package com.drake.net.sample.ui.fragment
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.drake.net.sample.R
 import com.drake.net.utils.scope
 import kotlinx.android.synthetic.main.fragment_async_task.*
 import kotlinx.coroutines.*
 
-class AsyncTaskFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-
-        return inflater.inflate(R.layout.fragment_async_task, container, false)
-    }
-
+class AsyncTaskFragment : Fragment(R.layout.fragment_async_task) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)

+ 1 - 12
sample/src/main/java/com/drake/net/sample/ui/fragment/ConfigDialogFragment.kt

@@ -17,9 +17,6 @@
 package com.drake.net.sample.ui.fragment
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.drake.net.Post
 import com.drake.net.sample.R
@@ -29,15 +26,7 @@ import kotlinx.android.synthetic.main.fragment_config_dialog.*
 import kotlinx.coroutines.CancellationException
 
 
-class ConfigDialogFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-
-        return inflater.inflate(R.layout.fragment_config_dialog, container, false)
-    }
+class ConfigDialogFragment : Fragment(R.layout.fragment_config_dialog) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)

+ 1 - 11
sample/src/main/java/com/drake/net/sample/ui/fragment/CoroutineScopeFragment.kt

@@ -17,9 +17,6 @@
 package com.drake.net.sample.ui.fragment
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Lifecycle
 import com.drake.net.sample.R
@@ -31,14 +28,7 @@ import kotlinx.android.synthetic.main.fragment_coroutine_scope.*
 import kotlinx.coroutines.delay
 
 
-class CoroutineScopeFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_coroutine_scope, container, false)
-    }
+class CoroutineScopeFragment : Fragment(R.layout.fragment_coroutine_scope) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)

+ 1 - 12
sample/src/main/java/com/drake/net/sample/ui/fragment/CustomConvertFragment.kt

@@ -17,9 +17,6 @@
 package com.drake.net.sample.ui.fragment
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.drake.net.Get
 import com.drake.net.sample.R
@@ -29,15 +26,7 @@ import com.drake.net.utils.scopeNetLife
 import kotlinx.android.synthetic.main.fragment_custom_convert.*
 
 
-class CustomConvertFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-
-        return inflater.inflate(R.layout.fragment_custom_convert, container, false)
-    }
+class CustomConvertFragment : Fragment(R.layout.fragment_custom_convert) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)

+ 4 - 10
sample/src/main/java/com/drake/net/sample/ui/fragment/DownloadFileFragment.kt

@@ -18,7 +18,9 @@ package com.drake.net.sample.ui.fragment
 
 import android.os.Bundle
 import android.text.format.Formatter
-import android.view.*
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
 import androidx.fragment.app.Fragment
 import com.drake.net.Download
 import com.drake.net.sample.R
@@ -27,18 +29,10 @@ import com.drake.net.utils.scopeNetLife
 import kotlinx.android.synthetic.main.fragment_download_file.*
 
 
-class DownloadFileFragment : Fragment() {
+class DownloadFileFragment : Fragment(R.layout.fragment_download_file) {
 
     private lateinit var downloadScope: NetCoroutineScope
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_download_file, container, false)
-    }
-
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         setHasOptionsMenu(true)

+ 1 - 13
sample/src/main/java/com/drake/net/sample/ui/fragment/DownloadImageFragment.kt

@@ -18,9 +18,6 @@ package com.drake.net.sample.ui.fragment
 
 import android.net.Uri
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.drake.net.DownloadImage
 import com.drake.net.NetConfig
@@ -29,16 +26,7 @@ import com.drake.net.utils.scopeDialog
 import kotlinx.android.synthetic.main.fragment_download_image.*
 
 
-class DownloadImageFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-
-        return inflater.inflate(R.layout.fragment_download_image, container, false)
-    }
+class DownloadImageFragment : Fragment(R.layout.fragment_download_image) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)

+ 1 - 12
sample/src/main/java/com/drake/net/sample/ui/fragment/ErrorHandlerFragment.kt

@@ -17,9 +17,6 @@
 package com.drake.net.sample.ui.fragment
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.drake.net.Get
 import com.drake.net.sample.R
@@ -27,15 +24,7 @@ import com.drake.net.utils.scopeNetLife
 import kotlinx.android.synthetic.main.fragment_error_handler.*
 
 
-class ErrorHandlerFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-
-        return inflater.inflate(R.layout.fragment_error_handler, container, false)
-    }
+class ErrorHandlerFragment : Fragment(R.layout.fragment_error_handler) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)

+ 1 - 12
sample/src/main/java/com/drake/net/sample/ui/fragment/ExceptionTraceFragment.kt

@@ -17,9 +17,6 @@
 package com.drake.net.sample.ui.fragment
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.drake.net.Get
 import com.drake.net.sample.R
@@ -27,15 +24,7 @@ import com.drake.net.utils.scopeNetLife
 import kotlinx.android.synthetic.main.fragment_exception_trace.*
 
 
-class ExceptionTraceFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-
-        return inflater.inflate(R.layout.fragment_exception_trace, container, false)
-    }
+class ExceptionTraceFragment : Fragment(R.layout.fragment_exception_trace) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)

+ 1 - 12
sample/src/main/java/com/drake/net/sample/ui/fragment/FastestFragment.kt

@@ -17,9 +17,6 @@
 package com.drake.net.sample.ui.fragment
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.drake.net.Get
 import com.drake.net.Post
@@ -28,15 +25,7 @@ import com.drake.net.utils.fastest
 import com.drake.net.utils.scopeNetLife
 import kotlinx.android.synthetic.main.fragment_request_method.*
 
-class FastestFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_fastest, container, false)
-    }
+class FastestFragment : Fragment(R.layout.fragment_fastest) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)

+ 1 - 12
sample/src/main/java/com/drake/net/sample/ui/fragment/InterceptorFragment.kt

@@ -17,9 +17,6 @@
 package com.drake.net.sample.ui.fragment
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.drake.net.Get
 import com.drake.net.sample.R
@@ -27,15 +24,7 @@ import com.drake.net.utils.scopeNetLife
 import kotlinx.android.synthetic.main.fragment_exception_trace.*
 
 
-class InterceptorFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-
-        return inflater.inflate(R.layout.fragment_interceptor, container, false)
-    }
+class InterceptorFragment : Fragment(R.layout.fragment_interceptor) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)

+ 1 - 12
sample/src/main/java/com/drake/net/sample/ui/fragment/ParallelNetworkFragment.kt

@@ -17,9 +17,6 @@
 package com.drake.net.sample.ui.fragment
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.drake.net.Get
 import com.drake.net.Post
@@ -28,15 +25,7 @@ import com.drake.net.sample.R
 import com.drake.net.utils.scopeNetLife
 
 
-class ParallelNetworkFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-
-        return inflater.inflate(R.layout.fragment_parallel_network, container, false)
-    }
+class ParallelNetworkFragment : Fragment(R.layout.fragment_parallel_network) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)

+ 1 - 12
sample/src/main/java/com/drake/net/sample/ui/fragment/PullRefreshFragment.kt

@@ -17,9 +17,6 @@
 package com.drake.net.sample.ui.fragment
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.setup
@@ -30,15 +27,7 @@ import com.drake.net.utils.scope
 import kotlinx.android.synthetic.main.fragment_pull_refresh.*
 
 
-class PullRefreshFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-
-        return inflater.inflate(R.layout.fragment_pull_refresh, container, false)
-    }
+class PullRefreshFragment : Fragment(R.layout.fragment_pull_refresh) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)

+ 1 - 12
sample/src/main/java/com/drake/net/sample/ui/fragment/PushRefreshFragment.kt

@@ -17,9 +17,6 @@
 package com.drake.net.sample.ui.fragment
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
@@ -31,15 +28,7 @@ import com.drake.net.utils.scope
 import kotlinx.android.synthetic.main.fragment_push_refresh.*
 
 
-class PushRefreshFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_push_refresh, container, false)
-    }
+class PushRefreshFragment : Fragment(R.layout.fragment_push_refresh) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)

+ 1 - 12
sample/src/main/java/com/drake/net/sample/ui/fragment/ReadCacheFragment.kt

@@ -18,9 +18,6 @@ package com.drake.net.sample.ui.fragment
 
 import android.os.Bundle
 import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.drake.net.Get
 import com.drake.net.Post
@@ -30,15 +27,7 @@ import com.yanzhenjie.kalle.simple.cache.CacheMode
 import kotlinx.android.synthetic.main.fragment_read_cache.*
 
 
-class ReadCacheFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_read_cache, container, false)
-    }
+class ReadCacheFragment : Fragment(R.layout.fragment_read_cache) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)

+ 6 - 6
sample/src/main/java/com/drake/net/sample/ui/fragment/RequestMethodFragment.kt

@@ -19,7 +19,9 @@
 package com.drake.net.sample.ui.fragment
 
 import android.os.Bundle
-import android.view.*
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
 import androidx.fragment.app.Fragment
 import com.drake.net.*
 import com.drake.net.sample.R
@@ -27,13 +29,11 @@ import com.drake.net.utils.scopeNetLife
 import kotlinx.android.synthetic.main.fragment_async_task.*
 
 
-class RequestMethodFragment : Fragment() {
+class RequestMethodFragment : Fragment(R.layout.fragment_request_method) {
 
-    override fun onCreateView(inflater: LayoutInflater,
-                              container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
-        return inflater.inflate(R.layout.fragment_request_method, container, false)
     }
 
 

+ 1 - 13
sample/src/main/java/com/drake/net/sample/ui/fragment/StateLayoutFragment.kt

@@ -17,9 +17,6 @@
 package com.drake.net.sample.ui.fragment
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.drake.net.Get
 import com.drake.net.sample.R
@@ -27,16 +24,7 @@ import com.drake.net.utils.scope
 import kotlinx.android.synthetic.main.fragment_state_layout.*
 
 
-class StateLayoutFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-
-        return inflater.inflate(R.layout.fragment_state_layout, container, false)
-    }
+class StateLayoutFragment : Fragment(R.layout.fragment_state_layout) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)

+ 10 - 9
sample/src/main/java/com/drake/net/sample/ui/fragment/SuperIntervalFragment.kt

@@ -17,7 +17,9 @@
 package com.drake.net.sample.ui.fragment
 
 import android.os.Bundle
-import android.view.*
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
 import androidx.fragment.app.Fragment
 import com.drake.net.sample.R
 import com.drake.net.time.Interval
@@ -25,20 +27,19 @@ import kotlinx.android.synthetic.main.fragment_super_interval.*
 import java.util.concurrent.TimeUnit
 
 
-class SuperIntervalFragment : Fragment() {
+class SuperIntervalFragment : Fragment(R.layout.fragment_super_interval) {
 
     private lateinit var interval: Interval // 轮循器
 
-    override fun onCreateView(inflater: LayoutInflater,
-                              container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_super_interval, container, false)
-    }
-
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        interval = Interval(0, 1, TimeUnit.SECONDS, 10).life(this) // 自定义计数器个数的轮循器, 当[start]]比[end]值大, 且end不等于-1时, 即为倒计时
+        interval = Interval(
+            0,
+            1,
+            TimeUnit.SECONDS,
+            10
+        ).life(this) // 自定义计数器个数的轮循器, 当[start]]比[end]值大, 且end不等于-1时, 即为倒计时
         // interval = Interval(1, TimeUnit.SECONDS) // 每秒回调一次, 不会自动结束
         interval.subscribe {
             tv_fragment.text = it.toString()

+ 1 - 13
sample/src/main/java/com/drake/net/sample/ui/fragment/SwitchDispatcherFragment.kt

@@ -17,9 +17,6 @@
 package com.drake.net.sample.ui.fragment
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.drake.net.sample.R
 import com.drake.net.utils.scopeLife
@@ -28,20 +25,11 @@ import com.drake.net.utils.withMain
 import kotlinx.coroutines.launch
 
 
-class SwitchDispatcherFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-
-        return inflater.inflate(R.layout.fragment_switch_dispatcher, container, false)
-    }
+class SwitchDispatcherFragment : Fragment(R.layout.fragment_switch_dispatcher) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-
         scopeLife {
 
             // 点击函数名查看更多相关函数

+ 1 - 12
sample/src/main/java/com/drake/net/sample/ui/fragment/UploadFileFragment.kt

@@ -17,9 +17,6 @@
 package com.drake.net.sample.ui.fragment
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.drake.net.Post
 import com.drake.net.sample.R
@@ -30,15 +27,7 @@ import java.io.File
 import java.io.FileOutputStream
 
 
-class UploadFileFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-
-        return inflater.inflate(R.layout.fragment_upload_file, container, false)
-    }
+class UploadFileFragment : Fragment(R.layout.fragment_upload_file) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)