diff --git a/app/build.gradle b/app/build.gradle
index e02ab1bdb7..a2e6e6ef94 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -273,6 +273,7 @@ dependencies {
 
     implementation 'com.ethanhua:skeleton:1.1.1'
     implementation 'io.supercharge:shimmerlayout:2.1.0'
+    implementation "com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.3.1"
     
     implementation "com.squareup.picasso:picasso:${picasso}"
     implementation "com.zhihu.android:matisse:${matisse}"
@@ -283,7 +284,7 @@ dependencies {
     implementation project(':libraries:QQShare')
     implementation project(':libraries:TalkingData')
     implementation project(':libraries:UmengPush')
-    implementation project(':libraries:WechatShare')
+//    implementation project(':libraries:WechatShare')
     implementation project(':libraries:LogHub')
     implementation project(':libraries:im')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 26887809f5..0b18802c01 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -398,6 +398,15 @@
             </intent-filter >
         </activity >
 
+        <activity
+            android:name="${applicationId}.wxapi.WXEntryActivity"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:screenOrientation = "portrait" >
+        </activity>
+
         <provider
             android:name = "android.support.v4.content.FileProvider"
             android:authorities = "${applicationId}"
diff --git a/app/src/main/java/com/gh/common/util/GetLoginDataUtils.java b/app/src/main/java/com/gh/common/util/GetLoginDataUtils.java
index 8e20360036..f0d4b78d1e 100644
--- a/app/src/main/java/com/gh/common/util/GetLoginDataUtils.java
+++ b/app/src/main/java/com/gh/common/util/GetLoginDataUtils.java
@@ -16,9 +16,9 @@ import com.sina.weibo.sdk.auth.Oauth2AccessToken;
 import com.sina.weibo.sdk.auth.WbAuthListener;
 import com.sina.weibo.sdk.auth.WbConnectErrorMessage;
 import com.sina.weibo.sdk.auth.sso.SsoHandler;
-import com.tencent.mm.sdk.openapi.IWXAPI;
-import com.tencent.mm.sdk.openapi.SendAuth;
-import com.tencent.mm.sdk.openapi.WXAPIFactory;
+import com.tencent.mm.opensdk.modelmsg.SendAuth;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.tencent.tauth.IUiListener;
 import com.tencent.tauth.Tencent;
 import com.tencent.tauth.UiError;
diff --git a/app/src/main/java/com/gh/common/util/ImageUtils.kt b/app/src/main/java/com/gh/common/util/ImageUtils.kt
index a901ea4841..e9d6f8fb7e 100644
--- a/app/src/main/java/com/gh/common/util/ImageUtils.kt
+++ b/app/src/main/java/com/gh/common/util/ImageUtils.kt
@@ -2,6 +2,7 @@ package com.gh.common.util
 
 import android.content.Context
 import android.content.res.Resources
+import android.graphics.Bitmap
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.ColorDrawable
 import android.net.Uri
@@ -21,6 +22,7 @@ import com.facebook.imagepipeline.request.ImageRequest
 import com.facebook.imagepipeline.request.ImageRequestBuilder
 import com.gh.common.constant.Config
 import com.gh.gamecenter.R
+import java.io.ByteArrayOutputStream
 
 
 object ImageUtils {
@@ -293,6 +295,24 @@ object ImageUtils {
         }
     }
 
+    @JvmStatic
+    fun bmpToByteArray(bmp: Bitmap, needRecycle: Boolean): ByteArray {
+        val output = ByteArrayOutputStream()
+        bmp.compress(Bitmap.CompressFormat.PNG, 100, output)
+        if (needRecycle) {
+            bmp.recycle()
+        }
+
+        val result = output.toByteArray()
+        try {
+            output.close()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+
+        return result
+    }
+
 
     @JvmStatic
     fun display(draweeView: SimpleDraweeView, @DrawableRes res: Int?) {
diff --git a/app/src/main/java/com/gh/common/util/MessageShareUtils.java b/app/src/main/java/com/gh/common/util/MessageShareUtils.java
index 5c5b4ee778..1f441ff835 100644
--- a/app/src/main/java/com/gh/common/util/MessageShareUtils.java
+++ b/app/src/main/java/com/gh/common/util/MessageShareUtils.java
@@ -11,11 +11,11 @@ import android.graphics.Matrix;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.Gravity;
 import android.view.KeyEvent;
-import android.support.v4.content.*;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -28,19 +28,17 @@ import com.gh.common.constant.Config;
 import com.gh.gamecenter.R;
 import com.lightgame.utils.Utils;
 import com.tencent.connect.share.QQShare;
-import com.tencent.mm.sdk.openapi.IWXAPI;
-import com.tencent.mm.sdk.openapi.SendMessageToWX;
-import com.tencent.mm.sdk.openapi.WXAPIFactory;
-import com.tencent.mm.sdk.openapi.WXImageObject;
-import com.tencent.mm.sdk.openapi.WXMediaMessage;
-import com.tencent.mm.sdk.platformtools.Util;
+import com.tencent.mm.opensdk.modelmsg.SendMessageToWX;
+import com.tencent.mm.opensdk.modelmsg.WXImageObject;
+import com.tencent.mm.opensdk.modelmsg.WXMediaMessage;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.tencent.tauth.IUiListener;
 import com.tencent.tauth.Tencent;
 import com.tencent.tauth.UiError;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Date;
@@ -308,7 +306,7 @@ public class MessageShareUtils {
         req.scene = SendMessageToWX.Req.WXSceneTimeline;
 
         Bitmap compressBp = compressBitmap(shareBm);
-        msg.thumbData = Util.bmpToByteArray(compressBp, true);
+        msg.thumbData = ImageUtils.bmpToByteArray(compressBp, true);
         mIWXAPI.sendReq(req);
 
         if (mPopupWindow == null) return;
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 4f4638b744..50dc218167 100644
--- a/app/src/main/java/com/gh/common/util/ShareUtils.java
+++ b/app/src/main/java/com/gh/common/util/ShareUtils.java
@@ -37,12 +37,11 @@ import com.sina.weibo.sdk.WbSdk;
 import com.sina.weibo.sdk.auth.AuthInfo;
 import com.tencent.connect.share.QQShare;
 import com.tencent.connect.share.QzoneShare;
-import com.tencent.mm.sdk.openapi.IWXAPI;
-import com.tencent.mm.sdk.openapi.SendMessageToWX;
-import com.tencent.mm.sdk.openapi.WXAPIFactory;
-import com.tencent.mm.sdk.openapi.WXMediaMessage;
-import com.tencent.mm.sdk.openapi.WXWebpageObject;
-import com.tencent.mm.sdk.platformtools.Util;
+import com.tencent.mm.opensdk.modelmsg.SendMessageToWX;
+import com.tencent.mm.opensdk.modelmsg.WXMediaMessage;
+import com.tencent.mm.opensdk.modelmsg.WXWebpageObject;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.tencent.tauth.IUiListener;
 import com.tencent.tauth.Tencent;
 import com.tencent.tauth.UiError;
@@ -296,10 +295,10 @@ public class ShareUtils {
             protected void onNewResultImpl(Bitmap bitmap) {
                 Bitmap compressBp = compressBitmap(bitmap);
                 if (mShareType == ShareType.askNormal || mShareType == ShareType.askInvite) {
-                    msg.thumbData = Util.bmpToByteArray(compressBp, true);
+                    msg.thumbData = ImageUtils.bmpToByteArray(compressBp, true);
                 } else {
                     Bitmap resultBp = addBackGround(compressBp);
-                    msg.thumbData = Util.bmpToByteArray(resultBp, true);
+                    msg.thumbData = ImageUtils.bmpToByteArray(resultBp, true);
                 }
                 mIWXAPI.sendReq(req);
             }
diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt
index 24d57ee39b..3b5f48145d 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt
@@ -136,7 +136,7 @@ class AnswerDetailFragment : NormalFragment() {
     private var mIsShowCommentManager: Boolean = false
 
     private var mViewedImageSet: HashSet<Int>? = null
-    private val mAnswersImgs: ArrayList<String>? = null
+    private val mAnswersImgs: ArrayList<String>? = arrayListOf()
 
     private var mElapsedHelper: TimeElapsedHelper? = null
     private var mDetailEntity: AnswerDetailEntity? = null
diff --git a/app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java b/app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java
index 6faf9b7e60..ff6102f435 100644
--- a/app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java
@@ -9,12 +9,12 @@ import com.gh.common.constant.Config;
 import com.gh.common.util.GetLoginDataUtils;
 import com.gh.gamecenter.R;
 import com.lightgame.utils.Utils;
-import com.tencent.mm.sdk.openapi.BaseReq;
-import com.tencent.mm.sdk.openapi.BaseResp;
-import com.tencent.mm.sdk.openapi.IWXAPI;
-import com.tencent.mm.sdk.openapi.IWXAPIEventHandler;
-import com.tencent.mm.sdk.openapi.SendAuth;
-import com.tencent.mm.sdk.openapi.WXAPIFactory;
+import com.tencent.mm.opensdk.modelbase.BaseReq;
+import com.tencent.mm.opensdk.modelbase.BaseResp;
+import com.tencent.mm.opensdk.modelmsg.SendAuth;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 
 import org.json.JSONObject;
 
@@ -64,8 +64,8 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler,
                 } else {
                     if (baseResp instanceof SendAuth.Resp) {
                         SendAuth.Resp resp = (SendAuth.Resp) baseResp;
-                        Utils.log("WXEntryActivity=TOKEN::" + resp.token);
-                        new WeChatUserInfoThread(WXEntryActivity.this, resp.token, WXEntryActivity.this).start();
+                        Utils.log("WXEntryActivity=TOKEN::" + resp.code);
+                        new WeChatUserInfoThread(WXEntryActivity.this, resp.code, WXEntryActivity.this).start();
                     } else {
                         shareResult = "登录失败";
                     }
diff --git a/settings.gradle b/settings.gradle
index 6c1f12e57f..82d1c05b33 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,5 +6,5 @@ include ':libraries:MTA'
 include ':libraries:QQShare'       
 include ':libraries:TalkingData'                
 include ':libraries:UmengPush'
-include ':libraries:WechatShare'
+//include ':libraries:WechatShare'
 include ':libraries:LogHub'
\ No newline at end of file