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

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignInFgt.java

@@ -160,7 +160,7 @@ public class SignInFgt extends AbsLoginFgt {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("user_name", userNameBox.getText().toString().trim());
         jsonObject.put("password", passwordBox.getText().toString().trim());
-//        jsonObject.put("invitation_code", scope);
+        jsonObject.put("invitation_code", ChannelContent.getInstance().getChannel_name());
         PreferenceUtils.setPrefString(SheepApp.getInstance(), UMConfigUtils.LOGIN_TYPE, UMConfigUtils.Source.SHEEP);
         SheepApp.getInstance().getNetComponent().getApiService().loginByUserName(jsonObject)
                 .subscribeOn(Schedulers.io())
@@ -212,7 +212,7 @@ public class SignInFgt extends AbsLoginFgt {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("account", phoneNumberBox.getText().toString().trim());
         jsonObject.put("sec_code", captchaBox.getText().toString().trim());
-//        jsonObject.put("invitation_code", scope);
+        jsonObject.put("invitation_code", ChannelContent.getInstance().getChannel_name());
         PreferenceUtils.setPrefString(SheepApp.getInstance(), UMConfigUtils.LOGIN_TYPE, UMConfigUtils.Source.SHEEP);
         SheepApp.getInstance().getNetComponent().getApiService().loginByCaptcha(jsonObject)
                 .subscribeOn(Schedulers.io())