基础搭建

1：XxBar 左边返回点击事件
功能开发

app/src/main/java/com/xx/merchanthbh/data/http/ApiService.kt

@@ -94,7 +94,7 @@ interface ApiService {
     open fun getBoothList(
         @Query("status") status: String,
         @Query("affiliatedCompany") affiliatedCompany: String?,
-        @Query("params%5BmerchantCount%5D") BmerchantCount:String
+        @Query("params[merchantCount]") merchantCount:String
     ): Observable<BaseResponse<List<BoothBean>>>
 
     /**

app/src/main/res/layout/activity_activities_list.xml

@@ -21,6 +21,7 @@
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{activitiesViewModel.clickFinish}"
                 app:bar_title='@{@string/activity_center}'
                 app:layout_constraintTop_toTopOf="parent" />
 

app/src/main/res/layout/activity_add_product.xml

@@ -28,6 +28,7 @@
             app:layout_constraintTop_toTopOf="parent"
             android:layout_width="match_parent"
             android:layout_height="55dp"
+            on_click="@{viewModel.clickFinish}"
             android:background="@color/bg_grey"
             bar_title="@{@string/add_product}"
             />

app/src/main/res/layout/activity_appeal.xml

@@ -27,6 +27,7 @@
             bar_title="@{@string/add_appeal}"
             android:layout_width="match_parent"
             android:layout_height="55dp"
+            on_click="@{appealViewModel.clickFinish}"
             app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.core.widget.NestedScrollView

app/src/main/res/layout/activity_appeal_detail.xml

@@ -27,6 +27,7 @@
             bar_title="@{@string/detail_appeal}"
             android:layout_width="match_parent"
             android:layout_height="55dp"
+            on_click="@{appealDetailViewModel.clickFinish}"
             app:layout_constraintTop_toTopOf="parent"
             tools:layout_editor_absoluteX="0dp" />
 

app/src/main/res/layout/activity_appeal_edit.xml

@@ -28,6 +28,7 @@
             bar_title="@{@string/detail_appeal}"
             android:layout_width="match_parent"
             android:layout_height="55dp"
+            on_click="@{appealEditViewModel.clickFinish}"
             app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.core.widget.NestedScrollView

app/src/main/res/layout/activity_appeal_list.xml

@@ -23,6 +23,7 @@
         <com.xx.xxviewlibrary.witget.XxBar
             android:layout_width="match_parent"
             android:layout_height="55dp"
+            on_click="@{viewModel.clickFinish}"
             app:bar_title='@{@string/appeal_manager}' />
 
         <com.google.android.material.tabs.TabLayout

app/src/main/res/layout/activity_assistant_add.xml

@@ -23,6 +23,7 @@
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{assistantAddViewModel.clickFinish}"
                 app:bar_title='@{@string/assistant_add}'
                 app:layout_constraintTop_toTopOf="parent" />
             <!--        滚动轮-->

app/src/main/res/layout/activity_assistant_management.xml

@@ -26,6 +26,7 @@
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{assistantManagementViewModel.clickFinish}"
                 app:layout_constraintTop_toTopOf="parent"
                 app:bar_title='@{@string/assistant_management}'/>
             <LinearLayout

app/src/main/res/layout/activity_change_phone.xml

@@ -25,6 +25,7 @@
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{viewModel.clickFinish}"
                 app:bar_title='@{@string/changed_phone}'
                 app:layout_constraintTop_toTopOf="parent" />
             <!--        滚动轮-->

app/src/main/res/layout/activity_change_pwd.xml

@@ -24,6 +24,7 @@
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{pwdViewModel.clickFinish}"
                 app:bar_title='@{@string/change_password}'
                 app:layout_constraintTop_toTopOf="parent" />
             <!--        滚动轮-->

app/src/main/res/layout/activity_comm_web.xml

@@ -19,6 +19,7 @@
         <com.xx.xxviewlibrary.witget.XxBar
             android:layout_width="match_parent"
             android:layout_height="55dp"
+            on_click="@{viewModel.clickFinish}"
             app:bar_title='@{@string/appeal_manager}' />
 
 

app/src/main/res/layout/activity_consultation_list.xml

@@ -27,6 +27,7 @@
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{consultationViewModel.clickFinish}"
                 app:bar_title='@{@string/consultation_information}'
                 app:layout_constraintTop_toTopOf="parent" />
             <!--        滚动轮-->

app/src/main/res/layout/activity_material_info.xml

@@ -24,6 +24,7 @@
             android:id="@+id/bar"
             android:layout_width="match_parent"
             android:layout_height="55dp"
+            on_click="@{viewModel.clickFinish}"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"

app/src/main/res/layout/activity_merchant_enter.xml

@@ -18,6 +18,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{viewModel.clickFinish}"
             app:layout_constraintTop_toTopOf="parent"
             android:layout_width="match_parent"
             android:layout_height="55dp"

app/src/main/res/layout/activity_message.xml

@@ -23,6 +23,7 @@
         <com.xx.xxviewlibrary.witget.XxBar
             android:layout_width="match_parent"
             android:layout_height="55dp"
+            on_click="@{messageViewModel.clickFinish}"
             app:bar_title='@{@string/message_center}' />
 
         <com.google.android.material.tabs.TabLayout

app/src/main/res/layout/activity_message_detail.xml

@@ -30,6 +30,7 @@
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{messageDetailViewModel.clickFinish}"
                 app:bar_title='@{@string/message_detail}'
                 app:layout_constraintTop_toTopOf="parent" />
             <!--        滚动轮-->

app/src/main/res/layout/activity_order_create.xml

@@ -18,6 +18,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{viewModel.clickFinish}"
             app:layout_constraintTop_toTopOf="parent"
             android:layout_width="match_parent"
             android:layout_height="55dp"

app/src/main/res/layout/activity_order_detail.xml

@@ -28,6 +28,7 @@
 
             <com.xx.xxviewlibrary.witget.XxBar
                 android:id="@+id/bar"
+                on_click="@{viewModel.clickFinish}"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
                 app:bar_title='@{@string/order_detail}'

app/src/main/res/layout/activity_order_management.xml

@@ -29,6 +29,7 @@
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{orderViewModel.clickFinish}"
                 app:bar_title='@{@string/order_management}'
                 app:layout_constraintTop_toTopOf="parent" />
 

app/src/main/res/layout/activity_product_list.xml

@@ -23,6 +23,7 @@
         <com.xx.xxviewlibrary.witget.XxBar
             android:layout_width="match_parent"
             android:layout_height="55dp"
+            on_click="@{viewModel.clickFinish}"
             app:bar_title='@{@string/goods_management}' />
 
         <com.google.android.material.tabs.TabLayout

app/src/main/res/layout/activity_recruitment_list.xml

@@ -21,6 +21,7 @@
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{recruitmentViewModel.clickFinish}"
                 app:bar_title='@{@string/talent}'
                 app:layout_constraintTop_toTopOf="parent" />
             <!--滚动轮-->

app/src/main/res/layout/activity_share_list.xml

@@ -23,6 +23,7 @@
         <com.xx.xxviewlibrary.witget.XxBar
             android:layout_width="match_parent"
             android:layout_height="55dp"
+            on_click="@{viewModel.clickFinish}"
             app:bar_title='@{@string/share_total}' />
 
 

app/src/main/res/layout/activity_store_points.xml

@@ -30,6 +30,7 @@
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{storePointsViewModel.clickFinish}"
                 app:bar_title='@{@string/store_points}'
                 app:layout_constraintTop_toTopOf="parent" />
             <!--        滚动轮-->

app/src/main/res/layout/fragment_home.xml

@@ -21,6 +21,7 @@
             android:id="@+id/bar"
             android:layout_width="match_parent"
             android:layout_height="55dp"
+            on_click="@{homeViewModel.clickFinish}"
             app:layout_constraintTop_toTopOf="parent"
             app:bar_title='@{@string/home_title}'
             />

app/src/main/res/layout/fragment_huanbohai.xml

@@ -26,6 +26,7 @@
             android:id="@+id/bar"
             android:layout_width="match_parent"
             android:layout_height="55dp"
+            on_click="@{huanbohaiViewModel.clickFinish}"
             app:bar_title='@{@string/navigation_sea}'
             app:layout_constraintTop_toTopOf="parent" />
         <!--        滚动轮-->

consumer/src/main/res/layout/activity_activity_detail.xml

@@ -17,6 +17,7 @@
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
             bar_title="@{@string/navigation_sea}"
+            on_click="@{activityDetailViewModel.clickFinish}"
             android:layout_width="match_parent"
             android:layout_height="55dp" />
 

consumer/src/main/res/layout/activity_category.xml

@@ -19,6 +19,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{categoryViewModel.clickFinish}"
             bar_title="@{@string/navigation_sea}"
             android:layout_width="match_parent"
             android:layout_height="55dp"/>

consumer/src/main/res/layout/activity_change_phone.xml

@@ -22,6 +22,7 @@
 
             <com.xx.xxviewlibrary.witget.XxBar
                 android:id="@+id/bar"
+                on_click="@{phoneViewModel.clickFinish}"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
 

consumer/src/main/res/layout/activity_change_pwd.xml

@@ -24,6 +24,7 @@
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{pwdViewModel.clickFinish}"
                 app:bar_title='@{@string/change_password}'
                 app:layout_constraintTop_toTopOf="parent" />
             <!--        滚动轮-->

consumer/src/main/res/layout/activity_coupon_list.xml

@@ -18,6 +18,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{couponListViewModel.clickFinish}"
             app:layout_constraintTop_toTopOf="parent"
             android:layout_width="match_parent"
             android:layout_height="55dp"

consumer/src/main/res/layout/activity_credit_description.xml

@@ -17,6 +17,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{creditDescriptionViewModel.clickFinish}"
             bar_title="@{@string/navigation_sea}"
             android:layout_width="match_parent"
             android:layout_height="55dp" />

consumer/src/main/res/layout/activity_credit_detail.xml

@@ -21,6 +21,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{creditDetailViewModel.clickFinish}"
             bar_title="@{@string/navigation_sea}"
             android:layout_width="match_parent"
             android:layout_height="55dp" />

consumer/src/main/res/layout/activity_credit_order.xml

@@ -15,6 +15,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{creditOrderViewModel.clickFinish}"
             bar_title="@{@string/my_order}"
             android:layout_width="match_parent"
             android:layout_height="55dp"

consumer/src/main/res/layout/activity_credit_order_detail.xml

@@ -21,6 +21,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{creditOrderDetailViewModel.clickFinish}"
             bar_title="@{@string/navigation_sea}"
             android:layout_width="match_parent"
             android:layout_height="55dp" />

consumer/src/main/res/layout/activity_credits_exchange.xml

@@ -17,6 +17,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{creditsExchangeViewModel.clickFinish}"
             bar_title="@{@string/navigation_sea}"
             android:layout_width="match_parent"
             android:layout_height="55dp" />

consumer/src/main/res/layout/activity_credits_goods_detail.xml

@@ -15,6 +15,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{creditsGoodsDetailViewModel.clickFinish}"
             bar_title="@{@string/navigation_sea}"
             android:layout_width="match_parent"
             android:layout_height="55dp"/>

consumer/src/main/res/layout/activity_forget_pwd.xml

@@ -15,6 +15,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{forgetPwdViewModel.clickFinish}"
             bar_title="@{@string/register_account}"
             android:layout_width="match_parent"
             android:layout_height="55dp"/>

consumer/src/main/res/layout/activity_hbh.xml

@@ -15,6 +15,7 @@
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
             bar_title="@{@string/navigation_sea}"
+            on_click="@{hbhViewModel.clickFinish}"
             android:layout_width="match_parent"
             android:layout_height="55dp"/>
 

consumer/src/main/res/layout/activity_hot_sales.xml

@@ -17,6 +17,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{hotSalesViewModel.clickFinish}"
             bar_title="@{@string/navigation_sea}"
             android:layout_width="match_parent"
             android:layout_height="55dp"/>

consumer/src/main/res/layout/activity_logoff_first_step.xml

@@ -15,6 +15,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{logoffFirstStepViewModel.clickFinish}"
             bar_title="@{@string/register_account}"
             android:layout_width="match_parent"
             android:layout_height="55dp"/>

consumer/src/main/res/layout/activity_logoff_second_step.xml

@@ -15,6 +15,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{logoffSecondStepViewModel.clickFinish}"
             bar_title="@{@string/register_account}"
             android:layout_width="match_parent"
             android:layout_height="55dp"/>

consumer/src/main/res/layout/activity_message_center.xml

@@ -16,6 +16,7 @@
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
             bar_title="@{@string/my_order}"
+            on_click="@{messageCenterViewModel.clickFinish}"
             android:layout_width="match_parent"
             android:layout_height="55dp"
             app:layout_constraintTop_toTopOf="parent" />

consumer/src/main/res/layout/activity_message_detail.xml

@@ -16,6 +16,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{messageDetailViewModel.clickFinish}"
             bar_title="@{@string/navigation_sea}"
             android:layout_width="match_parent"
             android:layout_height="55dp" />

consumer/src/main/res/layout/activity_my_collection.xml

@@ -14,6 +14,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{myCollectionViewModel.clickFinish}"
             bar_title="@{@string/navigation_sea}"
             android:layout_width="match_parent"
             android:layout_height="55dp"/>

consumer/src/main/res/layout/activity_my_coupon.xml

@@ -21,6 +21,7 @@
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
             bar_title="@{@string/my_coupon}"
+            on_click="@{myCouponViewModel.clickFinish}"
             android:layout_width="match_parent"
             android:layout_height="55dp"
             app:layout_constraintTop_toTopOf="parent" />

consumer/src/main/res/layout/activity_my_credit.xml

@@ -17,6 +17,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{myCreditViewModel.clickFinish}"
             bar_title="@{@string/navigation_sea}"
             android:layout_width="match_parent"
             android:layout_height="55dp" />

consumer/src/main/res/layout/activity_new_products.xml

@@ -15,6 +15,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{newProductsViewModel.clickFinish}"
             bar_title="@{@string/navigation_sea}"
             android:layout_width="match_parent"
             android:layout_height="55dp"/>

consumer/src/main/res/layout/activity_news_detail.xml

@@ -17,6 +17,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{newsDetailViewModel.clickFinish}"
             bar_title="@{@string/navigation_sea}"
             android:layout_width="match_parent"
             android:layout_height="55dp" />

consumer/src/main/res/layout/activity_order.xml

@@ -15,6 +15,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{orderViewModel.clickFinish}"
             bar_title="@{@string/my_order}"
             android:layout_width="match_parent"
             android:layout_height="55dp"

consumer/src/main/res/layout/activity_order_detail.xml

@@ -21,6 +21,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{orderDetailViewModel.clickFinish}"
             bar_title="@{@string/navigation_sea}"
             android:layout_width="match_parent"
             android:layout_height="55dp" />

consumer/src/main/res/layout/activity_privacy_clause.xml

@@ -15,6 +15,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{privacyClauseViewModel.clickFinish}"
             bar_title="@{@string/my_order}"
             android:layout_width="match_parent"
             android:layout_height="55dp"

consumer/src/main/res/layout/activity_recruit.xml

@@ -14,6 +14,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{recruitViewModel.clickFinish}"
             bar_title="@{@string/navigation_sea}"
             android:layout_width="match_parent"
             android:layout_height="55dp"/>

consumer/src/main/res/layout/activity_recruit_detail.xml

@@ -14,6 +14,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{hbhViewModel.clickFinish}"
             bar_title="@{@string/navigation_sea}"
             android:layout_width="match_parent"
             android:layout_height="55dp"/>

consumer/src/main/res/layout/activity_register.xml

@@ -14,6 +14,7 @@
         android:background="@color/white">
 
         <com.xx.xxviewlibrary.witget.XxBar
+            on_click="@{registerViewModel.clickFinish}"
             android:id="@+id/bar"
             bar_title="@{@string/register_account}"
             android:layout_width="match_parent"

consumer/src/main/res/layout/activity_settings.xml

@@ -16,6 +16,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{settingsViewModel.clickFinish}"
             bar_title="@{@string/setting}"
             android:layout_width="match_parent"
             android:layout_height="55dp"

consumer/src/main/res/layout/activity_shop_goods_detail.xml

@@ -17,6 +17,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{shopGoodsDetailViewModel.clickFinish}"
             bar_title="@{@string/navigation_sea}"
             android:layout_width="match_parent"
             android:layout_height="55dp" />

consumer/src/main/res/layout/activity_store_services.xml

@@ -16,6 +16,7 @@
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
             bar_title="@{@string/my_order}"
+            on_click="@{storeServicesViewModel.clickFinish}"
             android:layout_width="match_parent"
             android:layout_height="55dp"
             app:layout_constraintTop_toTopOf="parent" />

consumer/src/main/res/layout/activity_user_agreement.xml

@@ -15,6 +15,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{userAgreementViewModel.clickFinish}"
             bar_title="@{@string/my_order}"
             android:layout_width="match_parent"
             android:layout_height="55dp"

hbhbcompany/src/main/res/layout/activity_activities_list.xml

@@ -19,6 +19,7 @@
         android:fitsSystemWindows="true">
             <com.xx.xxviewlibrary.witget.XxBar
                 android:id="@+id/bar"
+                on_click="@{activitiesViewModel.clickFinish}"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
                 app:bar_title='@{@string/activity_center}'

hbhbcompany/src/main/res/layout/activity_appeal.xml

@@ -22,6 +22,7 @@
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
             bar_title="@{@string/add_appeal}"
+            on_click="@{appealViewModel.clickFinish}"
             android:layout_width="match_parent"
             android:layout_height="55dp"
             app:layout_constraintTop_toTopOf="parent" />

hbhbcompany/src/main/res/layout/activity_appeal_allocation.xml

@@ -27,6 +27,7 @@
             android:id="@+id/bar"
             bar_title="@{@string/detail_appeal}"
             android:layout_width="match_parent"
+            on_click="@{appealAllocationViewModel.clickFinish}"
             android:layout_height="55dp"
             app:layout_constraintTop_toTopOf="parent"
             tools:layout_editor_absoluteX="0dp" />

hbhbcompany/src/main/res/layout/activity_appeal_detail.xml

@@ -25,6 +25,7 @@
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
             bar_title="@{@string/detail_appeal}"
+            on_click="@{appealDetailViewModel.clickFinish}"
             android:layout_width="match_parent"
             android:layout_height="55dp"
             app:layout_constraintTop_toTopOf="parent"

hbhbcompany/src/main/res/layout/activity_appeal_list.xml

@@ -23,6 +23,7 @@
         <com.xx.xxviewlibrary.witget.XxBar
             android:layout_width="match_parent"
             android:layout_height="55dp"
+            on_click="@{viewModel.clickFinish}"
             app:bar_title='@{@string/appeal_manager}' />
 
         <com.google.android.material.tabs.TabLayout

hbhbcompany/src/main/res/layout/activity_audit_list.xml

@@ -23,6 +23,7 @@
         <com.xx.xxviewlibrary.witget.XxBar
             android:layout_width="match_parent"
             android:layout_height="55dp"
+            on_click="@{viewModel.clickFinish}"
             app:bar_title='@{@string/merchant_audit}' />
 
         <com.google.android.material.tabs.TabLayout

hbhbcompany/src/main/res/layout/activity_change_pwd.xml

@@ -22,6 +22,7 @@
 
             <com.xx.xxviewlibrary.witget.XxBar
                 android:id="@+id/bar"
+                on_click="@{pwdViewModel.clickFinish}"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
                 app:bar_title='@{@string/change_password}'

hbhbcompany/src/main/res/layout/activity_confirm_receipt_detail.xml

@@ -30,6 +30,7 @@
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{confirmReceiptViewModel.clickFinish}"
                 app:bar_title='@{@string/order_detail}'
                 app:layout_constraintTop_toTopOf="parent" />
             <!--        滚动轮-->

hbhbcompany/src/main/res/layout/activity_consultation_list.xml

@@ -28,6 +28,7 @@
             <com.xx.xxviewlibrary.witget.XxBar
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
+                on_click="@{consultationViewModel.clickFinish}"
                 android:layout_height="55dp"
                 app:bar_title='@{@string/consultation_information}'
                 app:layout_constraintTop_toTopOf="parent" />

hbhbcompany/src/main/res/layout/activity_manager_audit.xml

@@ -22,6 +22,7 @@
 
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
+            on_click="@{viewModel.clickFinish}"
             app:layout_constraintTop_toTopOf="parent"
             android:layout_width="match_parent"
             android:layout_height="55dp"

hbhbcompany/src/main/res/layout/activity_merchant_audit_info.xml

@@ -19,6 +19,7 @@
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
             app:layout_constraintTop_toTopOf="parent"
+            on_click="@{viewModel.clickFinish}"
             android:layout_width="match_parent"
             android:layout_height="55dp"
             bar_title='@{@string/merchant_audit_info}'

hbhbcompany/src/main/res/layout/activity_message.xml

@@ -22,6 +22,7 @@
         <com.xx.xxviewlibrary.witget.XxBar
             android:layout_width="match_parent"
             android:layout_height="55dp"
+            on_click="@{messageViewModel.clickFinish}"
             app:bar_title='@{@string/message_center}' />
 
         <com.google.android.material.tabs.TabLayout

hbhbcompany/src/main/res/layout/activity_message_detail.xml

@@ -30,6 +30,7 @@
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{messageDetailViewModel.clickFinish}"
                 app:bar_title='@{@string/message_detail}'
                 app:layout_constraintTop_toTopOf="parent" />
             <!--        滚动轮-->

hbhbcompany/src/main/res/layout/activity_my_comment.xml

@@ -29,6 +29,7 @@
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{myCommentViewModel.clickFinish}"
                 app:bar_title='@{@string/my_comments}'
                 app:layout_constraintTop_toTopOf="parent" />
 

hbhbcompany/src/main/res/layout/activity_mylike.xml

@@ -25,6 +25,7 @@
             android:id="@+id/bar"
             android:layout_width="match_parent"
             android:layout_height="55dp"
+            on_click="@{myLikeViewModel.clickFinish}"
             app:bar_title='@{@string/my_like}'
             app:layout_constraintTop_toTopOf="parent" />
         <!--        滚动轮-->

hbhbcompany/src/main/res/layout/activity_order_management.xml

@@ -29,6 +29,7 @@
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{orderViewModel.clickFinish}"
                 app:bar_title='@{@string/order_management}'
                 app:layout_constraintTop_toTopOf="parent" />
 

hbhbcompany/src/main/res/layout/activity_point_order_detail.xml

@@ -30,6 +30,7 @@
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{pointOrderDetailViewModel.clickFinish}"
                 app:bar_title='@{@string/order_detail}'
                 app:layout_constraintTop_toTopOf="parent" />
             <!--        滚动轮-->

hbhbcompany/src/main/res/layout/activity_product_info.xml

@@ -18,6 +18,7 @@
             <com.xx.xxviewlibrary.witget.XxBar
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{viewModel.clickFinish}"
                 app:bar_title='@{@string/merchant_audit}' />
 
             <com.google.android.material.tabs.TabLayout

hbhbcompany/src/main/res/layout/activity_product_list.xml

@@ -21,6 +21,7 @@
         <com.xx.xxviewlibrary.witget.XxBar
             android:id="@+id/bar"
             android:layout_width="match_parent"
+            on_click="@{viewModel.clickFinish}"
             android:layout_height="55dp"
             app:bar_title="@{viewModel.title}"
             app:layout_constraintTop_toTopOf="parent" />

hbhbcompany/src/main/res/layout/activity_recruitment_list.xml

@@ -21,6 +21,7 @@
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{recruitmentViewModel.clickFinish}"
                 app:bar_title='@{@string/talent}'
                 app:layout_constraintTop_toTopOf="parent" />
             <!--滚动轮-->

hbhbcompany/src/main/res/layout/activity_sale_order_detail.xml

@@ -30,6 +30,7 @@
                 android:id="@+id/bar"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
+                on_click="@{orderDetailViewModel.clickFinish}"
                 app:bar_title='@{@string/order_detail}'
                 app:layout_constraintTop_toTopOf="parent" />
             <!--        滚动轮-->

mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java

@@ -2,6 +2,7 @@ package me.goldze.mvvmhabit.base;
 
 import android.app.Application;
 import android.os.Bundle;
+import android.view.View;
 
 import java.lang.ref.WeakReference;
 import java.util.Calendar;
@@ -164,6 +165,12 @@ public class BaseViewModel<M extends BaseModel> extends AndroidViewModel impleme
         uc.startPhotoEvent.postValue(photomap);
     }
 
+    /**
+     * 获取图片
+     * @param hasCamera 是否有照相机功能
+     * @param maxCount 选则最大数量
+     * @param callback
+     */
     public void startPhotoPage(boolean hasCamera,int maxCount, SelectCallback callback)
     {
         Map<String, Object> photomap = new HashMap<>();
@@ -225,6 +232,14 @@ public class BaseViewModel<M extends BaseModel> extends AndroidViewModel impleme
     }
 
 
+    public View.OnClickListener clickFinish=new View.OnClickListener() {
+        @Override
+        public void onClick(View view) {
+            finish();
+        }
+    };
+
+
 
     @Override
     public void onAny(LifecycleOwner owner, Lifecycle.Event event) {

xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxBar.kt

@@ -66,6 +66,14 @@ class XxBar  constructor(activity: Context?, attrs: AttributeSet?) : RelativeLay
             view.tv_title?: return
             view.tv_title?.setText(title)
         }
+
+        @BindingAdapter("on_click")
+        @JvmStatic
+        fun setOnCLick(view: XxBar, click:View.OnClickListener)
+        {
+            view.img_left?: return
+            view.img_left?.setOnClickListener(click)
+        }
     }
 
 
@@ -76,6 +84,7 @@ class XxBar  constructor(activity: Context?, attrs: AttributeSet?) : RelativeLay
         img_left = view.findViewById<ImageButton>(R.id.bar_left_icon)
 
 
+
     }