1. 更改 <attr name="type"> 为 <attr name="operationButtonZhongjhType"> 避…

…免与别的项目冲突
zhongjhATC · Mar 15, 2023 · 56a502f · 56a502f
1 parent c0cb974
commit 56a502f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/multilibrary/src/main/res/layout/layout_photovideo_operate_zjh.xml b/multilibrary/src/main/res/layout/layout_photovideo_operate_zjh.xml
@@ -46,7 +46,7 @@
         app:layout_constraintEnd_toStartOf="@+id/guideline28"
         app:layout_constraintStart_toStartOf="@+id/guideline12"
         app:layout_constraintTop_toTopOf="@+id/btnClickOrLong"
-        app:type="confirm"
+        app:operationButtonZhongjhType="confirm"
         tools:visibility="visible" />
 
     <!-- 右侧的确认按钮  -->
@@ -59,7 +59,7 @@
         app:layout_constraintEnd_toStartOf="@+id/guideline88"
         app:layout_constraintStart_toStartOf="@+id/guideline72"
         app:layout_constraintTop_toTopOf="@+id/btnClickOrLong"
-        app:type="confirm"
+        app:operationButtonZhongjhType="confirm"
         tools:visibility="visible" />
 
     <!-- 中间的操作按钮 -->

diff --git a/multilibrary/src/main/res/layout/layout_soundrecording_operate_zjh.xml b/multilibrary/src/main/res/layout/layout_soundrecording_operate_zjh.xml
@@ -28,7 +28,7 @@
         app:layout_constraintEnd_toStartOf="@+id/guideline28"
         app:layout_constraintStart_toStartOf="@+id/guideline12"
         app:layout_constraintTop_toTopOf="@+id/btnClickOrLong"
-        app:type="confirm"
+        app:operationButtonZhongjhType="confirm"
         tools:visibility="visible" />
 
     <!-- 右侧的确认按钮  -->
@@ -41,7 +41,7 @@
         app:layout_constraintEnd_toStartOf="@+id/guideline88"
         app:layout_constraintStart_toStartOf="@+id/guideline72"
         app:layout_constraintTop_toTopOf="@+id/btnClickOrLong"
-        app:type="confirm"
+        app:operationButtonZhongjhType="confirm"
         tools:visibility="visible" />
 
     <!-- 中间的操作按钮 -->

diff --git a/multilibrary/src/main/res/values/attrs.xml b/multilibrary/src/main/res/values/attrs.xml
@@ -53,7 +53,7 @@
 
     <declare-styleable name="OperationButtonZhongjh">
         <!-- 操作类型的按钮 -->
-        <attr name="type">
+        <attr name="operationButtonZhongjhType">
             <enum name="cancel" value="0" />
             <enum name="confirm" value="1" />
         </attr>