yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	common/src/main/res/values/strings.xml
This commit is contained in:
zlzw
2022-10-08 11:10:12 +08:00
parent 340217e922 80655a8662
commit bc553a1b1d
25 changed files with 852 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/main/java/com/yunbao/main/http/MainHttpUtil.java
View File

@@ -61,7 +61,7 @@ public class MainHttpUtil {
HttpClient.getInstance().get("Login.userLoginByThird", MainHttpConsts.LOGIN_BY_THIRD)
.params("openid", openid)
.params("nicename", nicename)
.params("app_project", "1")
.params("app_source", CommonAppConfig.IS_GOOGLE_PLAY==true?"1":"3")
.params("avatar", avatar)
.params("type", type)
.params("source", DEVICE)
@@ -80,7 +80,7 @@ public class MainHttpUtil {
String sign = MD5Util.getMD5("openid=" + openid + "&" + SALT);
HttpClient.getInstance().get("Login.userLoginByThird", MainHttpConsts.LOGIN_BY_THIRD)
.params("openid", openid)
.params("app_project", "1")
.params("app_source", CommonAppConfig.IS_GOOGLE_PLAY==true?"1":"3")
.params("admin_id", promoCode)
.params("uuid_Device", uuidDevice)
.params("nicename", nicename)
@@ -552,7 +552,7 @@ public class MainHttpUtil {
public static void register(String invitecode, String user_login, String promo_code, String uuidDevice, int countryCode, String pass, String pass2, String code, HttpCallback callback) {
HttpClient.getInstance().get("Login.userReg", MainHttpConsts.REGISTER)
.params("user_login", user_login)
.params("app_project", "1")
.params("app_source", CommonAppConfig.IS_GOOGLE_PLAY==true?"1":"3")
//增加参数：推广码
.params("user_activation_key", promo_code)
.params("admin_id", promo_code)

2
main/src/main/res/layout/view_anchor_search_results_item_holder.xml
View File

@@ -46,9 +46,9 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/anchor_list"
android:layout_below="@id/type_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/type_title"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:fadingEdge="none" />