diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3d467f4..3307854 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -111,12 +111,16 @@ dependencies { // implementation("com.aliyun.dpa:oss-android-sdk:2.9.19") // implementation ("com.hihonor.mcs:ads-identifier:1.0.3.301") implementation("com.github.gzu-liyujiang:Android_CN_OAID:4.2.8") { - exclude("com.huawei.mcs", "ads-identifier") + exclude("com.hihonor.mcs", "ads-identifier") exclude("com.huawei.hms", "ads-identifier") } //stripe 支付 implementation("com.stripe:stripe-android:21.4.2")// 使用最新版本 implementation("com.github.getActivity:XXPermissions:20.0") + // 华为的最新版本广告标识服务SDK,参阅 https://developer.huawei.com/consumer/cn/doc/HMSCore-Guides/identifier-service-version-change-history-0000001050066927 + api ("com.huawei.hms:ads-identifier:3.4.62.300") + // 荣耀的最新版本广告标识服务SDK,参阅 https://developer.hihonor.com/cn/kitdoc?kitId=11030&navigation=guides&docId=intergrate.md + api ("com.hihonor.mcs:ads-identifier:1.0.2.301") } tasks.getByName("clean", type = Delete::class) { diff --git a/app/src/main/java/com/yingmao/clash/act/ActivityActivity.kt b/app/src/main/java/com/yingmao/clash/act/ActivityActivity.kt index 502b44f..a742333 100644 --- a/app/src/main/java/com/yingmao/clash/act/ActivityActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/ActivityActivity.kt @@ -138,6 +138,11 @@ class ActivityActivity : BaseActivity() { override fun onFinishClickListener(bean: Activity_?) { } + override fun onGORechargeClickListener() { + val intent = Intent(CommonUtils.getApp(), MemberRechargeActivity::class.java) + startActivity(intent) + activityDialog.dismiss() + } override fun onBingClickListener() { showBingDialogChoose() diff --git a/app/src/main/java/com/yingmao/clash/view/dialog/ActivityLinkDialog.java b/app/src/main/java/com/yingmao/clash/view/dialog/ActivityLinkDialog.java index 1957f9a..fb91671 100644 --- a/app/src/main/java/com/yingmao/clash/view/dialog/ActivityLinkDialog.java +++ b/app/src/main/java/com/yingmao/clash/view/dialog/ActivityLinkDialog.java @@ -69,15 +69,28 @@ public class ActivityLinkDialog extends Dialog { Jump.setVisibility(View.GONE); com.setVisibility(View.GONE); viewLine.setVisibility(View.INVISIBLE); - link.setText(getContext().getString(R.string.binding)); - link.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if(activityLinkListener!=null){ - activityLinkListener.onBingClickListener(); + if(bean.getTitle().equals("新人首充活动")){ + link.setText(getContext().getString(R.string.GORecharge)); + link.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if(activityLinkListener!=null){ + activityLinkListener.onGORechargeClickListener(); + } } - } - }); + }); + }else { + link.setText(getContext().getString(R.string.binding)); + link.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if(activityLinkListener!=null){ + activityLinkListener.onBingClickListener(); + } + } + }); + } + cancel.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,6 +111,7 @@ public class ActivityLinkDialog extends Dialog { public interface ActivityLinkListener{ void onFinishClickListener(Activity_ bean); + void onGORechargeClickListener(); void onBingClickListener(); void onCancelClickListener(); } diff --git a/app/src/main/res/layout/layout_activity_login.xml b/app/src/main/res/layout/layout_activity_login.xml index a31c514..5c69a42 100644 --- a/app/src/main/res/layout/layout_activity_login.xml +++ b/app/src/main/res/layout/layout_activity_login.xml @@ -229,16 +229,15 @@ android:id="@+id/tv_hongmeng_tip" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="53dp" - android:layout_marginTop="5dp" android:maxLines="10" android:paddingLeft="20dp" android:paddingRight="20dp" + android:layout_marginTop="@dimen/dp_10" android:text="@string/LoginTips2" - android:textColor="@color/white" + android:textColor="@color/forget_pwd_text_color" android:textSize="12sp" android:visibility="gone" - app:layout_constraintTop_toBottomOf="@id/tv_tip_default_psw" + app:layout_constraintTop_toBottomOf="@+id/tv_kefu" tools:ignore="MissingConstraints" />