moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Modify]完成1.4.0埋点事件

Browse Source
This commit is contained in:
wushaocheng
2022-12-06 16:48:05 +08:00
parent f6ae6b0de2
commit 7684623eab
24 changed files with 291 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/CollectionRoomInfo.java
View File

@@ -2,6 +2,9 @@ package com.yizhuan.xchat_android_core.home.bean;
import java.util.List;
import lombok.Data;
@Data
public class CollectionRoomInfo {
/**
* totalPage : 1

3
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTabMapInfo.java
View File

@@ -4,6 +4,9 @@ import com.chad.library.adapter.base.entity.MultiItemEntity;
import java.io.Serializable;
import lombok.Data;
@Data
public class HomeTabMapInfo implements MultiItemEntity, Serializable {
public static final int TYPE_EMPTY = 0;

61
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTagInfo.java
View File

@@ -1,39 +1,48 @@
package com.yizhuan.xchat_android_core.home.bean;
import lombok.Data;
@Data
public class HomeTagInfo {
/**
* id : 1
* name : 推荐
* seq : 1
*/
/**
* id : 1
* name : 推荐
* seq : 1
*/
private int id;
private String name;
private int seq;
private int id;
private String name;
private int seq;
public int getId() {
return id;
}
public HomeTagInfo(int id, String name, int seq) {
this.id = id;
this.name = name;
this.seq = seq;
}
public void setId(int id) {
this.id = id;
}
public int getId() {
return id;
}
public String getName() {
return name;
}
public void setId(int id) {
this.id = id;
}
public void setName(String name) {
this.name = name;
}
public String getName() {
return name;
}
public int getSeq() {
return seq;
}
public void setName(String name) {
this.name = name;
}
public void setSeq(int seq) {
this.seq = seq;
}
public int getSeq() {
return seq;
}
public void setSeq(int seq) {
this.seq = seq;
}
}

3
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MainTabInfo.kt
View File

@@ -1,5 +1,8 @@
package com.yizhuan.xchat_android_core.home.bean
import lombok.Data
@Data
data class MainTabInfo(
val tabIcon: String = "",
val tabSelectedIcon: String = "",

3
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/ResourceInfo.kt
View File

@@ -1,5 +1,8 @@
package com.yizhuan.xchat_android_core.home.bean
import lombok.Data
@Data
data class ResourceInfo(
val icon: String? = null,
val id: Int = 0,

3
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/VisitorInfo.kt
View File

@@ -1,5 +1,8 @@
package com.yizhuan.xchat_android_core.home.bean
import lombok.Data
@Data
data class VisitorInfo(
val avatar: String? = null,
val erbanNo: Int = 0,

6
core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java
View File

@@ -27,6 +27,7 @@ import com.yizhuan.xchat_android_core.auth.entity.TicketInfo;
import com.yizhuan.xchat_android_core.auth.event.GetCurrentUidEvent;
import com.yizhuan.xchat_android_core.auth.event.KickOutEvent;
import com.yizhuan.xchat_android_core.auth.event.LoginEvent;
import com.yizhuan.xchat_android_core.auth.event.LoginReportEvent;
import com.yizhuan.xchat_android_core.auth.event.LogoutEvent;
import com.yizhuan.xchat_android_core.auth.exception.AccountCancelException;
import com.yizhuan.xchat_android_core.auth.exception.BanAccountException;
@@ -122,8 +123,6 @@ public class AuthModel extends BaseModel implements IAuthModel {
* 超管登录校验验证码
*/
private static final int SUPER_CODE_SHOW_CODE = 136;
private static final int TYPE_WECHAT_LOGIN = 1;//微信登录类型
private static final int TYPE_QQ_LOGIN = 2;//QQ登录类型
private volatile static AuthModel instance = null;
boolean isInit = false;
@@ -397,6 +396,7 @@ public class AuthModel extends BaseModel implements IAuthModel {
gender = gender.replace("m", "1").replace("f", "2");
}
thirdUserInfo.setUserGender(gender);
EventBus.getDefault().post(new LoginReportEvent(1));
return thirdLogin(openid, unionid, TYPE_FACEBOOK_LOGIN, "", "");
})
.flatMap(s -> imLogin(currentAccountInfo))
@@ -471,6 +471,7 @@ public class AuthModel extends BaseModel implements IAuthModel {
gender = gender.replace("m", "1").replace("f", "2");
}
thirdUserInfo.setUserGender(gender);
EventBus.getDefault().post(new LoginReportEvent(2));
return thirdLogin(openid, unionid, TYPE_LINE_LOGIN, "", "");
})
.flatMap(s -> imLogin(currentAccountInfo))
@@ -543,6 +544,7 @@ public class AuthModel extends BaseModel implements IAuthModel {
gender = gender.replace("m", "1").replace("f", "2");
}
thirdUserInfo.setUserGender(gender);
EventBus.getDefault().post(new LoginReportEvent(3));
return thirdLogin(openid, unionid, TYPE_GOOGLE_LOGIN, "", "");
})
.flatMap(s -> imLogin(currentAccountInfo))

15
core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LoginReportEvent.java Normal file
View File

@@ -0,0 +1,15 @@
package com.yizhuan.xchat_android_core.auth.event;
import lombok.Data;
/**
* 三方登录上报事件
*/
@Data
public class LoginReportEvent {
private int loginType;
public LoginReportEvent(int loginType) {
this.loginType = loginType;
}
}