diff --git a/module_base/src/main/res/drawable/bg_phone_card_header_gray.xml b/module_base/src/main/res/drawable/bg_phone_card_header_gray.xml
new file mode 100644
index 0000000..eb18e61
--- /dev/null
+++ b/module_base/src/main/res/drawable/bg_phone_card_header_gray.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
diff --git a/module_base/src/main/res/layout-sw600dp/item_image_select_new.xml b/module_base/src/main/res/layout-sw600dp/item_image_select_new.xml
new file mode 100644
index 0000000..b4c8eee
--- /dev/null
+++ b/module_base/src/main/res/layout-sw600dp/item_image_select_new.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/module_base/src/main/res/layout/item_image_select_new.xml b/module_base/src/main/res/layout/item_image_select_new.xml
index b4c8eee..76af315 100644
--- a/module_base/src/main/res/layout/item_image_select_new.xml
+++ b/module_base/src/main/res/layout/item_image_select_new.xml
@@ -1,4 +1,8 @@
+
@@ -12,15 +16,17 @@
android:id="@+id/rl"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_margin="5dp"
- android:background="@{bean.path.length() == 0 ? @color/color_f2 : @color/white}">
+ android:layout_margin="6dp"
+ android:background="@drawable/bg_phone_photo_add">
-
+ android:text="+"
+ android:textColor="@color/phone_text_hint"
+ android:textSize="24sp" />
= adapter.items.size) return
+ when (type) {
+ // 长按已选图片:切换删除角标(Bug #632:原先未处理长按,角标出不来导致无法删除)
+ R.id.rl -> {
+ val bean = adapter.getItem(position) as? FileBean ?: return
+ if (bean.path.isNotEmpty() && pageType.value != DetailsPageType.Details) {
+ bean.canDelete.set(!bean.canDelete.get())
+ }
}
+
+ R.id.iv_delete -> adapter.removeItem(position)
}
}
}
diff --git a/module_gjc/src/main/res/layout/activity_int_exp_move_edit.xml b/module_gjc/src/main/res/layout/activity_int_exp_move_edit.xml
index b468460..be22b06 100644
--- a/module_gjc/src/main/res/layout/activity_int_exp_move_edit.xml
+++ b/module_gjc/src/main/res/layout/activity_int_exp_move_edit.xml
@@ -235,43 +235,35 @@
-
+
-
-
+ android:orientation="vertical">
+ android:textColor="@color/white"
+ android:textSize="15sp"
+ android:textStyle="bold" />
+ app:spanCount="3" />
+
+
+
+
+
+
+
+
+
+