From c7b16ce91b10e28d2eecfc314258bb01925d4dac Mon Sep 17 00:00:00 2001
From: CsHeng <chenshuoheng@ghzhushou.com>
Date: Tue, 12 Sep 2017 15:02:46 +0800
Subject: [PATCH] fix npe

---
 app/src/main/AndroidManifest.xml                     |  2 +-
 app/src/main/java/com/gh/common/util/ShareUtils.java |  1 +
 .../main/java/com/halo/assistant/AppController.java  |  9 ---------
 gradle.properties                                    | 12 ++++++------
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7f71189dd6..1321ee947b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -56,7 +56,7 @@
 
     <!--android:largeHeap = "true"-->
     <application
-        android:name = "com.halo.assistant.TinkerApplicationImpl"
+        android:name = "com.halo.assistant.AppController"
         android:allowBackup = "true"
         android:icon = "@drawable/logo"
         android:label = "@string/app_name"
diff --git a/app/src/main/java/com/gh/common/util/ShareUtils.java b/app/src/main/java/com/gh/common/util/ShareUtils.java
index 4d90eef6db..03b918b25f 100644
--- a/app/src/main/java/com/gh/common/util/ShareUtils.java
+++ b/app/src/main/java/com/gh/common/util/ShareUtils.java
@@ -105,6 +105,7 @@ public class ShareUtils {
         mTencent = Tencent.createInstance(Config.TENCENT_APPID, context); //初始化QQ分享
         mIWXAPI = WXAPIFactory.createWXAPI(context, Config.WECHAT_APPID); //初始化微信分享
         WbSdk.install(context,new AuthInfo(context, Config.WEIBO_APPKEY, "http://www.sina.com", SCOPE));
+        // FIXME 此处严重泄露，把Activity Context 存为static？？？？？
         mContext = context;
     }
 
diff --git a/app/src/main/java/com/halo/assistant/AppController.java b/app/src/main/java/com/halo/assistant/AppController.java
index ee3f21b20b..c1a0198f55 100644
--- a/app/src/main/java/com/halo/assistant/AppController.java
+++ b/app/src/main/java/com/halo/assistant/AppController.java
@@ -50,16 +50,10 @@ public class AppController extends TinkerApplicationImpl {
     private String mChannel;
 
     public static void put(String key, Object object) {
-        if (objectMap == null) {
-            objectMap = new ArrayMap<>();
-        }
         objectMap.put(key, object);
     }
 
     public static Object get(String key, boolean isRemove) {
-        if (objectMap == null) {
-            return null;
-        }
         if (isRemove) {
             return objectMap.remove(key);
         } else {
@@ -68,9 +62,6 @@ public class AppController extends TinkerApplicationImpl {
     }
 
     public static void remove(String key) {
-        if (objectMap == null) {
-            return;
-        }
         objectMap.remove(key);
     }
 
diff --git a/gradle.properties b/gradle.properties
index 72a1508468..32c1f024d2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -50,13 +50,13 @@ DEV_COMMENT_HOST=https\://dev.api.ghzs666.com/v3d0/
 DEV_DATA_HOST=http\://data.ghzs666.com/
 DEV_USERSEA_HOST=https\://dev.usersea.ghzs666.com/v1d0/
 
-API_HOST=http\://api.ghzs666.com/v3d0/
+API_HOST=http\://api.ghzs.com/v3d0/
+LIBAO_HOST=http\://api.ghzs.com/v3d0/
+MESSAGE_HOST=http\://api.ghzs.com/v3d0/
+USER_HOST=http\://api.ghzs.com/v3d0/
+COMMENT_HOST=http\://api.ghzs.com/v3d0/
 DATA_HOST=http\://data.ghzs666.com/
-LIBAO_HOST=http\://libao.ghzs666.com/v1d3/
-MESSAGE_HOST=http\://message.ghzs666.com/v1d1/
-USER_HOST=http\://user.ghzs666.com/v1d2/
-COMMENT_HOST=http\://comment.ghzs666.com/v1d3/
-USERSEA_HOST=https\://usersea.ghzs666.com/v1d0/
+USERSEA_HOST=https\://usersea.ghzs.com/v1d0/
 
 #TINKER_ID=
 TINKER_ENABLED=1
\ No newline at end of file