Skip to content

HBHAndroid
HBHAndroid
Commit edaa0f19 authored by 杨秀秀's avatar 杨秀秀
Browse files
Options

基础搭建 

功能开发
1：bug 修复
parent 5ba07eb6
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 216 deletions
.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09__Changes_.xml deleted 100644 → 0
View file @ 5ba07eb6
<changelist name="Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]" date="1688612958396" recycled="false" toDelete="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 2023/7/6 11:09 [Changes]" />
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/checksums/md5-checksums.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/checksums/md5-checksums.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/md5-checksums.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/fileHashes/resourceHashesCache.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/fileHashes/resourceHashesCache.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/resourceHashesCache.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/buildOutputCleanup/buildOutputCleanup.lock" />
<option name="AFTER_PATH" value=".gradle/buildOutputCleanup/buildOutputCleanup.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/buildOutputCleanup.lock" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/checksums/sha1-checksums.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/checksums/sha1-checksums.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/sha1-checksums.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/checksums/checksums.lock" />
<option name="AFTER_PATH" value=".gradle/8.0/checksums/checksums.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/checksums.lock" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/executionHistory/executionHistory.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/executionHistory/executionHistory.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/executionHistory.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/fileHashes/fileHashes.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/fileHashes/fileHashes.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/fileHashes.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/file-system.probe" />
<option name="AFTER_PATH" value=".gradle/file-system.probe" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/file-system.probe" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/buildOutputCleanup/outputFiles.bin" />
<option name="AFTER_PATH" value=".gradle/buildOutputCleanup/outputFiles.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/outputFiles.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/fileHashes/fileHashes.lock" />
<option name="AFTER_PATH" value=".gradle/8.0/fileHashes/fileHashes.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/fileHashes.lock" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/executionHistory/executionHistory.lock" />
<option name="AFTER_PATH" value=".gradle/8.0/executionHistory/executionHistory.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/executionHistory.lock" />
</binary>
</changelist>
\ No newline at end of file
.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52__Changes_.xml deleted 100644 → 0
View file @ 5ba07eb6
<changelist name="Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]" date="1688644345440" recycled="false" toDelete="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 2023/7/6 19:52 [Changes]" />
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/executionHistory/executionHistory.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/executionHistory/executionHistory.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/executionHistory.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/fileHashes/resourceHashesCache.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/fileHashes/resourceHashesCache.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/resourceHashesCache.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/buildOutputCleanup/buildOutputCleanup.lock" />
<option name="AFTER_PATH" value=".gradle/buildOutputCleanup/buildOutputCleanup.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/buildOutputCleanup.lock" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/file-system.probe" />
<option name="AFTER_PATH" value=".gradle/file-system.probe" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/file-system.probe" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/fileHashes/fileHashes.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/fileHashes/fileHashes.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/fileHashes.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/buildOutputCleanup/outputFiles.bin" />
<option name="AFTER_PATH" value=".gradle/buildOutputCleanup/outputFiles.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/outputFiles.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/fileHashes/fileHashes.lock" />
<option name="AFTER_PATH" value=".gradle/8.0/fileHashes/fileHashes.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/fileHashes.lock" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/executionHistory/executionHistory.lock" />
<option name="AFTER_PATH" value=".gradle/8.0/executionHistory/executionHistory.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/executionHistory.lock" />
</binary>
</changelist>
\ No newline at end of file
.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_16_30__Changes_.xml deleted 100644 → 0
View file @ 5ba07eb6
<changelist name="Uncommitted_changes_before_Update_at_2023_7_7_16_30_[Changes]" date="1688718630826" recycled="false" toDelete="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_16_30_[Changes]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 2023/7/7 16:30 [Changes]" />
</changelist>
\ No newline at end of file
.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_17_21__Changes_.xml deleted 100644 → 0
View file @ 5ba07eb6
<changelist name="Uncommitted_changes_before_Update_at_2023_7_7_17_21_[Changes]" date="1688721717548" recycled="false" toDelete="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_17_21_[Changes]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 2023/7/7 17:21 [Changes]" />
</changelist>
\ No newline at end of file
.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08__Changes_.xml deleted 100644 → 0
View file @ 5ba07eb6
<changelist name="Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]" date="1688692122650" recycled="false" toDelete="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 2023/7/7 9:08 [Changes]" />
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/fileHashes/resourceHashesCache.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/fileHashes/resourceHashesCache.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/resourceHashesCache.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/wode_img_bg.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/wode_img_bg.png" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/tab_icon_home_default.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/tab_icon_home_default.png" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/tab_icon_wode_selected.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/tab_icon_wode_selected.png" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/wode_icon_xieyi.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/wode_icon_xieyi.png" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/file-system.probe" />
<option name="AFTER_PATH" value=".gradle/file-system.probe" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/file-system.probe" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/fileHashes/fileHashes.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/fileHashes/fileHashes.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/fileHashes.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/buildOutputCleanup/outputFiles.bin" />
<option name="AFTER_PATH" value=".gradle/buildOutputCleanup/outputFiles.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/outputFiles.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/wode_icon_qingchu.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/wode_icon_qingchu.png" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/executionHistory/executionHistory.lock" />
<option name="AFTER_PATH" value=".gradle/8.0/executionHistory/executionHistory.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/executionHistory.lock" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/buildOutputCleanup/buildOutputCleanup.lock" />
<option name="AFTER_PATH" value=".gradle/buildOutputCleanup/buildOutputCleanup.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/buildOutputCleanup.lock" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/tab_icon_huanbohai_default.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/tab_icon_huanbohai_default.png" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/wode_icon_gengxin.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/wode_icon_gengxin.png" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/wode_img_female.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/wode_img_female.png" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/executionHistory/executionHistory.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/executionHistory/executionHistory.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/executionHistory.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/wode_icon_genghuan.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/wode_icon_genghuan.png" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/wode_icon_xiugaimima.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/wode_icon_xiugaimima.png" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/fileHashes/fileHashes.lock" />
<option name="AFTER_PATH" value=".gradle/8.0/fileHashes/fileHashes.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/fileHashes.lock" />
</binary>
</changelist>
\ No newline at end of file
app/src/main/java/com/xx/merchanthbh/ui/bill/BillListActivity.kt
View file @ edaa0f19
......@@ -90,6 +90,7 @@ class BillListActivity() : BaseActivity<ActivityBillListBinding, BillListViewMod
}
viewModel.page=1;
binding.refresh.resetNoMoreData()
viewModel.getBillList()
}
dataDialog.show()
......@@ -107,6 +108,7 @@ class BillListActivity() : BaseActivity<ActivityBillListBinding, BillListViewMod
}
viewModel.page=1;
binding.refresh.resetNoMoreData()
viewModel.getBillList()
}
dataDialog.show()
......@@ -123,7 +125,7 @@ class BillListActivity() : BaseActivity<ActivityBillListBinding, BillListViewMod
override fun onRefresh(refreshLayout: RefreshLayout) {
viewModel.page = 1;
viewModel.getBillList();
binding.refresh.setEnableLoadMore(true)
binding.refresh.resetNoMoreData()
}
override fun onLoadMore(refreshLayout: RefreshLayout) {
......
app/src/main/java/com/xx/merchanthbh/ui/electric/ElectricListAdapter.kt
View file @ edaa0f19
......@@ -11,7 +11,7 @@ import com.xx.xxviewlibrary.base.xxBaseRecyclerViewAdapter
class ElectricListAdapter (context: Context): xxBaseRecyclerViewAdapter<ItemElectricListBinding, EletricListBean>(context){
var select:Int=0;
var select:Int=-1;
override fun initLayout(): Int {
return R.layout.item_electric_list
......
app/src/main/java/com/xx/merchanthbh/ui/electric/ElectricPayActivity.kt
View file @ edaa0f19
......@@ -3,6 +3,7 @@ package com.xx.merchanthbh.ui.electric
import android.os.Bundle
import android.text.Editable
import android.text.TextWatcher
import android.view.View
import com.xx.merchanthbh.BR
import com.xx.merchanthbh.R
import com.xx.merchanthbh.data.http.requst.ElectricPayRequest
......@@ -41,6 +42,7 @@ class ElectricPayActivity: BaseActivity<ActivityElectricPayBinding, ElectricPayV
viewModel.adapter.setOnItemClick { position, data ->
viewModel.adapter.select=position
viewModel.getElectricInfo(data)
viewModel.first.set(View.VISIBLE)
viewModel.adapter.notifyDataSetChanged()
}
......
app/src/main/java/com/xx/merchanthbh/ui/electric/ElectricPayViewModel.java
View file @ edaa0f19
......@@ -32,6 +32,7 @@ import com.xx.merchanthbh.ui.bill.BillListActivity;
import com.xx.merchanthbh.ui.consult.ConsultationViewModel;
import com.xx.xxviewlibrary.base.AppManager;
import com.xx.xxviewlibrary.base.xxBaseDialog;
import com.xx.xxviewlibrary.comm.CommTextDialog;
import com.xx.xxviewlibrary.comm.RefuseDialogBean;
import org.json.JSONException;
......@@ -57,6 +58,11 @@ public class ElectricPayViewModel extends BaseViewModel<ElectricPayRequest> {
//电表详情
public ObservableField<ElectricInfoBean> electricInfo=new ObservableField<>();
//初始化隐藏
public ObservableField<Integer> first=new ObservableField<>(View.GONE);
//充值金额
public int price=0;
......@@ -100,7 +106,6 @@ public class ElectricPayViewModel extends BaseViewModel<ElectricPayRequest> {
if (resultBean.getItemList().size()>=1)
{
adapter.mList=resultBean.getItemList();
getElectricInfo(resultBean.getItemList().get(0));
adapter.notifyDataSetChanged();
//放入电表列表数据
......@@ -175,6 +180,17 @@ public class ElectricPayViewModel extends BaseViewModel<ElectricPayRequest> {
UnifyPayPlugin.getInstance(context).sendPayRequest(msg);
}
showCommTextDialog(new RefuseDialogBean("是否完成支付", "完成支付", "未完成支付"), new CommTextDialog.onAcceptCallBack() {
@Override
public void acceptBack() {
startActivity(BillListActivity.class);
}
@Override
public void refuseBack() {
}
});
}
@Override
......@@ -184,6 +200,10 @@ public class ElectricPayViewModel extends BaseViewModel<ElectricPayRequest> {
});
}
/**
* 支付
* @param view
*/
public void pay(View view)
{
PayWayDialog dialog=new PayWayDialog(AppManager.getAppManager().currentActivity());
......
app/src/main/res/layout/activity_electric_pay.xml
View file @ edaa0f19
......@@ -150,6 +150,7 @@
android:orientation="vertical"
android:paddingTop="17dp"
android:paddingLeft="13dp"
android:visibility="@{viewModel.first}"
android:paddingRight="13dp"
android:background="@drawable/bg_white_radius_12"
android:layout_marginTop="13dp">
......@@ -180,13 +181,6 @@
android:layout_height="wrap_content"
android:layout_marginBottom="13dp"
xft_title="@{@string/electric_id}"
xft_content="@{String.valueOf(viewModel.electricInfo.itemId)}"
/>
<com.xx.xxviewlibrary.witget.XxFormMsg
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="13dp"
xft_title="@{@string/electric_address}"
xft_content="@{viewModel.electricInfo.meterAddress}"
/>
......@@ -200,6 +194,7 @@
android:paddingTop="17dp"
android:paddingLeft="13dp"
android:paddingRight="13dp"
android:visibility="@{viewModel.first}"
android:gravity="center_horizontal"
android:paddingBottom="17dp"
android:background="@drawable/bg_white_radius_12"
......
app/src/main/res/layout/item_electric_list.xml
View file @ edaa0f19
......@@ -21,7 +21,7 @@
<TextView
style="@style/xxTextContent"
android:textColor="@color/text_foreground"
android:text="@{String.valueOf(data.itemId)}"
android:text="@{data.meterAddress}"
/>
<ImageView
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment