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

中英文修改

Browse Source
This commit is contained in:
18401019693
2023-10-09 16:27:54 +08:00
parent 45ad8a9810
commit 7b62409bf1
29 changed files with 299 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java
View File

@@ -44,6 +44,7 @@ import com.yunbao.common.utils.ProcessImageUtil;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.CompleteInformationPopup;
import com.yunbao.common.views.UpdateSexPopup;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
@@ -446,7 +447,7 @@ public class EditProfileActivity extends AbsActivity {
}
Constants.myIntoIndex = 2;
Intent intent = new Intent(mContext, MyWebViewActivity2.class);
intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/table/Modify-information.html" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid());
intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/table/Modify-information.html" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
startActivity(intent);
}

7
main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java
View File

@@ -144,6 +144,7 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement
}
});
mRefreshView.initData();
mRefreshView.setEmptyLayoutId(R.layout.sud_no_data);
ViewClicksAntiShake.clicksAntiShake(findViewById(com.yunbao.common.R.id.random_start), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
@@ -155,6 +156,12 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement
Intent intent = new Intent(context, SudGameActivity.class);
intent.putExtra("CreateSudRoom", new Gson().toJson(data));
context.startActivity(intent);
}else {
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("当前没有可加入的房间");
} else {
ToastUtil.show("There are currently no rooms to join");
}
}
}

68
main/src/main/res/layout/activity_modify_pwd.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/view_title"/>
<include layout="@layout/view_title" />
<LinearLayout
android:layout_width="match_parent"
@@ -13,108 +13,97 @@
android:background="@color/white"
android:orientation="vertical"
android:paddingLeft="15dp"
android:paddingRight="15dp"
>
android:paddingRight="15dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:orientation="horizontal"
>
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_width="110dp"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_centerVertical="true"
android:text="@string/modify_pwd_old"
android:textColor="@color/textColor"
android:textSize="16sp"
/>
android:textSize="13sp" />
<EditText
android:id="@+id/edit_old"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_marginLeft="80dp"
android:layout_marginLeft="110dp"
android:background="@null"
android:hint="@string/modify_pwd_old_1"
android:inputType="textPassword"
android:textColor="@color/textColor"
android:textColorHint="@color/gray3"
android:textSize="16sp"
/>
android:textSize="16sp" />
</RelativeLayout>
<View
style="@style/line2"
/>
<View style="@style/line2" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:orientation="horizontal"
>
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_width="110dp"
android:gravity="center"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/modify_pwd_new"
android:textColor="@color/textColor"
android:textSize="16sp"
/>
android:textSize="13sp" />
<EditText
android:id="@+id/edit_new"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_marginLeft="80dp"
android:layout_marginLeft="110dp"
android:background="@null"
android:hint="@string/modify_pwd_new_1"
android:inputType="textPassword"
android:textColor="@color/textColor"
android:textColorHint="@color/gray3"
android:textSize="16sp"
/>
android:textSize="16sp" />
</RelativeLayout>
<View
style="@style/line2"
/>
<View style="@style/line2" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:orientation="horizontal"
>
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_width="110dp"
android:gravity="center"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/modify_pwd_confirm"
android:textColor="@color/textColor"
android:textSize="16sp"
/>
android:textSize="13sp" />
<EditText
android:id="@+id/edit_confirm"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="80dp"
android:layout_alignParentEnd="true"
android:layout_marginLeft="110dp"
android:background="@null"
android:hint="@string/modify_pwd_confirm_1"
android:inputType="textPassword"
android:textColor="@color/textColor"
android:textColorHint="@color/gray3"
android:textSize="16sp"
/>
android:textSize="16sp" />
</RelativeLayout>
@@ -125,12 +114,11 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:layout_marginTop="30dp"
android:layout_marginRight="30dp"
android:background="@drawable/login_btn"
android:gravity="center"
android:text="@string/modify_pwd_confirm_2"
android:textColor="@color/white"
android:textSize="16sp"
/>
android:textSize="16sp" />
</LinearLayout>

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

@@ -15,8 +15,8 @@
<ImageView
android:id="@+id/change_batch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="65dp"
android:layout_height="22dp"
android:layout_gravity="center_vertical|right"
android:background="@mipmap/icon_cange" />