From 094000ce57dd6f511d7c62458bb99725373af429 Mon Sep 17 00:00:00 2001 From: Martin <13046765170@163.com> Date: Thu, 10 Oct 2024 13:15:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E3=80=81=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E7=99=BB=E5=BD=95=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=8E=A8?= =?UTF-8?q?=E5=B9=BF=E7=A0=81=E5=AD=97=E6=AE=B5=20agent=5Fcode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yunbao/main/activity/EntryActivity.java | 7 ++++--- .../java/com/yunbao/main/activity/RegisterActivity.java | 6 +++++- main/src/main/java/com/yunbao/main/http/MainHttpUtil.java | 7 +++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java index 783e2b0de..163630fed 100644 --- a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java @@ -58,6 +58,7 @@ import com.facebook.login.LoginResult; import com.fm.openinstall.OpenInstall; import com.fm.openinstall.listener.AppInstallAdapter; import com.fm.openinstall.model.AppData; +import com.google.gson.Gson; import com.linecorp.linesdk.Scope; import com.linecorp.linesdk.auth.LineAuthenticationParams; import com.linecorp.linesdk.auth.LineLoginApi; @@ -126,7 +127,7 @@ public class EntryActivity extends AppCompatActivity { private LinearLayout btn_google, googleLayout,btn_phone; public static Activity activity; private static String mLoginType = Constants.MOB_PHONE;//登录方式 - public String mPromoCode = "", UserID = "";//推广码 + public String mPromoCode = "", UserID = "",agent_code = "";//推广码 private String mUuidDevice = "";//手机唯一标识符 private static boolean mFirstLogin;//是否是第一次登录 @@ -650,6 +651,7 @@ public class EntryActivity extends AppCompatActivity { JSONObject data = JSON.parseObject(appData.getData()); mPromoCode = data.getString("admin_id") + ""; UserID = data.getString("user_id") + ""; + agent_code = data.getString("agent_code"+""); } } } @@ -683,7 +685,7 @@ public class EntryActivity extends AppCompatActivity { if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2 || CommonAppConfig.IS_GOOGLE_PLAY == 3) { mPromoCode = ""; } - MainHttpUtil.loginByThird(UserID, data.getOpenID(), mPromoCode, mUuidDevice, data.getNickName(), data.getAvatar(), data.getType(), new HttpCallback() { + MainHttpUtil.loginByThird(UserID, agent_code,data.getOpenID(), mPromoCode, mUuidDevice, data.getNickName(), data.getAvatar(), data.getType(), new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { onLoginSuccess(code, msg, info); @@ -696,7 +698,6 @@ public class EntryActivity extends AppCompatActivity { private void onLoginSuccess(int code, String msg, String[] info) { Log.e("他", code + "code" + info.toString()); if (code == 0 && info.length > 0) { - JSONObject obj = JSON.parseObject(info[0]); String uid = obj.getString("id"); String token = obj.getString("token"); diff --git a/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java b/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java index 0eee70642..68340a273 100644 --- a/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java @@ -86,6 +86,7 @@ public class RegisterActivity extends AbsActivity { private boolean mShowInvite; private String mPromoCode = "";//推广码 private String UserID = "";//用户推广码 + private String agent_code ="";//代理推广码 private String mUuidDevice = "";//手机唯一标识符 private int mPhoneMinLength = 5;//输入手机号的最小位数 private TextView mTvCountryCode; @@ -371,7 +372,7 @@ public class RegisterActivity extends AbsActivity { } else { ti = edit_invitecode_2.getText().toString().trim(); } - MainHttpUtil.register(UserID, ti, phoneNum, mPromoCode, mUuidDevice, mCountryCode, pwd, pwd2, code, new HttpCallback() { + MainHttpUtil.register(UserID,agent_code, ti, phoneNum, mPromoCode, mUuidDevice, mCountryCode, pwd, pwd2, code, new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { if (code == 0) { @@ -423,6 +424,9 @@ public class RegisterActivity extends AbsActivity { mPromoCode = data.getString("admin_id") + ""; //用户的码 UserID = data.getString("user_id") + ""; + + agent_code = data.getString("agent_code") + ""; + } Log.d("OpenInstall", UserID + "appData.getData()1111= " + mPromoCode); } diff --git a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java index 1fa9cda1d..8cf4a8120 100644 --- a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java +++ b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java @@ -85,7 +85,7 @@ public class MainHttpUtil { * 第三方登录---增加参数：推广码,手机唯一标识 */ - public static void loginByThird(String UserID, String openid, String promoCode, String uuidDevice, String nicename, String avatar, String type, HttpCallback callback) { + public static void loginByThird(String UserID,String agent_code, String openid, String promoCode, String uuidDevice, String nicename, String avatar, String type, HttpCallback callback) { String sign = MD5Util.getMD5("openid=" + openid + "&" + SALT); String appSource = "3"; if (CommonAppConfig.IS_GOOGLE_PLAY == 1) { @@ -98,6 +98,7 @@ public class MainHttpUtil { .params("app_source", appSource) .params("admin_id", promoCode) .params("uuid_Device", uuidDevice) + .params("agent_code",agent_code) .params("nicename", nicename) .params("avatar", avatar) .params("type", type) @@ -341,6 +342,7 @@ public class MainHttpUtil { public static void getSettingList(HttpCallback callback) { HttpClient.getInstance().get("huoqugexingshezhiliebiao", MainHttpConsts.GET_SETTING_LIST) .params("version", VersionUtil.getVersion()) + .params("package_name","poyo") .execute(callback); } @@ -588,7 +590,7 @@ public class MainHttpUtil { /** * 手机注册接口---增加参数：推广码,手机唯一标识,国家代码 */ - public static void register(String UserID, String invitecode, String user_login, String promo_code, String uuidDevice, int countryCode, String pass, String pass2, String code, HttpCallback callback) { + public static void register(String UserID, String agent_code,String invitecode, String user_login, String promo_code, String uuidDevice, int countryCode, String pass, String pass2, String code, HttpCallback callback) { String appSource = "3"; if (CommonAppConfig.IS_GOOGLE_PLAY == 1) { appSource = "1"; @@ -602,6 +604,7 @@ public class MainHttpUtil { .params("user_activation_key", promo_code) .params("admin_id", promo_code) .params("user_id", UserID) + .params("agent_code",agent_code) //增加参数：手机唯一标识 .params("uuid_Device", uuidDevice) //增加国家代码