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

“我的”页面修改。更换签名，包名，友盟统计、百度统计账号，

Browse Source
This commit is contained in:
oujunhui
2020-04-03 16:54:53 +08:00
parent 6d104effe5
commit 8a922f39c6
69 changed files with 455 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/build.gradle
View File

@@ -27,7 +27,7 @@ android {
}
sourceSets {
qingxun {
accompany {
java.srcDirs = [
'src/main/java',
'src/diff_src_erban/java',
@@ -72,7 +72,7 @@ android {
}
productFlavors{
qingxun {
accompany {
dimension 'default'
}
mengsheng{

24
core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
View File

@@ -11,12 +11,12 @@ public class XChatConstants {
/**
* 包名(各种缓存目录的根目录)
*/
public static final String XCHAT_DIR_NAME = "com.wudoo.qingxun";
public static final String XCHAT_DIR_NAME = "com.xuanyi.accompany";
/**
* sp名字
*/
public static final String XCHAT_SHARE_PREFERENCE_NAME = "qx_share_data";
public static final String XCHAT_SHARE_PREFERENCE_NAME = "accompany_share_data";
/**
* 加密接口参数
@@ -31,7 +31,7 @@ public class XChatConstants {
/**
* 本地数据库的名字(目前是用 realm 数据库)
*/
public static final String XCHAT_DATABASE_NAME = "qx.db";
public static final String XCHAT_DATABASE_NAME = "accompany.db";
/**
* 微信支付 APP ID
@@ -41,12 +41,12 @@ public class XChatConstants {
/**
* bugly key (DEBUG)
*/
public static final String BUGLY_KEY_DEBUG = "0a1c8049b9";
public static final String BUGLY_KEY_DEBUG = "f251d1616b";//已更改
/**
* bugly key (RELEASE)
*/
public static final String BUGLY_KEY_RELEASE = "3ffe6f95c2";
public static final String BUGLY_KEY_RELEASE = "d2dec194c0";//已更改
/**
* 云信 key (DEBUG)
@@ -105,21 +105,21 @@ public class XChatConstants {
/**
* 阿里云日志空间名字
*/
public static final String ALIYUN_LOG_NAME = "qingxunlog";
public static final String ALIYUN_LOG_NAME = "66accompanylog";
/**
* 阿里云日志空间名字
*/
public static final String ALIYUN_LOG_STORE = "qingxunlog";
public static final String ALIYUN_LOG_STORE = "66accompanylog";
/**
* 百度统计 key
*/
public static final String BAIDU_APP_KEY = "a9d2302aef";
public static final String BAIDU_APP_KEY = "b8a4cb4bd1";//已更改
/**
* 友盟统计 key
*/
public static final String UMENG_APP_KEY = "5d3ac7853fc19591d2000384";
public static final String UMENG_APP_KEY = "5e86d850978eea071c37bf48";//已更改
/**
* linkedMe key
@@ -149,7 +149,7 @@ public class XChatConstants {
/**
* 分享房间标题
*/
public static final String SHARE_ROOM_TITLE = "上轻寻，轻松寻觅对的TA";
public static final String SHARE_ROOM_TITLE = "上66陪玩，轻松寻觅对的TA";
/**
* 分享房间 URL
@@ -164,7 +164,7 @@ public class XChatConstants {
/**
* 分享家族标题
*/
public static final String SHARE_FAMILY_TITLE = "hi,我想邀请您加入我的轻寻家族:";
public static final String SHARE_FAMILY_TITLE = "hi,我想邀请您加入我的66陪玩家族:";
/**
* 分享家族 URL
@@ -179,7 +179,7 @@ public class XChatConstants {
/**
* 分享群组标题
*/
public static final String SHARE_TEAM_TITLE = "hi,我想邀请您加入我的轻寻群聊:";
public static final String SHARE_TEAM_TITLE = "hi,我想邀请您加入我的66陪玩群聊:";
/**
* 分享群组 URL

4
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java
View File

@@ -209,7 +209,7 @@ public class UriProvider {
}
/**
* 轻寻专属，实名认证页面
* 66陪玩专属，实名认证页面
*
* @return
*/
@@ -218,7 +218,7 @@ public class UriProvider {
}
/**
* 轻寻专属，101技能认证页面
* 66陪玩专属，101技能认证页面
*
* @return
*/

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/RoomTabInfo.java
View File

@@ -11,7 +11,7 @@ public class RoomTabInfo implements Serializable {
* uid : 2
* officeUser : 1
* roomId : 58892673
* title : 轻寻张展伟的房间
* title : 66陪玩张展伟的房间
* type : 5
* meetingName : edc36c59bc9b449bb5bb58ac17b9c0b4
* valid : true

4
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/Test.java
View File

@@ -5,7 +5,7 @@ import java.util.List;
public class Test {
/**
* data : [{"uid":2,"officeUser":1,"roomId":58892673,"title":"轻寻张展伟的房间","type":5,"meetingName":"edc36c59bc9b449bb5bb58ac17b9c0b4","valid":true,"operatorStatus":1,"avatar":"https://img.erbanyy.com/FikxU2u59uOjPVS1Sv_zfu4icqMS?imageslim","roomDesc":"","backPic":"","openTime":1545018501000,"onlineNum":1,"abChannelType":1,"roomPwd":"","roomTag":"聊天","calcSumDataIndex":0,"tagId":8,"tagPict":"https://img.erbanyy.com/new_tag_%E8%81%8A%E5%A4%A9@3x.png","badge":"","isPermitRoom":2,"isRecom":0,"count":0,"hasAnimationEffect":true,"audioQuality":1,"isCloseScreen":false,"hasDragonGame":true,"hasKTVPriv":true,"isOpenKTV":false,"isOpenGame":true,"roomModeType":0,"roomGame":{"roomId":58892673,"uid":2,"startUid":2,"gameId":"doushouqi1","gameName":"doushouqi1","status":5,"createTime":1548856711000,"updateTime":1548856711000},"isExceptionClose":false,"exceptionClose":false}]
* data : [{"uid":2,"officeUser":1,"roomId":58892673,"title":"66陪玩张展伟的房间","type":5,"meetingName":"edc36c59bc9b449bb5bb58ac17b9c0b4","valid":true,"operatorStatus":1,"avatar":"https://img.erbanyy.com/FikxU2u59uOjPVS1Sv_zfu4icqMS?imageslim","roomDesc":"","backPic":"","openTime":1545018501000,"onlineNum":1,"abChannelType":1,"roomPwd":"","roomTag":"聊天","calcSumDataIndex":0,"tagId":8,"tagPict":"https://img.erbanyy.com/new_tag_%E8%81%8A%E5%A4%A9@3x.png","badge":"","isPermitRoom":2,"isRecom":0,"count":0,"hasAnimationEffect":true,"audioQuality":1,"isCloseScreen":false,"hasDragonGame":true,"hasKTVPriv":true,"isOpenKTV":false,"isOpenGame":true,"roomModeType":0,"roomGame":{"roomId":58892673,"uid":2,"startUid":2,"gameId":"doushouqi1","gameName":"doushouqi1","status":5,"createTime":1548856711000,"updateTime":1548856711000},"isExceptionClose":false,"exceptionClose":false}]
* title : 墙裂推荐
* type : 1
* maxNum : 3
@@ -53,7 +53,7 @@ public class Test {
* uid : 2
* officeUser : 1
* roomId : 58892673
* title : 轻寻张展伟的房间
* title : 66陪玩张展伟的房间
* type : 5
* meetingName : edc36c59bc9b449bb5bb58ac17b9c0b4
* valid : true

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.java
View File

@@ -754,7 +754,7 @@ public class HomeModel extends BaseModel implements IHomeModel {
/**
* 新版首页获取导航栏列表和下拉选择列表
*
* @param type 1-导航栏 2-首页下方的banner 3 轻寻的banner
* @param type 1-导航栏 2-首页下方的banner 3 66陪玩的banner
* @return
*/
@GET("home/v5/getFirstPageBanner")

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/IHomeModel.java
View File

@@ -181,7 +181,7 @@ public interface IHomeModel extends IModel {
Single<ArrayList<BannerInfo>> getTabBanner(String tabId);
/**
* 轻寻顶部 banner信息
* 66陪玩顶部 banner信息
* 包含3部分，顶部banner，测一测那个列表，标签页
*/
Single<HomeBannerInfo> getQxBannerInfo();

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

@@ -585,7 +585,7 @@ public class AuthModel extends BaseModel implements IAuthModel {
}
/**
* 账号密码登录(耳伴老用户绑定 QQ 号登录轻寻)
* 账号密码登录(耳伴老用户绑定 QQ 号登录66陪玩)
*
* @param account
* @param password
@@ -1397,7 +1397,7 @@ public class AuthModel extends BaseModel implements IAuthModel {
@Query("shuMeiDeviceId") String shuMeiDeviceId);
/**
* 轻寻上耳伴老用户用 QQ 登录时，判断 QQ 的 open id 是否存在
* 66陪玩上耳伴老用户用 QQ 登录时，判断 QQ 的 open id 是否存在
*
* @return
*/

4
core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomSettingModel.java
View File

@@ -257,7 +257,7 @@ public class RoomSettingModel extends BaseMvpModel {
/**
* 更新房间设置信息
* 轻寻项目-打开关闭房间纯净模式-房主修改
* 66陪玩项目-打开关闭房间纯净模式-房主修改
*
* @param title
* @param desc
@@ -281,7 +281,7 @@ public class RoomSettingModel extends BaseMvpModel {
/**
* 更新房间设置信息
* 轻寻项目-打开关闭房间纯净模式
* 66陪玩项目-打开关闭房间纯净模式
*
* @param title
* @param desc

2
core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamMember.java
View File

@@ -10,7 +10,7 @@ import lombok.Data;
@Data
public class PKTeamMember {
private String uid;//用户uid
private String erbanNo;//轻寻号
private String erbanNo;//66陪玩号
private String nick;//昵称
private int gender;//性别
private String avatar;//头像

2
core/src/main/java/com/yizhuan/xchat_android_core/statistic/protocol/StatisticsProtocol.java
View File

@@ -182,7 +182,7 @@ public class StatisticsProtocol {
//模厅暗号
EVENT_HALL_ADDMEMBERS_USERID_CLICK("hall_addMembers_userid_click"),//添加成员-轻寻ID
EVENT_HALL_ADDMEMBERS_USERID_CLICK("hall_addMembers_userid_click"),//添加成员-66陪玩ID
EVENT_HALL_ADDMEMBERS_WX_CLICK("hall_addMembers_wx_click"),//添加成员-微信导入
EVENT_HALL_ADDMEMBERS_QQ_CLICK("hall_addMembers_qq_click"),//添加成员-QQ导入
EVENT_HALL_PASSWORD_SHARE_WX("hall_password_share_wx"),//分享暗号到微信

2
core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java
View File

@@ -882,7 +882,7 @@ public final class UserModel extends BaseModel implements IUserModel {
/**
*
* @param erbanNo 轻寻号或手机号码
* @param erbanNo 66陪玩号或手机号码
* @return -
*/
@GET("user/getSimpleUser")

2
core/src/main/java/com/yizhuan/xchat_android_core/user/bean/RecommendationUserInfo.java
View File

@@ -32,7 +32,7 @@ public class RecommendationUserInfo implements Serializable {
* recommendRoom : false
* liveTag : false
* status : 0
* description : 她在轻寻魅力四射...
* description : 她在66陪玩魅力四射...
*/
private int uid;

2
core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.java
View File

@@ -10,7 +10,7 @@ public class GrabApprenticesInfo {
private Long uid;
/**
* 轻寻号
* 66陪玩号
*/
private Long erbanNo;

2
core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.java
View File

@@ -14,7 +14,7 @@ public class SimpleUserVo implements Serializable {
*/
private Long uid;
/**
* 轻寻号
* 66陪玩号
*/
private Long erbanNo;
/**

2
core/src/model_pay/java/com/wudoo/qingxun/wxapi/WXPayEntryActivity.java → core/src/model_pay/java/com/xuanyi/accompany/wxapi/WXPayEntryActivity.java
View File

@@ -1,4 +1,4 @@
package com.wudoo.qingxun.wxapi;
package com.xuanyi.accompany.wxapi;
import android.app.Activity;
import android.content.Intent;