fengjingqi/CkCollar_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化修改bug

Browse Source
This commit is contained in:
fengjignqi
2026-08-08 14:45:08 +08:00
parent 9806e66790
commit 39dbe5f1e4
33 changed files with 2860 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,7 +102,7 @@
android:text="@string/no_reason_text"
android:background="@drawable/bg_cz_button"
android:paddingHorizontal="5dp"
></com.ck.ckcollar.app.widget.CKTextView>
android:visibility="gone"/>
</com.ck.ckcollar.app.widget.CKLinearLayout>
<com.ck.ckcollar.app.widget.CKLinearLayout

70
app/src/main/res/layout/activity_open_member.xml
View File

@@ -49,38 +49,6 @@
android:layout_marginBottom="10dp"
></com.ck.ckcollar.app.widget.CKTextView>
<com.ck.ckcollar.app.widget.CKLinearLayout
android:id="@+id/btnAli"
android:layout_width="match_parent"
android:layout_height="50dp"
android:orientation="horizontal"
android:paddingHorizontal="20dp"
android:background="@drawable/bg_view_gray_radius_12_stroke_1"
android:gravity="center_vertical"
>
<com.ck.ckcollar.app.widget.CKImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/image_ali"
></com.ck.ckcollar.app.widget.CKImageView>
<com.ck.ckcollar.app.widget.CKTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="14sp"
android:textColor="@color/textColor"
android:text="@string/alipay"
android:paddingLeft="8dp"
></com.ck.ckcollar.app.widget.CKTextView>
<com.ck.ckcollar.app.widget.CKImageView
android:id="@+id/image1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/image_address_check_select"
></com.ck.ckcollar.app.widget.CKImageView>
</com.ck.ckcollar.app.widget.CKLinearLayout>
<com.ck.ckcollar.app.widget.CKLinearLayout
android:id="@+id/btnWX"
@@ -91,7 +59,7 @@
android:background="@drawable/bg_view_gray_radius_12_stroke_1"
android:gravity="center_vertical"
android:layout_marginTop="10dp"
android:visibility="gone"
android:visibility="visible"
>
<com.ck.ckcollar.app.widget.CKImageView
@@ -113,10 +81,46 @@
android:id="@+id/image2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/image_address_check_select"
></com.ck.ckcollar.app.widget.CKImageView>
</com.ck.ckcollar.app.widget.CKLinearLayout>
<com.ck.ckcollar.app.widget.CKLinearLayout
android:id="@+id/btnAli"
android:layout_width="match_parent"
android:layout_height="50dp"
android:orientation="horizontal"
android:paddingHorizontal="20dp"
android:background="@drawable/bg_view_gray_radius_12_stroke_1"
android:gravity="center_vertical"
android:layout_marginTop="10dp">
<com.ck.ckcollar.app.widget.CKImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/image_ali"
></com.ck.ckcollar.app.widget.CKImageView>
<com.ck.ckcollar.app.widget.CKTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="14sp"
android:textColor="@color/textColor"
android:text="@string/alipay"
android:paddingLeft="8dp"
></com.ck.ckcollar.app.widget.CKTextView>
<com.ck.ckcollar.app.widget.CKImageView
android:id="@+id/image1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/image_address_check_narmal"
></com.ck.ckcollar.app.widget.CKImageView>
</com.ck.ckcollar.app.widget.CKLinearLayout>
<com.ck.ckcollar.app.widget.CKLinearLayout
android:id="@+id/btnBalance"
android:layout_width="match_parent"

5
app/src/main/res/layout/activity_order.xml
View File

@@ -263,7 +263,7 @@
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_marginTop="10dp"
android:visibility="gone"
android:visibility="visible"
>
<com.ck.ckcollar.app.widget.CKImageView
@@ -295,7 +295,6 @@
android:layout_height="50dp"
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_marginTop="10dp"
>
<com.ck.ckcollar.app.widget.CKImageView
@@ -317,7 +316,7 @@
android:id="@+id/image1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/image_address_check_select"
android:src="@mipmap/image_address_check_narmal"
></com.ck.ckcollar.app.widget.CKImageView>
</com.ck.ckcollar.app.widget.CKLinearLayout>

5
app/src/main/res/layout/activity_pay_order.xml
View File

@@ -232,7 +232,7 @@
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_marginTop="10dp"
android:visibility="gone"
android:visibility="visible"
>
<com.ck.ckcollar.app.widget.CKImageView
@@ -264,7 +264,6 @@
android:layout_height="50dp"
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_marginTop="10dp"
>
<com.ck.ckcollar.app.widget.CKImageView
@@ -286,7 +285,7 @@
android:id="@+id/image1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/image_address_check_select"
android:src="@mipmap/image_address_check_narmal"
></com.ck.ckcollar.app.widget.CKImageView>
</com.ck.ckcollar.app.widget.CKLinearLayout>

72
app/src/main/res/layout/activity_recharge.xml
View File

@@ -56,38 +56,6 @@
android:layout_marginBottom="10dp"
></com.ck.ckcollar.app.widget.CKTextView>
<com.ck.ckcollar.app.widget.CKLinearLayout
android:id="@+id/btnAli"
android:layout_width="match_parent"
android:layout_height="50dp"
android:orientation="horizontal"
android:paddingHorizontal="20dp"
android:background="@drawable/bg_view_gray_radius_12_stroke_1"
android:gravity="center_vertical"
>
<com.ck.ckcollar.app.widget.CKImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/image_ali"
></com.ck.ckcollar.app.widget.CKImageView>
<com.ck.ckcollar.app.widget.CKTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="14sp"
android:textColor="@color/textColor"
android:text="@string/alipay"
android:paddingLeft="8dp"
></com.ck.ckcollar.app.widget.CKTextView>
<com.ck.ckcollar.app.widget.CKImageView
android:id="@+id/image1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/image_address_check_select"
></com.ck.ckcollar.app.widget.CKImageView>
</com.ck.ckcollar.app.widget.CKLinearLayout>
<com.ck.ckcollar.app.widget.CKLinearLayout
android:id="@+id/btnWX"
@@ -97,8 +65,7 @@
android:paddingHorizontal="20dp"
android:background="@drawable/bg_view_gray_radius_12_stroke_1"
android:gravity="center_vertical"
android:layout_marginTop="10dp"
android:visibility="gone"
android:visibility="visible"
>
<com.ck.ckcollar.app.widget.CKImageView
@@ -120,11 +87,48 @@
android:id="@+id/image2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/image_address_check_select"
></com.ck.ckcollar.app.widget.CKImageView>
</com.ck.ckcollar.app.widget.CKLinearLayout>
<com.ck.ckcollar.app.widget.CKLinearLayout
android:id="@+id/btnAli"
android:layout_width="match_parent"
android:layout_height="50dp"
android:orientation="horizontal"
android:paddingHorizontal="20dp"
android:background="@drawable/bg_view_gray_radius_12_stroke_1"
android:gravity="center_vertical"
android:layout_marginTop="10dp"
>
<com.ck.ckcollar.app.widget.CKImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/image_ali"
></com.ck.ckcollar.app.widget.CKImageView>
<com.ck.ckcollar.app.widget.CKTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="14sp"
android:textColor="@color/textColor"
android:text="@string/alipay"
android:paddingLeft="8dp"
></com.ck.ckcollar.app.widget.CKTextView>
<com.ck.ckcollar.app.widget.CKImageView
android:id="@+id/image1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/image_address_check_narmal"
></com.ck.ckcollar.app.widget.CKImageView>
</com.ck.ckcollar.app.widget.CKLinearLayout>
<com.ck.ckcollar.app.widget.CKButton
android:id="@+id/btnRecharge"
android:layout_width="match_parent"

70
app/src/main/res/layout/activity_withdraw.xml
View File

@@ -107,40 +107,6 @@
android:layout_marginBottom="20dp"
android:textSize="16sp"></com.ck.ckcollar.app.widget.CKTextView>
<com.ck.ckcollar.app.widget.CKLinearLayout
android:id="@+id/btnAli"
android:layout_width="match_parent"
android:layout_height="50dp"
android:orientation="horizontal"
android:paddingHorizontal="20dp"
android:background="@drawable/bg_view_white_radius_12_stroke_1"
android:gravity="center_vertical"
>
<com.ck.ckcollar.app.widget.CKImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/image_ali"
></com.ck.ckcollar.app.widget.CKImageView>
<com.ck.ckcollar.app.widget.CKTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="14sp"
android:textColor="@color/textColor"
android:text="@string/alipay"
android:paddingLeft="8dp"
></com.ck.ckcollar.app.widget.CKTextView>
<com.ck.ckcollar.app.widget.CKImageView
android:id="@+id/image1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/image_address_check_select"
></com.ck.ckcollar.app.widget.CKImageView>
</com.ck.ckcollar.app.widget.CKLinearLayout>
<com.ck.ckcollar.app.widget.CKLinearLayout
android:id="@+id/btnWX"
android:layout_width="match_parent"
@@ -150,7 +116,7 @@
android:background="@drawable/bg_view_white_radius_12_stroke_1"
android:gravity="center_vertical"
android:layout_marginTop="10dp"
android:visibility="gone"
android:visibility="visible"
>
<com.ck.ckcollar.app.widget.CKImageView
@@ -172,10 +138,44 @@
android:id="@+id/image2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/image_address_check_select"
></com.ck.ckcollar.app.widget.CKImageView>
</com.ck.ckcollar.app.widget.CKLinearLayout>
<com.ck.ckcollar.app.widget.CKLinearLayout
android:id="@+id/btnAli"
android:layout_width="match_parent"
android:layout_height="50dp"
android:orientation="horizontal"
android:paddingHorizontal="20dp"
android:background="@drawable/bg_view_white_radius_12_stroke_1"
android:gravity="center_vertical"
android:layout_marginTop="10dp">
<com.ck.ckcollar.app.widget.CKImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/image_ali"
></com.ck.ckcollar.app.widget.CKImageView>
<com.ck.ckcollar.app.widget.CKTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="14sp"
android:textColor="@color/textColor"
android:text="@string/alipay"
android:paddingLeft="8dp"
></com.ck.ckcollar.app.widget.CKTextView>
<com.ck.ckcollar.app.widget.CKImageView
android:id="@+id/image1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/image_address_check_narmal"
></com.ck.ckcollar.app.widget.CKImageView>
</com.ck.ckcollar.app.widget.CKLinearLayout>
<com.ck.ckcollar.app.widget.CKButton
android:id="@+id/btnApply"
android:layout_width="match_parent"

4
app/src/main/res/layout/dialog_edit_phone.xml
View File

@@ -9,7 +9,7 @@
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="50dp"
android:layout_marginTop="20dp"
android:gravity="center_horizontal"
android:text="提示"
android:textColor="@color/textColor"
@@ -24,7 +24,7 @@
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:layout_marginHorizontal="30dp"
android:layout_marginTop="10dp"
android:layout_marginTop="20dp"
android:hint="@string/input_phone"
android:textColor="@color/textColor"
android:textColorHint="@color/textSecondColor"

4
app/src/main/res/values/strings.xml
View File

@@ -24,6 +24,7 @@
<string name="cancel_cussess">取消成功</string>
<string name="receive_cussess">收货成功</string>
<string name="bound_success">绑定成功</string>
<string name="modify_phone_number">修改手机号</string>
<string name="next">下一步</string>
<string name="into">立即体验</string>
@@ -44,7 +45,7 @@
<string name="go_to_main">进入平台(%sS)</string>
<string name="time">(%s) 秒</string>
<string name="time">(%s) 秒后重发</string>
<string name="send_code">发送验证码</string>
<string name="login">登录</string>
<string name="register">注册</string>
@@ -505,6 +506,7 @@
<string name="input_addres_details">输入详细地址</string>
<string name="input_tag">选择标签</string>
<string name="input_phone_alert">输入正确手机号</string>
<string name="verification_code_sent">验证码已发送</string>
<string name="register_success">注册成功</string>
<string name="lost_success">找回成功</string>