消除类型转换警告

xiangning17 · Aug 9, 2021 · 05b6d48 · 05b6d48
1 parent 13e54a6
commit 05b6d48
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/library/src/main/java/me/xiangning/simpleservice/SimpleService.kt b/library/src/main/java/me/xiangning/simpleservice/SimpleService.kt
@@ -143,6 +143,7 @@ object SimpleService : ServiceManager {
         return true
     }
 
+    @Suppress("UNCHECKED_CAST")
     override fun <T : Any> getService(cls: Class<T>): T? {
         return serviceMap[cls] as? T
     }
@@ -191,6 +192,7 @@ object SimpleService : ServiceManager {
 
     }
 
+    @Suppress("UNCHECKED_CAST")
     private fun <T : Any> getRemoteServiceFromLocal(cls: Class<T>): T? {
         val cached = serviceMap[cls]
         if (cls.isInstance(cached)) {
@@ -236,6 +238,7 @@ object SimpleService : ServiceManager {
         }
     }
 
+    @Suppress("UNCHECKED_CAST")
     override fun <T : Any, R : IBinder> getServiceRemote(cls: Class<T>, service: T): R {
         try {
             return RemoteServiceHelper.getServiceRemote(cls, service) as R
@@ -252,6 +255,7 @@ object SimpleService : ServiceManager {
         }
     }
 
+    @Suppress("UNCHECKED_CAST")
     override fun <T : IInterface> getServiceRemoteInterface(proxy: Any): T {
         try {
             return (proxy as IRemoteServiceProxy).getRemoteInterface() as T

diff --git a/library/src/main/java/me/xiangning/simpleservice/remote/RemoteServiceHelper.kt b/library/src/main/java/me/xiangning/simpleservice/remote/RemoteServiceHelper.kt
@@ -33,10 +33,11 @@ object RemoteServiceHelper {
         }
     }
 
+    @Suppress("UNCHECKED_CAST")
     fun <T> getServiceRemoteProxy(cls: Class<T>, service: IBinder): T {
-        return proxies.getOrPut(service) {
-            WeakReference(createServiceRemoteProxy(cls, service))
-        }.get() as T
+        return (proxies[service]?.get() ?: createServiceRemoteProxy(cls, service).let {
+            proxies[service] = WeakReference(it)
+        }) as T
     }
 
     fun registerMethodErrorHandler(cls: Class<*>, handler: IMethodErrorHandler) {