yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改界面的中英文

Browse Source
This commit is contained in:
18401019693
2023-03-17 10:19:35 +08:00
parent 07f8f46f1f
commit 8455d1253c
19 changed files with 414 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/java/com/yunbao/main/dialog/SigninDialog.java
View File

@@ -2,6 +2,7 @@ package com.yunbao.main.dialog;
import static com.yunbao.common.utils.RouteUtil.PATH_REWARD;
import android.annotation.SuppressLint;
import android.os.Bundle;
import android.view.Gravity;
import android.view.View;
@@ -44,6 +45,7 @@ public class SigninDialog extends AbsDialogFragment {
window.setAttributes(params);
}
@SuppressLint("StringFormatInvalid")
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
@@ -73,6 +75,7 @@ public class SigninDialog extends AbsDialogFragment {
return;
}
gold.setText(bundle.getString("send_gold") + "金豆+" + bundle.getString("send_exp") + "EXP");
sign_day.setText("本月您已累積簽到" + bundle.getString("sign_day") + "天，");
sign_day.setText(String.format(getString(R.string.this_month), bundle.getString("sign_day")));
}
}

4
main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
View File

@@ -302,8 +302,8 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
user_noble_time.setText(mContext.getResources().getString(R.string.open_noble_text));
}
String singnature = u.getSignature();
if (TextUtils.equals(singnature, "貴族") || TextUtils.equals(singnature, "贵族")) {
singnature = singnature + "中心";
if (TextUtils.equals(singnature, "這個人很懶，什麼也沒留下") ||TextUtils.equals(singnature, "这家伙很懒，什么都没留下") || TextUtils.isEmpty(singnature)) {
singnature ="The guy was lazy and didn't write anything.";
}
signature.setText(singnature);
CommonAppConfig appConfig = CommonAppConfig.getInstance();

10
main/src/main/res/layout/activity_entry.xml
View File

@@ -235,7 +235,7 @@
android:id="@+id/tv_customer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="無法登陸？點此聯繫客服"
android:text="@string/customer_service2"
android:textColor="@color/white"
android:textSize="11sp" />
</LinearLayout>
@@ -252,7 +252,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="進入下一步即代表同意"
android:text="@string/next_step_is_consent"
android:textColor="#ffb1b1b1"
android:textSize="10sp" />
@@ -262,7 +262,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="1dp"
android:text="用户協議"
android:text="@string/user_protocol2"
android:textColor="#ffb1b1b1"
android:textSize="10sp" />
@@ -270,7 +270,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="1dp"
android:text="和"
android:text="@string/and"
android:textColor="#ffb1b1b1"
android:textSize="10sp" />
@@ -279,7 +279,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="1dp"
android:text="隱私條款"
android:text="privacy_terms"
android:textColor="#ffb1b1b1"
android:textSize="10sp" />

6
main/src/main/res/layout/activity_find_pwd.xml
View File

@@ -37,7 +37,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="忘記密碼"
android:text="@string/find_pwd_forget"
android:textColor="#ffff8d41"
android:textSize="24sp"
android:layout_marginLeft="41dp"
@@ -194,7 +194,7 @@
android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:background="@null"
android:hint="請填寫新密碼"
android:hint="@string/modify_pwd_new_1"
android:inputType="textPassword"
android:textColor="@color/textColor"
android:textColorHint="@color/gray3"
@@ -243,7 +243,7 @@
android:background="@drawable/border_fdbe40"
android:gravity="center"
android:onClick="registerClick"
android:text="立即找回"
android:text="@string/find_pwd_find"
android:textColor="@color/white"
android:textSize="16sp"
/>

133
main/src/main/res/layout/activity_login.xml
View File

@@ -1,62 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/white">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="65dp"
android:background="@color/white"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="23dp">
android:orientation="vertical">
<ImageView
android:id="@+id/btn_back"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:onClick="backClick"
android:padding="9dp"
android:src="@mipmap/icon_back"
android:tint="@color/textColor"
/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="65dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="23dp"
android:layout_marginRight="20dp"
android:background="@color/white">
<TextView android:id="@+id/btn_forget_pwd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="忘記密碼"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:textColor="#ffc4c6ca"
android:onClick="loginClick"
android:textSize="14sp"
/>
</RelativeLayout>
<ImageView
android:id="@+id/btn_back"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:onClick="backClick"
android:padding="9dp"
android:src="@mipmap/icon_back"
android:tint="@color/textColor" />
<TextView
android:id="@+id/btn_forget_pwd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:onClick="loginClick"
android:text="@string/find_pwd_forget"
android:textColor="#ffc4c6ca"
android:textSize="14sp" />
</RelativeLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="45dp"
android:layout_marginTop="49dp"
android:text="Hello，"
android:textColor="#ffff8d41"
android:textSize="33sp"
android:textStyle="bold"
android:layout_marginLeft="45dp"
android:layout_marginTop="49dp"/>
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="歡迎來到PD LIVE。"
android:textColor="#ffb1b1b1"
android:textSize="20sp"
android:layout_marginLeft="45dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="39dp"
android:layout_marginLeft="45dp"/>
android:text="@string/come_to"
android:textColor="#ffb1b1b1"
android:textSize="20sp" />
<LinearLayout
android:id="@+id/view"
@@ -66,66 +64,65 @@
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="47dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_marginBottom="15dp"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:background="@drawable/border_grey_50">
android:layout_marginBottom="15dp"
android:background="@drawable/border_grey_50"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="27dp"
android:layout_marginRight="36dp"
android:src="@mipmap/icon_phone"/>
android:src="@mipmap/icon_phone" />
<EditText
android:id="@+id/edit_phone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="left|center"
android:hint="@string/login_input_phone"
android:background="@null"
android:maxLength="20"
android:singleLine="true"
android:textColor="#161616"
android:textColorHint="#B6B6B6"
android:textSize="16sp" />
android:id="@+id/edit_phone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"
android:gravity="left|center"
android:hint="@string/login_input_phone"
android:maxLength="20"
android:singleLine="true"
android:textColor="#161616"
android:textColorHint="#B6B6B6"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="47dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_marginBottom="15dp"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:background="@drawable/border_grey_50">
android:layout_marginBottom="15dp"
android:background="@drawable/border_grey_50"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="27dp"
android:layout_marginRight="36dp"
android:src="@mipmap/icon_password"/>
android:src="@mipmap/icon_password" />
<EditText
android:id="@+id/edit_pwd"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"
android:gravity="left|center"
android:hint="@string/login_input_pwd"
android:inputType="textPassword"
android:background="@null"
android:maxLength="20"
android:singleLine="true"
android:textColor="#161616"
@@ -139,8 +136,8 @@
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:layout_marginTop="30dp"
android:layout_marginRight="30dp"
android:background="@drawable/border_fdbe40"
android:gravity="center"
android:onClick="loginClick"
@@ -154,8 +151,8 @@
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:layout_marginTop="15dp"
android:layout_marginRight="30dp"
android:background="@drawable/border_fff_lin"
android:gravity="center"
android:onClick="loginClick"
@@ -167,8 +164,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
android:layout_marginTop="10dp">
android:layout_marginTop="10dp"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
@@ -249,12 +246,12 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="8sp"
android:layout_marginRight="40dp"
android:layout_marginLeft="50dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="10dp"
android:text="為了提供分享服務，我們的產品集成Mob+ SDK，SDK需要收集您的設備識別碼和您需要分享的社交賬號。為便於您更好地了解[Mob+]采集的數據類型及用途，以及何保護您的個人信息，您可以登陸https://www.mob.com/about/policy了解[Mob+]隱私權政策"
android:textColor="@color/red"/>
android:textColor="@color/red"
android:textSize="8sp" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>

4
main/src/main/res/layout/activity_register.xml
View File

@@ -40,7 +40,7 @@
android:layout_marginLeft="41dp"
android:layout_marginTop="30dp"
android:layout_marginBottom="25dp"
android:text="註冊PD LIVE"
android:text="@string/sign_up_for"
android:textColor="#ffff8d41"
android:textSize="24sp" />
@@ -246,7 +246,7 @@
android:gravity="center"
android:clickable="true"
android:onClick="registerClick"
android:text="註冊並登錄"
android:text="@string/register_and_log_in"
android:textColor="@color/white"
android:textSize="16sp"
android:focusable="true" />

135
main/src/main/res/layout/dialog_login_tips.xml
View File

@@ -1,100 +1,105 @@
<?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"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/login_ties_bg">
android:background="@mipmap/login_ties_bg"
android:orientation="vertical">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:gravity="center"
android:layout_marginBottom="100dp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="條款和政策"
android:textColor="#ff161616"
android:textSize="16sp"
android:textStyle="bold"
android:layout_marginTop="15dp"
android:layout_marginBottom="22dp"
android:gravity="center"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:text="歡迎來到PD LIVE，對於您的個人信息及隱私，我們將採用最高標準對待和保護。"
android:textColor="#ff161616"
android:textSize="14sp"/>
<TextView
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textStyle="bold"
android:text="詳情請您閱讀以下安裝應用程序的消息："
android:textColor="#ff161616"
android:textSize="14sp"
android:gravity="left"
android:layout_marginBottom="22dp"/>
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:layout_marginBottom="100dp"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="為了向您提供一鍵分享服務，我們的產品集成Mob+U-Share SDK，Mob+SDK需要收集您的設備Mac地址、唯一設備識別碼(1MEI/android ID/IDFA/OPENUDID/GUID、 SIM卡IMSI信息)以及您需要分享的社交賬號公開信息，以便完成一鍵分享服務。並通過地理位置校準報表數據準確性，提供基礎反作弊服務。為了您的信息安全，我們已與第三方SDK服務商進行數據安全保密約定，這些公司會嚴格遵守我們的數據隱私和安全要求。 除非得到您的同意，我們不會與其共享您的個人身份信息。為便於您更好地了解[Mob+]采集的數據類型及用途，以及何保護您的個人信息，您可以登陸https://www.mob.com/about/policy了解[Mob+]隱私權政）。"
android:textColor="#ffb1b1b1"
android:layout_marginBottom="22dp"
android:textSize="11sp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginBottom="22dp"
android:gravity="center"
android:text="@string/terms_and_policies"
android:textColor="#ff161616"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="本應用會收集位置數據以支持登錄和註冊的功能使用。"
android:textColor="#ffb1b1b1"
android:drawablePadding="5dp"
android:textSize="11sp"
android:drawableLeft="@mipmap/icon_position"
android:layout_marginBottom="10dp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/treat_and_protect"
android:textColor="#ff161616"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="22dp"
android:gravity="left"
android:text="@string/install_the_application"
android:textColor="#ff161616"
android:textSize="14sp"
android:textStyle="bold" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="140dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginBottom="22dp"
android:text="@string/anti_cheating_services"
android:textColor="#ffb1b1b1"
android:textSize="11sp" />
</androidx.core.widget.NestedScrollView>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:drawableLeft="@mipmap/icon_position"
android:drawablePadding="5dp"
android:text="@string/support_login"
android:textColor="#ffb1b1b1"
android:textSize="11sp" />
</LinearLayout>
</ScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_alignParentBottom="true"
android:layout_marginRight="24dp"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:gravity="center"
android:orientation="vertical">
<Button android:id="@+id/btn_agree"
<Button
android:id="@+id/btn_agree"
android:layout_width="match_parent"
android:layout_height="47dp"
android:text="同意"
android:textSize="18sp"
android:textStyle="bold"
android:background="@drawable/border_89b6ff"
android:text="@string/agreement"
android:textColor="@color/color_white"
android:background="@drawable/border_89b6ff"/>
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="點擊同意後即代表您已閱讀並同意以上所有內容。"
android:textColor="#ffb1b1b1"
android:layout_marginTop="12dp"
android:layout_marginBottom="22dp"
android:textSize="12sp"
/>
android:text="@string/read_and_agre"
android:textColor="#ffb1b1b1"
android:textSize="12sp" />
</LinearLayout>
</RelativeLayout>

70
main/src/main/res/layout/signin_dialog.xml
View File

@@ -1,78 +1,86 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/successfully">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:orientation="vertical"
android:gravity="center">
android:layout_centerInParent="true"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="恭喜你獲得了"
android:textColor="#ffc4c6ca"
android:textSize="15sp"
android:layout_marginTop="15dp"
/>
<pl.droidsonroids.gif.GifImageView
android:id="@+id/btn_live"
android:layout_width="150dp"
android:layout_height="150dp"
android:adjustViewBounds="true"
android:layout_alignParentBottom="true"
android:src="@mipmap/jindou"/>
android:text="@string/getting_it"
android:textColor="#ffc4c6ca"
android:textSize="15sp" />
<pl.droidsonroids.gif.GifImageView
android:id="@+id/btn_live"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_alignParentBottom="true"
android:adjustViewBounds="true"
android:src="@mipmap/jindou" />
<TextView android:id="@+id/gold"
<TextView
android:id="@+id/gold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="200 金豆 + 2000 EXP"
android:textColor="#ffffbe41"
android:textSize="20sp" />
<TextView android:id="@+id/sign_day"
<TextView
android:id="@+id/sign_day"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="本月您已累積簽到6天，"
android:text="@string/this_month"
android:textColor="#ffc4c6ca"
android:textSize="12sp"/>
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="再簽到1天即可獲得額外獎勵。"
android:text="@string/more_day_to"
android:textColor="#ffc4c6ca"
android:textSize="12sp"/>
android:textSize="12sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="10dp">
android:layout_marginTop="10dp"
android:orientation="horizontal">
<Button android:id="@+id/goto_sign"
<Button
android:id="@+id/goto_sign"
android:layout_width="130dp"
android:layout_height="38dp"
android:layout_marginRight="10dp"
android:background="@mipmap/btn_goto"/>
android:background="@mipmap/btn_goto"
android:text="@string/go_to_the_sign"
android:textColor="#C9CACE"
android:textSize="9sp" />
<Button android:id="@+id/confirm"
<Button
android:id="@+id/confirm"
android:layout_width="130dp"
android:layout_height="38dp"
android:layout_marginLeft="10dp"
android:background="@mipmap/btn_signin"/>
android:textColor="#fff"
android:textSize="9sp"
android:text="@string/confirm_pick_up"
android:background="@mipmap/btn_signin" />
</LinearLayout>
</LinearLayout>

BIN
main/src/main/res/mipmap-mdpi/btn_goto.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
main/src/main/res/mipmap-mdpi/btn_signin.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB