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

[Modify]谷歌下架原因排查

Browse Source
This commit is contained in:
wushaocheng
2023-03-09 16:10:26 +08:00
parent 941dc7b100
commit c2c3f29839
24 changed files with 21 additions and 1001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java
View File

@@ -40,7 +40,6 @@ import com.trello.rxlifecycle3.android.ActivityEvent;
import com.yizhuan.erban.R;
import com.yizhuan.erban.application.XChatApplication;
import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.erban.common.widget.dialog.BaseAlertDialogBuilder;
import com.yizhuan.erban.ui.im.RouterHandler;
import com.yizhuan.erban.ui.webview.event.ShowNavEvent;
import com.yizhuan.erban.ui.webview.event.TaroPayResultEvent;
@@ -185,6 +184,7 @@ public class CommonWebViewActivity extends BaseActivity implements ShareDialog.O
});
EventBus.getDefault().register(this);
}
@LayoutRes
protected int getLayoutId() {
return R.layout.activity_common_web_view;
@@ -236,60 +236,11 @@ public class CommonWebViewActivity extends BaseActivity implements ShareDialog.O
Logger.e("shouldOverrideUrlLoading--------" + url);
LogUtil.e("shouldOverrideUrlLoading" + url);
targetUrl = url;
//modules/noble/paySuccess.html
//modules/noble/order.html?nobleIndex=1 // 获取上下文, H5PayDemoActivity为当前页面
// ------ 对alipays:相关的scheme处理 -------
if (url.startsWith("alipays:") || url.startsWith("alipay")) {
try {
CommonWebViewActivity.this.startActivity(new Intent("android.intent.action.VIEW", Uri.parse(url)));
} catch (Exception e) {
new BaseAlertDialogBuilder(CommonWebViewActivity.this)
.setMessage(ResUtil.getString(R.string.ui_webview_commonwebviewactivity_01))
.setPositiveButton(ResUtil.getString(R.string.ui_webview_commonwebviewactivity_02), (dialog, which) -> {
Uri alipayUrl = Uri.parse("https://d.alipay.com");
CommonWebViewActivity.this.startActivity(new Intent("android.intent.action.VIEW", alipayUrl));
}).setNegativeButton(ResUtil.getString(R.string.ui_webview_commonwebviewactivity_03), null).show();
}
return true;
}
if (url.startsWith("weixin://wap/pay")) {
try {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(url));
startActivity(intent);
} catch (Exception e) {
toast(ResUtil.getString(R.string.ui_webview_commonwebviewactivity_04));
}
return true;
}
if (url.contains("tel:")) {
//删除直接拨打电话的功能
return true;
}
if (url.startsWith("pubgmhd1106467070://")) {
// 跳转和平精英
Intent in = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
if (in.resolveActivity(getPackageManager()) == null) {
toast(ResUtil.getString(R.string.ui_webview_commonwebviewactivity_05));
} else {
in.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
startActivity(in);
}
onGotoAppFinish(view);
return true;
}
if (url.startsWith("mqqopensdkapi://")) {
try {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(url));
startActivity(intent);
} catch (Exception e) {
toast(ResUtil.getString(R.string.ui_webview_commonwebviewactivity_06));
}
onGotoAppFinish(view);
return true;
}
// ------- 处理结束 -------
if (!(url.startsWith("http") || url.startsWith("https"))) {

BIN
app/src/main/res/drawable-xhdpi/dialog_charge_ic_alipay.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.3 KiB

BIN
app/src/main/res/drawable-xhdpi/dialog_charge_ic_wechat.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.1 KiB

2
app/src/main/res/layout/activity_feedback.xml
View File

@@ -66,6 +66,6 @@
android:layout_marginTop="45dp"
android:background="@drawable/selector_common_confirm"
android:text="@string/layout_activity_feedback_04"
android:textColor="@color/text_title_color"
android:textColor="@color/text_button_color_first"
android:textSize="15sp" />
</LinearLayout>

239
app/src/main/res/layout/dialog_charge.xml
View File

@@ -1,239 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="505dp"
android:layout_gravity="bottom"
android:background="@drawable/shape_f4f4fa_top_8dp"
android:orientation="vertical">
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_marginTop="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/ll_gold"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/title_bar"
android:layout_marginTop="15dp"
android:baselineAligned="true"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_title_diamond"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:drawablePadding="@dimen/dp_4"
android:text="@string/layout_dialog_charge_01"
android:textColor="@color/color_333333"
android:textSize="@dimen/dp_14" />
<TextView
android:id="@+id/tv_gold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:includeFontPadding="false"
android:textColor="@color/color_333333"
android:textSize="@dimen/dp_15"
android:textStyle="bold"
tools:text="50" />
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="15dp"
android:text="@string/layout_dialog_charge_02"
android:textColor="#ff666666"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/ll_gold"
android:layout_marginTop="15dp"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="186dp"
tools:itemCount="3"
tools:listitem="@layout/list_item_charge"
android:paddingStart="@dimen/dp_11"
android:paddingEnd="@dimen/dp_11"
android:visibility="visible" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_15"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/layout_dialog_charge_03"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/dp_13" />
<LinearLayout
android:id="@+id/ll_charge_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/ll_type_first"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
android:background="@drawable/selector_dialog_charge"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_type_first"
android:layout_width="28dp"
android:layout_height="28dp"
android:clickable="false"
tools:src="@drawable/dialog_charge_ic_wechat" />
<TextView
android:id="@+id/tv_type_first"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:clickable="false"
android:textColor="@color/text_title_color"
android:textSize="@dimen/dp_15"
tools:text="@string/layout_dialog_charge_04" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_type_second"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
android:layout_marginStart="13dp"
android:background="@drawable/selector_dialog_charge"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_type_second"
android:layout_width="28dp"
android:layout_height="28dp"
android:clickable="false"
tools:src="@drawable/dialog_charge_ic_alipay" />
<TextView
android:id="@+id/tv_type_second"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:clickable="false"
android:textColor="@color/text_title_color"
android:textSize="@dimen/dp_15"
tools:text="@string/layout_dialog_charge_05" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_more"
android:layout_width="0dp"
android:layout_marginStart="13dp"
android:layout_height="48dp"
android:layout_weight="1"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="gone">
<com.yizhuan.xchat_android_library.widget.DrawableCenterTextView
android:id="@+id/tv_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
android:drawableEnd="@drawable/arrow_right"
android:drawablePadding="4dp"
android:gravity="center"
android:text="@string/layout_dialog_charge_06"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/dp_13" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/tv_charge"
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginStart="60dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="@dimen/dp_60"
android:background="@drawable/bg_common_confirm_30"
android:gravity="center"
android:text="@string/layout_dialog_charge_07"
android:textColor="@color/white"
android:textSize="@dimen/dp_15"
app:layout_constraintBottom_toBottomOf="parent" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginBottom="@dimen/dp_20"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/charge_agreement"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/sp_12" />
<TextView
android:id="@+id/tv_agreement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/agreement"
android:textColor="@color/app_248cfe"
android:textSize="@dimen/sp_12" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>

2
app/src/module_community/res/values/strings.xml
View File

@@ -6,7 +6,7 @@
<string name="dy_pub_comment">發表評論</string>
<string name="expand">展開</string>
<string name="collapse">收起</string>
<string name="dy_publish_user_tips">禁止出現商業廣告、微信號碼、QQ號碼、電話號碼, 以及低俗、色情、恐怖、暴力和具有侮辱性語言等內容，違規者封號處理 ！</string>
<string name="dy_publish_user_tips">禁止出現商業廣告、電話號碼, 以及低俗、色情、恐怖、暴力和具有侮辱性語言等內容，違規者封號處理 ！</string>
<string name="dy_world_dynamic_list_empty_tips">這個話題的歷史由你撰寫~</string>
<string name="dy_reply_someone">回復&#160;%s</string>
<string name="dy_empty_comment_tips">快來搶占沙發吧~</string>

204
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/PwdCodeMgr.java
View File

@@ -1,34 +1,10 @@
package com.yizhuan.erban.module_hall.secretcode;
import android.annotation.SuppressLint;
import android.content.Context;
import android.text.TextUtils;
import android.text.style.ForegroundColorSpan;
import com.google.gson.Gson;
import com.orhanobut.logger.Logger;
import com.yizhuan.erban.R;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.friend.action.AbstractSelectFriendAction;
import com.yizhuan.erban.module_hall.hall.activity.HallSearchActivity;
import com.yizhuan.erban.module_hall.hall.activity.ModuleHallActivity;
import com.yizhuan.erban.utils.SpannableBuilder;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.module_hall.hall.HallModel;
import com.yizhuan.xchat_android_core.module_hall.secretcode.SecretCodeModel;
import com.yizhuan.xchat_android_core.module_hall.secretcode.bean.CheckCodeResult;
import com.yizhuan.xchat_android_core.module_hall.secretcode.bean.SecretCodeInfo;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.utils.ActivityUtil;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import io.reactivex.Single;
/**
* emoji 暗号的一个缓存处理，24小时刷新
@@ -76,184 +52,4 @@ public class PwdCodeMgr {
}
}
public Single<SecretCodeInfo> getPwdCode() {
//判断缓存是否有效
getCodeFromCache();
if (isvalidCode(mCodeInfo)) {
return Single.just(mCodeInfo);
}
//清除缓存
mCodeInfo = null;
SharedPreferenceUtils.put(KEY_EMOJI_CODE_JSON, "");
//从接口获取
return SecretCodeModel.get().getSecretCodeInfo()
.doOnSuccess(info -> {
info.setUid(AuthModel.get().getCurrentUid());
info.setSaveTime(System.currentTimeMillis());
//更新缓存
mCodeInfo = info;
SharedPreferenceUtils.put(KEY_EMOJI_CODE_JSON, new Gson().toJson(info));
});
}
private boolean isvalidCode(SecretCodeInfo cache) {
if ((cache != null && cache.getUid() == AuthModel.get().getCurrentUid())) {
//判断缓存是否有效
long currentTime = System.currentTimeMillis();
long lastCacheTime = cache.getSaveTime();
//如果距离接口有效期超过1小时，则此缓存有效
if (cache.getExpireDate() - currentTime > 60 * 60 * 1000 &&
//不能超过24小时
currentTime - lastCacheTime < 24 * 60 * 60 * 1000) {
return true;
}
}
return false;
}
private void showPwdCodeDialog(CheckCodeResult checkCodeResult, final Context context) {
//由接口控制，是否需要弹框
if (!checkCodeResult.isShowDialog()) {
Logger.i(ResUtil.getString(R.string.module_hall_secretcode_pwdcodemgr_01));
return;
}
String emojiCode = checkCodeResult.getEmojiCode();
SpannableBuilder builder = new SpannableBuilder();
String nick = checkCodeResult.getNick();
if (nick == null) {
nick = "TA";
}
String hallName = checkCodeResult.getHallName();
if (hallName == null) {
hallName = ResUtil.getString(R.string.module_hall_secretcode_pwdcodemgr_02);
}
boolean isVailidEmojiCode = !TextUtils.isEmpty(emojiCode);
int appColor = context.getResources().getColor(R.color.appColor);
if (checkCodeResult.getType() == CheckCodeResult.TYPE_PWD_CODE_NO_EXIST) {
builder.append(ResUtil.getString(R.string.module_hall_secretcode_pwdcodemgr_03));
} else if (checkCodeResult.getType() == CheckCodeResult.TYPE_PWD_CODE_HALL) {
if (isVailidEmojiCode) {
checkCodeResult.setMsg(ResUtil.getString(R.string.module_hall_secretcode_pwdcodemgr_04));
}
if (checkCodeResult.getCode() != CheckCodeResult.CODE_OUT_OF_DATA_OR_NOEXIST) {
builder.append(nick, new ForegroundColorSpan(appColor))
.append(ResUtil.getString(R.string.module_hall_secretcode_pwdcodemgr_05))
.append("“" + hallName + "”", new ForegroundColorSpan(appColor))
.append("\n");
}
builder.append(checkCodeResult.getMsg());
} else {
builder.append(ResUtil.getString(R.string.module_hall_secretcode_pwdcodemgr_06));
}
if (checkCodeResult.getType() == CheckCodeResult.TYPE_PWD_CODE_HALL && isVailidEmojiCode) {
//校验成功，提示用户加入厅
new DialogManager(context).showOkCancelWithTitleDialog(builder.build(), ResUtil.getString(R.string.module_hall_secretcode_pwdcodemgr_07), false,
new DialogManager.OkCancelDialogListener() {
@Override
public void onCancel() {
}
@Override
public void onOk() {
StatisticManager.Instance().onEvent(
StatisticsProtocol.EVENT_JION_HALL_PASSWORD_EVENT, ResUtil.getString(R.string.module_hall_secretcode_pwdcodemgr_08));
SecretCodeModel.get().joinByCode(checkCodeResult.getEmojiCode())
.subscribe(new BeanObserver<String>() {
@Override
public void onErrorMsg(String error) {
SingleToastUtil.showToast(error);
}
@Override
public void onSuccess(String s) {
SingleToastUtil.showToast(s);
//加入厅成功，打开我模厅主页
gotoHallPage(context);
}
});
}
});
} else {
new DialogManager(context).showOkWithTitleDialog(builder.build());
}
}
/**跳转我的模厅主页*/
@SuppressLint("CheckResult")
private void gotoHallPage(Context context) {
UserModel.get().updateCurrentUserInfo().subscribe((info, throwable) -> {
if (throwable == null) {
if (!ActivityUtil.isValidContext(context)) {
return;
}
ModuleHallActivity.start(context);
} else {
throwable.printStackTrace();
}
});
}
/**
* 判断是不是自己复制的口令
*/
public boolean isMyselfCode(String copyText) {
return mCodeInfo != null && copyText != null && mCodeInfo.getShareContent() != null &&
mCodeInfo.getShareContent().contains(copyText);
}
public static void showShareCodeDialog(Context context) {
final ShareSecretCodeDialog dialog = new ShareSecretCodeDialog(context);
dialog.setOnClickOperationItem(new ShareSecretCodeDialog.OnClickOperationItem() {
@Override
public void onClickTutu() {
StatisticManager.Instance().onEvent(
StatisticsProtocol.EVENT_HALL_ADDMEMBERS_USERID_CLICK, ResUtil.getString(R.string.module_hall_secretcode_pwdcodemgr_09));
dialog.dismiss();
HallSearchActivity.start(context, HallModel.get().getHallId(), AbstractSelectFriendAction.TYPE_MODULE_HALL);
}
@Override
public void onClickWeixin() {
StatisticManager.Instance().onEvent(
StatisticsProtocol.EVENT_HALL_ADDMEMBERS_WX_CLICK, ResUtil.getString(R.string.module_hall_secretcode_pwdcodemgr_010));
handleWeixinOrQQ(context, dialog, SecretCodeDialog.TYPE_SHARE_CODE_TO_WEIXIN);
}
@Override
public void onClickQQ() {
StatisticManager.Instance().onEvent(
StatisticsProtocol.EVENT_HALL_ADDMEMBERS_QQ_CLICK, ResUtil.getString(R.string.module_hall_secretcode_pwdcodemgr_011));
handleWeixinOrQQ(context, dialog, SecretCodeDialog.TYPE_SHARE_CODE_TO_QQ);
}
});
dialog.show();
}
/**
* 获取口令信息
*
* @param type 1 微信，2 QQ
*/
private static void handleWeixinOrQQ(Context context, ShareSecretCodeDialog dialog, int type) {
PwdCodeMgr.get().getPwdCode()
.compose(RxHelper.bindContext(context))
.subscribe(new BeanObserver<SecretCodeInfo>() {
@Override
public void onErrorMsg(String error) {
SingleToastUtil.showToast(error);
}
@Override
public void onSuccess(SecretCodeInfo info) {
dialog.dismiss();
SecretCodeDialog dialog = new SecretCodeDialog(
context,
info,
type);
dialog.show();
}
});
}
}

101
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/SecretCodeDialog.java
View File

@@ -1,101 +0,0 @@
package com.yizhuan.erban.module_hall.secretcode;
import android.content.Context;
import android.graphics.Color;
import android.view.View;
import android.widget.TextView;
import com.coorchice.library.SuperTextView;
import com.yizhuan.erban.R;
import com.yizhuan.erban.UIHelper;
import com.yizhuan.erban.base.BaseBsDialog;
import com.yizhuan.xchat_android_core.module_hall.secretcode.bean.SecretCodeInfo;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.utils.TextUtils;
import com.yizhuan.xchat_android_library.utils.ResUtil;
/**
* @author xiaoyu
* @date 2017/12/13
*/
public class SecretCodeDialog extends BaseBsDialog implements View.OnClickListener {
public final static int TYPE_SHARE_CODE_TO_WEIXIN = 1;
public final static int TYPE_SHARE_CODE_TO_QQ = 2;
private TextView tvEmoji;
private TextView tvValidTime;
private TextView tvShareIconText;
private View v_click_to_share;
private SuperTextView tv_cancel;
private SecretCodeInfo secretCodeInfo;
private int type = TYPE_SHARE_CODE_TO_WEIXIN;
public SecretCodeDialog(Context context, SecretCodeInfo info, int type) {
super(context);
this.secretCodeInfo = info;
this.type = type;
}
@Override
protected int getDialogLayout() {
return R.layout.dialog_secret_code;
}
@Override
protected void init() {
tvEmoji = findViewById(R.id.tv_emoji);
tvValidTime = findViewById(R.id.tv_valid_time);
tvShareIconText = findViewById(R.id.tv_share_icon_text);
v_click_to_share = findViewById(R.id.v_click_to_share);
tv_cancel = findViewById(R.id.tv_cancel);
v_click_to_share.setOnClickListener(this);
tv_cancel.setOnClickListener(this);
if (secretCodeInfo == null) {
return;
}
tvEmoji.setText(secretCodeInfo.getEmojiCode());
if (type == TYPE_SHARE_CODE_TO_WEIXIN) {
tvShareIconText.setText(ResUtil.getString(R.string.module_hall_secretcode_secretcodedialog_01));
tvShareIconText.setTextColor(Color.parseColor("#3ED172"));
tvShareIconText.setCompoundDrawablesWithIntrinsicBounds(
R.drawable.lu_ic_little_weixin, 0, 0, 0);
} else if (type == TYPE_SHARE_CODE_TO_QQ) {
tvShareIconText.setText(ResUtil.getString(R.string.module_hall_secretcode_secretcodedialog_02));
tvShareIconText.setTextColor(Color.parseColor("#13B7F5"));
tvShareIconText.setCompoundDrawablesWithIntrinsicBounds(
R.drawable.lu_ic_little_qq, 0, 0, 0);
}
tvValidTime.setText(secretCodeInfo.getExpireDateStr() + ResUtil.getString(R.string.module_hall_secretcode_secretcodedialog_03));
}
@Override
public void onClick(View view) {
switch (view.getId()) {
case R.id.v_click_to_share:
TextUtils.copyTextToClipboard(context, secretCodeInfo.getShareContent());
if (type == TYPE_SHARE_CODE_TO_WEIXIN) {
StatisticManager.Instance().onEvent(
StatisticsProtocol.EVENT_HALL_PASSWORD_SHARE_WX, ResUtil.getString(R.string.module_hall_secretcode_secretcodedialog_04));
UIHelper.startWeixinApp(context);
} else if (type == TYPE_SHARE_CODE_TO_QQ) {
StatisticManager.Instance().onEvent(
StatisticsProtocol.EVENT_HALL_PASSWORD_SHARE_QQ, ResUtil.getString(R.string.module_hall_secretcode_secretcodedialog_05));
UIHelper.startQQApp(context);
}
dismiss();
break;
case R.id.tv_cancel:
dismiss();
break;
}
}
}

95
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/ShareSecretCodeDialog.java
View File

@@ -1,95 +0,0 @@
package com.yizhuan.erban.module_hall.secretcode;
import android.content.Context;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.NonNull;
import com.coorchice.library.SuperTextView;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseBsDialog;
import com.yizhuan.xchat_android_library.utils.StringUtils;
/**
* @author xiaoyu
* @date 2017/12/13
*/
public class ShareSecretCodeDialog extends BaseBsDialog implements View.OnClickListener {
private TextView tvTitle;
private TextView tv_erban;
private TextView tv_weixin;
private TextView tv_qq;
private SuperTextView tv_cancel;
public ShareSecretCodeDialog(@NonNull Context context) {
super(context);
}
@Override
protected int getDialogLayout() {
return R.layout.dialog_share_secret_code;
}
@Override
protected void init() {
tvTitle = findViewById(R.id.tv_title);
tv_erban = findViewById(R.id.tv_erban);
tv_weixin = findViewById(R.id.tv_weixin);
tv_qq = findViewById(R.id.tv_qq);
tv_cancel = findViewById(R.id.tv_cancel);
tv_erban.setOnClickListener(this);
tv_weixin.setOnClickListener(this);
tv_qq.setOnClickListener(this);
tv_cancel.setOnClickListener(this);
}
public void setName(String name) {
if (!StringUtils.isEmpty(name)) {
tvTitle.setText(name);
}
}
@Override
public void onClick(View view) {
switch (view.getId()) {
case R.id.tv_erban:
if (onClickOperationItem != null) {
onClickOperationItem.onClickTutu();
}
break;
case R.id.tv_weixin:
if (onClickOperationItem != null) {
onClickOperationItem.onClickWeixin();
}
break;
case R.id.tv_qq:
if (onClickOperationItem != null) {
onClickOperationItem.onClickQQ();
}
break;
case R.id.tv_cancel:
dismiss();
break;
}
}
public interface OnClickOperationItem {
void onClickTutu();
void onClickWeixin();
void onClickQQ();
}
private OnClickOperationItem onClickOperationItem;
public void setOnClickOperationItem(OnClickOperationItem onClickOperationItem) {
this.onClickOperationItem = onClickOperationItem;
}
}

BIN
app/src/module_labour_union/res/drawable-xhdpi/lu_ic_little_weixin.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 962 B

BIN
app/src/module_labour_union/res/drawable-xhdpi/lu_ic_share_qq.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
app/src/module_labour_union/res/drawable-xhdpi/lu_ic_share_tutu.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/src/module_labour_union/res/drawable-xhdpi/lu_ic_share_weixin.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

104
app/src/module_labour_union/res/layout/dialog_secret_code.xml
View File

@@ -1,104 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:paddingBottom="@dimen/dp_15"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:background="@color/transparent"
tools:background="@color/black_transparent_10"
android:orientation="vertical">
<com.yizhuan.xchat_android_library.widget.ShapeConstrainLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:scl_radius="@dimen/dp_14"
app:scl_solid="@color/white"
tools:layout_height="299dp"
android:layout_marginBottom="@dimen/dp_15">
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_30"
android:gravity="center"
android:text="@string/layout_dialog_secret_code_01"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/tv_emoji"
app:layout_constraintTop_toBottomOf="@id/tv_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:text="@string/layout_dialog_secret_code_02"
android:layout_marginTop="@dimen/dp_33"
android:textColor="@color/color_333333"
android:textStyle="bold"
android:textSize="@dimen/sp_20"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_valid_time"
app:layout_constraintTop_toBottomOf="@id/tv_emoji"
android:layout_marginTop="@dimen/dp_40"
android:text="@string/layout_dialog_secret_code_03"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:textColor="@color/color_999999"
android:textSize="@dimen/sp_12"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<View
android:id="@+id/view_line"
android:layout_marginTop="@dimen/dp_20"
app:layout_constraintTop_toBottomOf="@id/tv_valid_time"
android:background="@color/line_color"
android:layout_width="match_parent"
android:layout_height="1px" />
<View
android:id="@+id/v_click_to_share"
app:layout_constraintTop_toBottomOf="@id/view_line"
android:layout_width="match_parent"
android:layout_height="50dp" />
<TextView
android:id="@+id/tv_share_icon_text"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:drawableStart="@drawable/lu_ic_little_weixin"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="@string/layout_dialog_secret_code_04"
android:textColor="#3ED172"
android:textSize="@dimen/sp_16"
app:layout_constraintTop_toTopOf="@id/v_click_to_share"
android:layout_width="wrap_content"
android:layout_height="50dp" />
</com.yizhuan.xchat_android_library.widget.ShapeConstrainLayout>
<com.coorchice.library.SuperTextView
android:id="@+id/tv_cancel"
app:corner="@dimen/dp_14"
app:solid="@color/white"
android:layout_width="match_parent"
android:layout_height="51dp"
android:layout_gravity="center"
android:gravity="center"
android:text="@string/cancel"
android:textColor="@color/color_4D4D4D"
android:textSize="@dimen/sp_16"
tools:ignore="SpUsage" />
</LinearLayout>

100
app/src/module_labour_union/res/layout/dialog_share_secret_code.xml
View File

@@ -1,100 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:paddingBottom="@dimen/dp_15"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:background="@color/transparent"
tools:background="@color/black_transparent_10"
android:orientation="vertical">
<com.yizhuan.xchat_android_library.widget.ShapeConstrainLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:scl_radius="@dimen/dp_14"
app:scl_solid="@color/white"
tools:layout_height="160dp"
android:layout_marginBottom="@dimen/dp_15"
>
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:text="@string/layout_dialog_share_secret_code_01"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/tv_erban"
app:layout_constraintTop_toBottomOf="@id/tv_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_weixin"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_17"
android:layout_marginBottom="19dp"
android:layout_weight="1"
android:drawableTop="@drawable/lu_ic_share_tutu"
android:drawablePadding="9dp"
android:gravity="center"
android:text="@string/layout_dialog_share_secret_code_02"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_12" />
<TextView
android:id="@+id/tv_weixin"
app:layout_constraintStart_toEndOf="@+id/tv_erban"
app:layout_constraintEnd_toStartOf="@+id/tv_qq"
app:layout_constraintTop_toTopOf="@id/tv_erban"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="19dp"
android:layout_weight="1"
android:drawableTop="@drawable/lu_ic_share_weixin"
android:drawablePadding="9dp"
android:gravity="center"
android:text="@string/layout_dialog_share_secret_code_03"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_12" />
<TextView
android:id="@+id/tv_qq"
app:layout_constraintStart_toEndOf="@id/tv_weixin"
app:layout_constraintTop_toTopOf="@id/tv_erban"
app:layout_constraintEnd_toEndOf="parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="19dp"
android:layout_weight="1"
android:drawableTop="@drawable/lu_ic_share_qq"
android:drawablePadding="9dp"
android:gravity="center"
android:text="@string/layout_dialog_share_secret_code_04"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_12" />
<View
app:layout_constraintTop_toBottomOf="@id/tv_erban"
android:layout_width="match_parent"
android:layout_height="36dp" />
</com.yizhuan.xchat_android_library.widget.ShapeConstrainLayout>
<com.coorchice.library.SuperTextView
android:id="@+id/tv_cancel"
app:corner="@dimen/dp_14"
app:solid="@color/white"
android:layout_width="match_parent"
android:layout_height="51dp"
android:layout_gravity="center"
android:gravity="center"
android:text="@string/cancel"
android:textColor="@color/color_4D4D4D"
android:textSize="@dimen/sp_16"
tools:ignore="SpUsage" />
</LinearLayout>

9
core/src/main/java/com/yizhuan/xchat_android_core/Constants.java
View File

@@ -59,18 +59,9 @@ public class Constants {
public static final String KEY_POSITION = "position";
public static final String CHARGE_WX = "wx";
public static final String CHARGE_ALIPAY = "alipay_v2";
public static final String CHARGE_UNION_PAY = "fastpay";
public static final String CHARGE_WX_MP = "wx_mp";
public static final String QUESTION_MARK = "?";
public static final int PAGE_TYPE_AV_ROOM_ACTIVITY = 100;
public static final int PAGE_TYPE_USER_INFO_ACTIVITY = 101;
public static final int PAGE_TYPE_MAIN_FRAGMENT = 102;
public static final String KEY_ROOM_IS_SHOW_ONLINE = "is_show_online";
public static final String KEY_ROOM_INFO = "key_room_info";
/**
* 房间相关Key设置

8
core/src/main/java/com/yizhuan/xchat_android_core/pay/IPayModel.java
View File

@@ -10,8 +10,6 @@ import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods;
import com.yizhuan.xchat_android_core.pay.bean.NewUserChargeInfo;
import com.yizhuan.xchat_android_core.pay.bean.PayRecordId;
import com.yizhuan.xchat_android_core.pay.bean.WalletInfo;
import com.yizhuan.xchat_android_core.pay.bean.WxPayType;
import java.util.List;
import io.reactivex.Single;
@@ -38,8 +36,8 @@ public interface IPayModel extends IModel {
Single<WalletInfo> getWalletInfo();
/*
获取充值产品列表
1,支付宝
2，微信公众号充值
1,facebook
2，line公众号充值
3，苹果充值
*/
@@ -93,8 +91,6 @@ public interface IPayModel extends IModel {
Single<String> getSmsBindAli();
Single<WxPayType> getWxpayType();
/**
* 是否首次充值
*/

18
core/src/main/java/com/yizhuan/xchat_android_core/pay/PayModel.java
View File

@@ -6,8 +6,8 @@ import android.content.Context;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.JsonObject;
import com.yizhuan.xchat_android_core.R;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.R;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.base.BaseModel;
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
@@ -19,7 +19,6 @@ import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods;
import com.yizhuan.xchat_android_core.pay.bean.NewUserChargeInfo;
import com.yizhuan.xchat_android_core.pay.bean.PayRecordId;
import com.yizhuan.xchat_android_core.pay.bean.WalletInfo;
import com.yizhuan.xchat_android_core.pay.bean.WxPayType;
import com.yizhuan.xchat_android_core.pay.event.ChargeCustomNotificationEvent;
import com.yizhuan.xchat_android_core.pay.event.FirstRechargeEvent;
import com.yizhuan.xchat_android_core.pay.event.GetWalletInfoEvent;
@@ -373,13 +372,6 @@ public class PayModel extends BaseModel implements IPayModel {
});
}
@Override
public Single<WxPayType> getWxpayType() {
return api.getWxpayType()
.compose(RxHelper.handleBeanData())
.compose(RxHelper.handleSchedulers());
}
/**
* 主要是为了兼容旧版的walletInfo
*
@@ -615,14 +607,6 @@ public class PayModel extends BaseModel implements IPayModel {
@GET("/chargeRecord/isFirstCharge")
Single<ServiceResult<Boolean>> apiIsFirstCharge();
/**
* 获取微信支付方式
*
* @return
*/
@GET("/charge/wxpay/type")
Single<ServiceResult<WxPayType>> getWxpayType();
/**
* 钻石转赠
*

2
core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java
View File

@@ -11,7 +11,7 @@ import java.io.Serializable;
public class ChargeBean implements Serializable{
/*
channelType:1支付宝微信公众号充值3苹果充值
channelType:1google2公众号充值3苹果充值
"chargeProdId": 1, //充值产品ID
"prodName": ResUtil.getString(R.string.pay_bean_chargebean_01), //产品显示名称
"money": 6, //产品价格（单位：元）

2
core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/WalletInfo.java
View File

@@ -36,7 +36,7 @@ public class WalletInfo implements Parcelable {
/** 可转赠的钻石 */
private double canGiveGoldNum;
/** 1：默认支付宝，2：默认微信 */
/** 1：默认line，2：默认facebook */
private int defaultPay;
public WalletInfo() {

33
core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/WxPayType.java
View File

@@ -1,33 +0,0 @@
package com.yizhuan.xchat_android_core.pay.bean;
public class WxPayType {
private String wxPayType;
//微信小程序对应的appId
private String wxminiAppid;
//微信小程序原始id
private String wxminiId;
public String getWxPayType() {
return wxPayType;
}
public void setWxPayType(String wxPayType) {
this.wxPayType = wxPayType;
}
public String getWxminiAppid() {
return wxminiAppid;
}
public void setWxminiAppid(String wxminiAppid) {
this.wxminiAppid = wxminiAppid;
}
public String getWxminiId() {
return wxminiId;
}
public void setWxminiId(String wxminiId) {
this.wxminiId = wxminiId;
}
}

24
core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java
View File

@@ -263,14 +263,14 @@ public class ShareModel extends BaseModel implements IShareModel {
sp.setText(XChatConstants.SHARE_FAMILY_TEXT);
sp.setTitle(XChatConstants.SHARE_FAMILY_TITLE + "“" + title + "”");
sp.setImageUrl(familyIcon);
//QQ空间分享
sp.setSite(XChatConstants.SHARE_FAMILY_TEXT);
final String siteUrl = shareLink + "?shareUid=" + String.valueOf(AuthModel.get().getCurrentUid())
+ "&familyId=" + familyId;
sp.setSiteUrl(siteUrl);
//QQ分享
sp.setTitleUrl(siteUrl);
//微信朋友圈分享
sp.setUrl(siteUrl);
sp.setShareType(Platform.SHARE_WEBPAGE);
@@ -313,9 +313,9 @@ public class ShareModel extends BaseModel implements IShareModel {
final String siteUrl = shareLink + "?shareUid=" + String.valueOf(AuthModel.get().getCurrentUid())
+ "&familyId=" + familyId;
sp.setSiteUrl(siteUrl);
//QQ分享
sp.setTitleUrl(siteUrl);
//微信朋友圈分享
sp.setUrl(siteUrl);
sp.setShareType(Platform.SHARE_WEBPAGE);
@@ -409,15 +409,7 @@ public class ShareModel extends BaseModel implements IShareModel {
//无UI API
final String shareLink = UriProvider.IM_SERVER_URL + XChatConstants.SHARE_TEAM_URL;
Platform.ShareParams sp = new Platform.ShareParams();
// sp.setText(XChatConstants.SHARE_TEAM_TEXT);
// sp.setTitle(XChatConstants.SHARE_TEAM_TITLE);
sp.setImageUrl(url);
//QQ空间分享
// sp.setSiteUrl(shareLink);
//QQ分享
// sp.setTitleUrl(shareLink);
//微信朋友圈分享
// sp.setUrl(shareLink);
sp.setSite(XChatConstants.SHARE_TEAM_TEXT);
@@ -477,12 +469,12 @@ public class ShareModel extends BaseModel implements IShareModel {
sp.setText(info.getContent());
sp.setImageUrl(info.getImageUrl());
String siteUrl = info.getSiteUrl();
//QQ空间分享
sp.setSite(info.getTitle());
sp.setSiteUrl(siteUrl);
//QQ分享
sp.setTitleUrl(siteUrl);
//微信朋友圈分享
sp.setUrl(siteUrl);
sp.setShareType(Platform.SHARE_WEBPAGE);
platform.setPlatformActionListener(new PlatformActionListener() {

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

@@ -16,19 +16,11 @@ public interface StatisticsProtocol {
String EVENT_RECONNECTION_ROOM_CHAT = "String EVENT_reconnection_room_chat";//断网重连聊天室
String USER_KICKED_EVENT = "user_kicked_String EVENT";//用户被踢
String EVENT_LOGIN_QQ_CLICK = "login_qq_click";//点击qq登录
String EVENT_LOGIN_WX_CLICK = "login_wx_click";//点击微信登录
String EVENT_LOGIN_PHONE_CLICK = "login_phone_click";//点击手机号登录
String EVENT_LOGIN_PHONE_REGISTER_CLICK = "login_phone register_click";//手机立即注册按钮
String EVENT_LOGIN_REGISTRATION_FAILED_CLICK = "login_registration_failed";//注册失败
String EVENT_LOGIN_FAILED_CLICK = "login_failed";//登录失败
String EVENT_LOGIN_REPARI_SUCCESS_CLICK = "login_repari_success_click";//用户完善资料
String EVENT_EXCHANGE_CLICK = "exchange_click";// 我的礼物/我的钻石 兑换钻石
String EVENT_ACCOUNT_WITHDRAW_CLICK = "account_withdraw_click";// 提现按钮
String EVENT_RECHARGE_CLICK = "recharge_click";// 钻石充值
String EVENT_ROOM_INPUT_BOX_CLICK = "room_input_box_click";// 底部文字输入框点击
String EVENT_ROOM_SWITCH_KTV_CLICK = "room_switch_ktv_click";// 切换KTV模式
String EVENT_ROOM_OPEN_PLATOON_CLICK = "room_open_platoon_click";// 开启排麦模式
@@ -177,16 +169,6 @@ public interface StatisticsProtocol {
String MENTOR_PUSH_JUMP = "mentor_push_jump";//抢徒弟全局推送-点击跳转
String GLOBAL_PUSH_JUMP = "global_push_jump";//抢徒弟全局推送-点击跳转
//模厅暗号
String EVENT_HALL_ADDMEMBERS_USERID_CLICK = "hall_addMembers_userid_click";//添加成员-PekoID
String EVENT_HALL_ADDMEMBERS_WX_CLICK = "hall_addMembers_wx_click";//添加成员-微信导入
String EVENT_HALL_ADDMEMBERS_QQ_CLICK = "hall_addMembers_qq_click";//添加成员-QQ导入
String EVENT_HALL_PASSWORD_SHARE_WX = "hall_password_share_wx";//分享暗号到微信
String EVENT_HALL_PASSWORD_SHARE_QQ = "hall_password_share_qq";//分享暗号到QQ
String EVENT_JION_HALL_PASSWORD_EVENT = "jion_hall_password_String EVENT";//通过暗号加入厅
String EVENT_ROOM_MY_HALL_CLICK = "room_my_hall_click"; // 厅管理入口
String EVENT_ROOM_RECOMMEND_CLICK = "room_recommend_click"; // 我要上推荐

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

@@ -168,7 +168,7 @@ public class UserInfo implements Serializable {
private boolean isBindPasswd;
//是否设置支付密码
private boolean isBindPaymentPwd;
//1微信2qq3手机
//1line2facebook3手机
private int bindType;
/**
* 模厅ID