From f1c08883092dda9b68a81f1ac88d88c816e3c86f Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Mon, 3 Dec 2018 15:35:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=B9=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=97=B6=E9=97=B4=E8=BF=99?=
 =?UTF-8?q?=E4=B8=AA=E6=8E=A5=E5=8F=A3=E7=9A=84=E8=A7=A3=E6=9E=90=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gh/common/exposure/time/Corrector.kt  |  9 ++------
 .../com/gh/common/util/DeviceTokenUtils.kt    | 21 ++++++++-----------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/gh/common/exposure/time/Corrector.kt b/app/src/main/java/com/gh/common/exposure/time/Corrector.kt
index ff34932ae4..50f3c97bd8 100644
--- a/app/src/main/java/com/gh/common/exposure/time/Corrector.kt
+++ b/app/src/main/java/com/gh/common/exposure/time/Corrector.kt
@@ -11,7 +11,6 @@ class Corrector {
 
     companion object {
         const val TIME_CORRECTOR_ADJUST_PERIOD: Long = 600000
-
     }
 
     var delta: Long = 0
@@ -22,12 +21,8 @@ class Corrector {
                     .subscribeOn(Schedulers.io())
                     .subscribe(object : Response<TimeEntity>() {
                         override fun onResponse(response: TimeEntity?) {
-                            try {
-                                val serverTime = response?.time!!
-                                delta = serverTime * 1000 - System.currentTimeMillis()
-                            } catch (e: NumberFormatException) {
-                                e.printStackTrace()
-                            }
+                            val serverTime = response?.time
+                            serverTime?.let { delta = it * 1000 - System.currentTimeMillis() }
                         }
                     })
         }
diff --git a/app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt b/app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt
index 536c50de79..24024fcdde 100644
--- a/app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt
+++ b/app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt
@@ -14,7 +14,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import java.io.File
 
-
 object DeviceTokenUtils {
 
     const val DEVICE_ID = "uuid"
@@ -29,13 +28,11 @@ object DeviceTokenUtils {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(object : Response<TimeEntity>() {
                     override fun onResponse(response: TimeEntity?) {
-                        try {
-                            val editor = sp.edit()
-                            editor.putLong("server_time", response?.time!!)
+                        val editor = sp.edit()
+                        response?.time?.let {
+                            editor.putLong("server_time", it)
                             editor.putLong("client_time", System.currentTimeMillis() / 1000)
                             editor.apply()
-                        } catch (e: NumberFormatException) {
-                            e.printStackTrace()
                         }
                     }
                 })
@@ -49,18 +46,18 @@ object DeviceTokenUtils {
         if (values.isNotEmpty()) {
             for (value in values) {
                 if (value.key.contains("isNewFirstLaunchV")) {
-                    lunchType = LunchType.update
+                    lunchType = LunchType.UPDATE
                     break
                 }
             }
         }
         // 再次重装
         if (lunchType == null && !getDeviceId().isNullOrEmpty()) {
-            lunchType = LunchType.again
+            lunchType = LunchType.AGAIN
         }
         // 首次安装
         if (lunchType == null) {
-            lunchType = LunchType.first
+            lunchType = LunchType.FIRST
         }
         // 保存deviceId
         var deviceId = Util_System_Phone_State.getDeviceId(HaloApp.getInstance().application)
@@ -131,7 +128,7 @@ object DeviceTokenUtils {
 }
 
 enum class LunchType {
-    first,
-    update,
-    again
+    FIRST,
+    UPDATE,
+    AGAIN
 }

From 050c7f9d867a54fff3ba4d83367cbbbbf48d1285 Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Tue, 4 Dec 2018 17:03:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=9D=9E=E7=A9=BA?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gh/gamecenter/gamedetail/GameDetailViewModel.kt    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt
index b7c53ecda5..c2dc8ce44c 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt
@@ -102,10 +102,12 @@ class GameDetailViewModel(application: Application,
                 concernLiveData.postValue(ConcernResponse(isConcern, false))
             }
         }
-        if (isConcern) {
-            ConcernUtils.postConcernGameId(getApplication(), game?.id!!, listener)
-        } else {
-            ConcernUtils.deleteConcernData(getApplication(), game?.id!!, listener)
+        game?.id?.let {
+            if (isConcern) {
+                ConcernUtils.postConcernGameId(getApplication(), it, listener)
+            } else {
+                ConcernUtils.deleteConcernData(getApplication(), it, listener)
+            }
         }
     }