Merge remote-tracking branch 'origin/3.0' into 3.0

2017-06-29 11:27:21 +08:00
parent 1b14f3f608 d370e817c0
commit 1d1c9666dc
127 changed files with 453 additions and 6378 deletions
--- a/app/src/main/java/com/gh/common/util/LoginUtils.java
+++ b/app/src/main/java/com/gh/common/util/LoginUtils.java
@ -6,6 +6,7 @@ import android.widget.Toast;

 import com.gh.base.AppController;
 import com.gh.common.constant.Config;
+import com.lightgame.utils.Utils;
 import com.sina.weibo.sdk.WbSdk;
 import com.sina.weibo.sdk.auth.AuthInfo;
 import com.sina.weibo.sdk.auth.Oauth2AccessToken;