account subumit

app/src/main/AndroidManifest.xml

@@ -173,10 +173,7 @@
         <activity
             android:name=".page.SplashActivity"
             android:screenOrientation="portrait">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
+
         </activity>
         <activity
             android:name="com.sheep.gamegroup.view.activity.AskRewardAct"
@@ -195,7 +192,10 @@
 
         <!--2.0-->
         <activity android:name="com.sheep.gamegroup.view.activity.LoginAct">
-
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
             </activity>
 
         <activity android:name="com.sheep.gamegroup.view.activity.PhoneAct"/>

app/src/main/java/com/sheep/gamegroup/presenter/LoginPresenter.java

@@ -6,6 +6,7 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 
+import com.googlecode.protobuf.format.util.TextUtils;
 import com.sheep.gamegroup.exception.ExceptionEngine;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -59,7 +60,7 @@ public class LoginPresenter implements LoginContract.Presenter {
 
                         @Override
                         public void onError(Throwable throwable) {
-                            view.NetError(-1,throwable.getMessage().toString());
+                            view.NetError(-1, "网络异常");
                         }
 
                         @Override
@@ -93,7 +94,7 @@ public class LoginPresenter implements LoginContract.Presenter {
 
                         @Override
                         public void onError(Throwable throwable) {
-                            view.NetError(-1, ExceptionEngine.handleException(throwable).getMessage());
+                            view.NetError(-1, "网络异常");
                         }
 
                         @Override

app/src/main/java/com/sheep/gamegroup/util/ChannelContent.java

@@ -35,7 +35,7 @@ public class ChannelContent {
 
     private static final String META_INF_FILE_START = "META-INF/pl_channel_";
     private static final String CHANNEL_FILE_MARK = "pl_channel_";
-    private String channel_name;
+    private String channel_name="";
     private static ChannelContent instance;
     private Properties properties;
     private boolean hasChannelFile = false;

app/src/main/java/com/sheep/gamegroup/util/ConnectAddress.java

@@ -6,7 +6,7 @@ package com.sheep.gamegroup.util;
 
 public class ConnectAddress {
 
-    public static final String BASE_HTTP = "http://10.8.220.6:8080/";//何威
+   public static final String BASE_HTTP = "http://10.8.220.6:8080/";//何威
 //     public static final String BASE_HTTP = "http://10.8.220.5:8080/";//张伟
 //    public static final String BASE_HTTP = "http://test.sheep.kfzs.com/";//测试服地址
 

app/src/main/java/com/sheep/gamegroup/view/activity/LoginAct.java

@@ -120,12 +120,14 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
             @Override
             public void onError(SHARE_MEDIA platform, int action, Throwable t) {
                 showToast("微信授权失败");
+                hideProgress();
             }
 
             @Override
             public void onCancel(SHARE_MEDIA platform, int action) {
 
                 showToast("微信授权失败");
+                hideProgress();
             }
         });
 
@@ -149,12 +151,13 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
             @Override
             public void onError(SHARE_MEDIA platform, int action, Throwable t) {
                 showToast("QQ授权失败");
+                hideProgress();
             }
 
             @Override
             public void onCancel(SHARE_MEDIA platform, int action) {
 
-
+                hideProgress();
             }
         });
 
@@ -187,7 +190,6 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
                 goTelLogin();
                 break;
             case R.id.iv_wx:
-//                Jump2View.getInstance().goHomePageView(this,null);
                 goWeixin();
                 break;
             case R.id.iv_qq: