一键连更改相关数据3
This commit is contained in:
parent
861d617892
commit
2087ace8bc
1113
app/mapping.txt
1113
app/mapping.txt
File diff suppressed because it is too large
Load Diff
460744
app/seeds.txt
460744
app/seeds.txt
File diff suppressed because it is too large
Load Diff
|
|
@ -293,7 +293,7 @@ class NewMainActivity : BaseActivity() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// mainAtyVM.getNoticeInfo()
|
mainAtyVM.getNoticeInfo()
|
||||||
activityPopupWindow()
|
activityPopupWindow()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -120,13 +120,37 @@ class SplashActivity : BaseActivity() {
|
||||||
observe(this, splashAtyVM)
|
observe(this, splashAtyVM)
|
||||||
setContentView(R.layout.layout_splash_activity)
|
setContentView(R.layout.layout_splash_activity)
|
||||||
rlMain = findViewById(R.id.rlMain)
|
rlMain = findViewById(R.id.rlMain)
|
||||||
|
|
||||||
rlPb = findViewById(R.id.rl_pb)
|
rlPb = findViewById(R.id.rl_pb)
|
||||||
ll_action = findViewById(R.id.ll_action)
|
ll_action = findViewById(R.id.ll_action)
|
||||||
webView = findViewById(R.id.webView)
|
webView = findViewById(R.id.webView)
|
||||||
pb_web = findViewById(R.id.pb_web)
|
pb_web = findViewById(R.id.pb_web)
|
||||||
but_skip = findViewById(R.id.but_skip)
|
but_skip = findViewById(R.id.but_skip)
|
||||||
but_register = findViewById(R.id.but_register)
|
but_register = findViewById(R.id.but_register)
|
||||||
|
val decodeBool =
|
||||||
|
MMKV.defaultMMKV().decodeBool(BZYConstants.is_splash_first, false)
|
||||||
|
if(!decodeBool){
|
||||||
|
val splashDialog =
|
||||||
|
SplashDialog(this)
|
||||||
|
splashDialog.showDialog(this@SplashActivity)
|
||||||
|
splashDialog.setOnDialogClickListener(object :SplashDialog.ActivityLinkListener{
|
||||||
|
override fun onAgreeClickListener() {
|
||||||
|
MMKV.defaultMMKV().encode(BZYConstants.is_splash_first, true)
|
||||||
|
splashDialog.cancel()
|
||||||
|
rlPb.visibility = View.VISIBLE
|
||||||
|
initInto()
|
||||||
|
}
|
||||||
|
override fun onDisagreeClickListener() {
|
||||||
|
MMKV.defaultMMKV().encode(BZYConstants.is_splash_first, false)
|
||||||
|
splashDialog.cancel()
|
||||||
|
finish()
|
||||||
|
}
|
||||||
|
|
||||||
|
})
|
||||||
|
}else{
|
||||||
|
initInto()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
private fun initInto(){
|
||||||
serStore.isYM = BuildConfig.is_ym
|
serStore.isYM = BuildConfig.is_ym
|
||||||
if (!BuildConfig.is_ym) {
|
if (!BuildConfig.is_ym) {
|
||||||
if (BuildConfig.is_tz) {
|
if (BuildConfig.is_tz) {
|
||||||
|
|
@ -199,7 +223,7 @@ class SplashActivity : BaseActivity() {
|
||||||
var dialogAgreementPrivacyChoose: DialogAgreementPrivacyChoose? = null
|
var dialogAgreementPrivacyChoose: DialogAgreementPrivacyChoose? = null
|
||||||
private fun initAgreementPrivacy() {
|
private fun initAgreementPrivacy() {
|
||||||
if (BuildConfig.is_tz && BuildConfig.productId == "182269") {
|
if (BuildConfig.is_tz && BuildConfig.productId == "182269") {
|
||||||
if (MMKV.defaultMMKV().decodeBool(BZYConstants.MMKV_KEY_IS_REGISTER, false)) {
|
if (MMKV.defaultMMKV().decodeBool(MMKV_KEY_IS_REGISTER, false)) {
|
||||||
rlPb.visibility = View.VISIBLE
|
rlPb.visibility = View.VISIBLE
|
||||||
webView?.visibility = View.GONE
|
webView?.visibility = View.GONE
|
||||||
initApplication(false)
|
initApplication(false)
|
||||||
|
|
@ -428,34 +452,14 @@ class SplashActivity : BaseActivity() {
|
||||||
|
|
||||||
private fun isNeedRegister(isNeedRegister: Boolean) {
|
private fun isNeedRegister(isNeedRegister: Boolean) {
|
||||||
if (!BuildConfig.is_free && BuildConfig.productId.isNotEmpty()) { //渠道包都自动注册登录,广州22222也是非自动注册
|
if (!BuildConfig.is_free && BuildConfig.productId.isNotEmpty()) { //渠道包都自动注册登录,广州22222也是非自动注册
|
||||||
if (MMKV.defaultMMKV().decodeBool(BZYConstants.MMKV_KEY_IS_REGISTER, false)) {
|
if (MMKV.defaultMMKV().decodeBool(MMKV_KEY_IS_REGISTER, false)) {
|
||||||
rlPb.visibility = View.VISIBLE
|
rlPb.visibility = View.VISIBLE
|
||||||
but_skip?.visibility = View.INVISIBLE
|
but_skip?.visibility = View.INVISIBLE
|
||||||
but_register?.visibility = View.INVISIBLE
|
but_register?.visibility = View.INVISIBLE
|
||||||
splashAtyVM.checkLogin()
|
splashAtyVM.checkLogin()
|
||||||
} else {
|
} else {
|
||||||
if (isNeedRegister) {
|
if (isNeedRegister) {
|
||||||
val decodeBool =
|
doRegisterByEncryption()
|
||||||
MMKV.defaultMMKV().decodeBool(BZYConstants.is_splash_first, false)
|
|
||||||
if(!decodeBool){
|
|
||||||
val splashDialog =
|
|
||||||
SplashDialog(this)
|
|
||||||
splashDialog.showDialog(this@SplashActivity)
|
|
||||||
splashDialog.setOnDialogClickListener(object :SplashDialog.ActivityLinkListener{
|
|
||||||
override fun onFinishClickListener() {
|
|
||||||
doRegisterByEncryption()
|
|
||||||
MMKV.defaultMMKV().encode(BZYConstants.is_splash_first, true)
|
|
||||||
}
|
|
||||||
override fun onCancelClickListener() {
|
|
||||||
MMKV.defaultMMKV().encode(BZYConstants.is_splash_first, false)
|
|
||||||
finish()
|
|
||||||
}
|
|
||||||
|
|
||||||
})
|
|
||||||
}else{
|
|
||||||
doRegisterByEncryption()
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
setWebView()
|
setWebView()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ public class SplashDialog extends Dialog {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
if(activityLinkListener!=null){
|
if(activityLinkListener!=null){
|
||||||
activityLinkListener.onCancelClickListener();
|
activityLinkListener.onDisagreeClickListener();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -77,7 +77,7 @@ public class SplashDialog extends Dialog {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
if(activityLinkListener!=null){
|
if(activityLinkListener!=null){
|
||||||
activityLinkListener.onFinishClickListener();
|
activityLinkListener.onAgreeClickListener();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -91,7 +91,7 @@ public class SplashDialog extends Dialog {
|
||||||
}
|
}
|
||||||
|
|
||||||
public interface ActivityLinkListener{
|
public interface ActivityLinkListener{
|
||||||
void onFinishClickListener();
|
void onAgreeClickListener();
|
||||||
void onCancelClickListener();
|
void onDisagreeClickListener();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,88 +3,132 @@
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="@drawable/setting_notice_bg"
|
|
||||||
android:gravity="center"
|
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:paddingLeft="10dp"
|
>
|
||||||
android:paddingRight="10dp">
|
|
||||||
|
|
||||||
<androidx.core.widget.NestedScrollView
|
<androidx.core.widget.NestedScrollView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="15dp"
|
>
|
||||||
android:layout_marginBottom="10dp">
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="match_parent"
|
||||||
android:orientation="vertical">
|
android:background="@drawable/oc_activity_add_group_bg"
|
||||||
|
>
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:gravity="center"
|
|
||||||
android:text="@string/LatestAnnouncement"
|
|
||||||
android:textColor="@color/blue_4072FE"
|
|
||||||
android:textSize="16sp"
|
|
||||||
android:textStyle="bold" />
|
|
||||||
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_marginTop="@dimen/dp_10"
|
|
||||||
android:id="@+id/tv_notice_content"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:autoLink="web"
|
|
||||||
android:textColor="@color/black_4F4F4F"
|
|
||||||
android:textSize="12sp" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:id="@+id/tv_notice_url"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:autoLink="web"
|
|
||||||
android:textColor="@color/black_4F4F4F"
|
|
||||||
android:textSize="12sp" />
|
|
||||||
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
android:id="@+id/noticeTitle"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:orientation="vertical"
|
||||||
android:layout_marginTop="@dimen/dp_10"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
android:gravity="center"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
android:orientation="horizontal">
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
>
|
||||||
|
|
||||||
<TextView
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:id="@+id/tv_cancel"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginEnd="20dp"
|
android:layout_gravity="center"
|
||||||
android:paddingTop="8dp"
|
>
|
||||||
android:paddingBottom="8dp"
|
<androidx.appcompat.widget.AppCompatImageView
|
||||||
android:background="@drawable/notece_cancel_btn_bg_selector"
|
android:id="@+id/tvDogHead"
|
||||||
android:gravity="center"
|
android:layout_width="wrap_content"
|
||||||
android:text="@string/close"
|
android:layout_height="wrap_content"
|
||||||
android:textColor="@color/blue_4072FE"
|
android:src="@drawable/oc_dog_head"
|
||||||
android:textSize="16sp"
|
android:layout_marginStart="21dp"
|
||||||
android:visibility="gone" />
|
android:layout_marginTop="24dp"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
|
||||||
|
/>
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="@string/LatestAnnouncement"
|
||||||
|
android:textColor="#B36C1B"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:layout_marginStart="12dp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/tvDogHead"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/tvDogHead"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/tvDogHead"
|
||||||
|
/>
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tv_sure"
|
android:layout_marginTop="@dimen/dp_10"
|
||||||
|
android:id="@+id/tv_notice_content"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:paddingTop="8dp"
|
android:layout_marginStart="12dp"
|
||||||
android:paddingBottom="8dp"
|
android:layout_marginEnd="12dp"
|
||||||
android:background="@drawable/notece_cancel_btn_bg_selector"
|
android:autoLink="web"
|
||||||
|
android:textColor="@color/black_4F4F4F"
|
||||||
|
android:textSize="12sp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:id="@+id/tv_notice_url"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:visibility="gone"
|
||||||
|
android:layout_marginStart="12dp"
|
||||||
|
android:layout_marginEnd="12dp"
|
||||||
|
android:autoLink="web"
|
||||||
|
android:textColor="@color/black_4F4F4F"
|
||||||
|
android:textSize="12sp" />
|
||||||
|
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:layout_marginTop="@dimen/dp_10"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text="@string/ReadAlready"
|
android:orientation="horizontal">
|
||||||
android:textColor="@color/blue_4072FE"
|
|
||||||
android:textSize="16sp" />
|
<TextView
|
||||||
|
android:id="@+id/tv_cancel"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginEnd="20dp"
|
||||||
|
android:paddingTop="8dp"
|
||||||
|
android:paddingBottom="8dp"
|
||||||
|
android:background="@drawable/oc_login_bg"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="@string/close"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:visibility="gone" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_sure"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingTop="8dp"
|
||||||
|
android:paddingBottom="8dp"
|
||||||
|
android:layout_marginStart="21dp"
|
||||||
|
android:layout_marginEnd="21dp"
|
||||||
|
android:background="@drawable/oc_login_bg"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="@string/ReadAlready"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="16sp"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/noticeTitle"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
android:layout_marginBottom="24dp"
|
||||||
|
/>
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
</androidx.core.widget.NestedScrollView>
|
</androidx.core.widget.NestedScrollView>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -160,8 +160,8 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentBottom="true"
|
android:layout_alignParentBottom="true"
|
||||||
android:layout_centerInParent="true"
|
android:layout_centerInParent="true"
|
||||||
android:layout_marginBottom="50dp"
|
android:layout_marginBottom="80dp"
|
||||||
android:visibility="gone">
|
android:visibility="visible">
|
||||||
|
|
||||||
<ProgressBar
|
<ProgressBar
|
||||||
android:id="@+id/pb"
|
android:id="@+id/pb"
|
||||||
|
|
|
||||||
|
|
@ -33416,6 +33416,7 @@ com.yingmao.clash.act.SplashActivity:
|
||||||
public java.lang.String registerHost
|
public java.lang.String registerHost
|
||||||
public static synthetic boolean $r8$lambda$ivyJQo3JQ5rFgfnhdjCCCsX1guE()
|
public static synthetic boolean $r8$lambda$ivyJQo3JQ5rFgfnhdjCCCsX1guE()
|
||||||
public static final boolean httpSuccess$lambda$11$lambda$9()
|
public static final boolean httpSuccess$lambda$11$lambda$9()
|
||||||
|
public final void initInto()
|
||||||
public static void initWebView()
|
public static void initWebView()
|
||||||
public static void setLocalLanguage()
|
public static void setLocalLanguage()
|
||||||
public static void setWebView$1()
|
public static void setWebView$1()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue