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

优化

Browse Source
This commit is contained in:
fengjignqi
2026-08-07 08:33:52 +08:00
parent c6eeb1321c
commit 9806e66790
35 changed files with 1529 additions and 2364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,6 +88,7 @@
android:textColorHint="@color/textSecondColor"
android:maxLength="11"
android:maxLines="1"
android:singleLine="true"
android:inputType="number"
android:textSize="14sp"></com.ck.ckcollar.app.widget.CKEditView>
@@ -165,7 +166,8 @@
android:textColorHint="@color/textSecondColor"
android:maxLength="50"
android:maxLines="3"
android:textSize="14sp"></com.ck.ckcollar.app.widget.CKEditView>
android:textSize="14sp"
android:singleLine="true"></com.ck.ckcollar.app.widget.CKEditView>
</com.ck.ckcollar.app.widget.CKLinearLayout>

27
app/src/main/res/layout/fragment_health.xml
View File

@@ -9,13 +9,22 @@
android:background="?attr/mainBackground"
android:orientation="vertical">
<androidx.core.widget.NestedScrollView
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.scwang.smartrefresh.layout.header.ClassicsHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.ck.ckcollar.app.widget.CKLinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@@ -223,8 +232,9 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:nestedScrollingEnabled="false"
/>
</com.ck.ckcollar.app.widget.CKLinearLayout>
@@ -232,17 +242,8 @@
</androidx.core.widget.NestedScrollView>
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<com.scwang.smartrefresh.layout.header.ClassicsHeader
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<!--内容-->
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
<!--内容-->
</com.ck.ckcollar.app.widget.CKLinearLayout>

9
app/src/main/res/layout/layout_item_ai_customer_message.xml
View File

@@ -12,8 +12,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="20dp"
android:visibility="gone"
>
android:visibility="gone">
<com.ck.ckcollar.app.widget.CKRoundImageView
android:id="@+id/imageFrom"
@@ -27,7 +26,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:paddingRight="80dp"
android:paddingRight="20dp"
android:orientation="vertical">
@@ -54,7 +53,7 @@
android:background="@drawable/bg_message_from"
android:padding="8dp"
android:layout_marginTop="3dp"
android:maxWidth="200dp"
android:maxWidth="280dp"
android:textSize="14sp"></com.ck.ckcollar.app.widget.CKTextView>
@@ -68,7 +67,7 @@
android:paddingVertical="3dp"
android:paddingHorizontal="5dp"
android:layout_marginTop="3dp"
android:maxWidth="200dp"
android:maxWidth="280dp"
android:visibility="gone"
></com.ck.ckcollar.app.widget.CKImageView>
</com.ck.ckcollar.app.widget.CKLinearLayout>

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

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

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

@@ -69,7 +69,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

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

@@ -75,7 +75,7 @@
<string name="add_pet">添加宠物</string>
<string name="intelligent_collar_device">智能项圈设备</string>
<string name="unbound">未绑定</string>
<string name="bound_device_alert">宠遇智能项圈，科技护宠每一刻</string>
<string name="bound_device_alert">宠盾智能项圈，科技护宠每一刻</string>
<string name="scan">扫一扫</string>
<string name="equipment_positioning">设备定位</string>
<string name="no_position">当前位置：当前无定位</string>
@@ -122,6 +122,7 @@
<string name="select_vaccination">请选择是否接种</string>
<string name="upload_photos">上传照片</string>
<string name="please_dupload_photos">请上传照片</string>
<string name="read_photo_failed">图片读取失败，请重新选择</string>
<!-- 宠物顾问模块 -->
<string name="pet_advisor">宠物顾问（早 9:00-晚 21:00）</string>
<string name="pet_advisor2">宠物顾问</string>
@@ -319,6 +320,7 @@
<string name="input_name2">请输入姓名</string>
<string name="contact_info">联系方式</string>
<string name="input_contact_info">请输入联系方式</string>
<string name="invalid_phone_format">请输入正确的手机号</string>
<string name="return_reason">退回理由</string>
<string name="input_return_reason">请输入退回理由</string>
<string name="coll_num">项圈编号</string>
@@ -481,7 +483,7 @@
<string name="return_amount">退款</string>
<string name="make_phone">打电话</string>
<string name="view_express">查看物流</string>
<string name="choost_pet">选择宠物</string>
<string name="choost_pet">宠物名字</string>
<string name="add_success">添加成功</string>
<string name="edit_success">修改成功</string>
<string name="delete_success">删除成功</string>
@@ -577,7 +579,7 @@
<string name="manage">管理</string>
<string name="over_stock">库存不足</string>
<string name="balance_over">余额不足</string>
<string name="points_over">余额不足</string>
<string name="points_over">积分不足</string>
<string name="please_select_data">请选择商品</string>
<string name="please_select_payment_method">请选择支付方式</string>
<string name="old_new_password_both">新密码和旧密码相同</string>