Skip to content

T
TopPay
Commit 599fa19f by qyw
Options

查询ok

parent 8f373818
Showing with 642 additions and 71 deletions
TOP_Pay/app/build.gradle
...@@ -11,6 +11,10 @@ android { ...@@ -11,6 +11,10 @@ android {
versionCode 120 versionCode 120
versionName "1.2.0" versionName "1.2.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
ndk {
// 设置支持的SO库架构
abiFilters 'armeabi' //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
}
} }
buildTypes { buildTypes {
release { release {
...@@ -57,14 +61,17 @@ dependencies { ...@@ -57,14 +61,17 @@ dependencies {
compile 'com.gjiazhe:wavesidebar:1.3' compile 'com.gjiazhe:wavesidebar:1.3'
compile 'com.nbsp:library:1.6' compile 'com.nbsp:library:1.6'
compile 'com.github.sendtion:XRichText:1.1' compile 'com.github.sendtion:XRichText:1.1'
compile 'me.yokeyword:swipebackfragment:0.3.0' compile 'me.yokeyword:swipebackfragment:0.3+' +
compile 'com.github.Hitomis.transferee:Transferee:v1.0.0' '0'
compile 'com.github.Hitomis.transferee:GlideLoader:v1.0.0' // load with glide
compile 'com.github.Hitomis.transferee:UniversalLoader:v1.0.0'
// load with universal-image-loader // load with universal-image-loader
compile project(path: ':lib-zxing') compile project(path: ':lib-zxing')
compile 'pub.devrel:easypermissions:0.2.0' compile 'pub.devrel:easypermissions:0.2.0'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
compile 'com.github.w446108264:XhsEmoticonsKeyboard:2.0.3' compile 'com.github.w446108264:XhsEmoticonsKeyboard:2.0.3'
compile 'com.github.w446108264:AndroidEmoji:1.3-withsource' compile 'com.github.w446108264:AndroidEmoji:1.3-withsource'
compile 'com.tencent.bugly:crashreport:latest.release'
//其中latest.release指代最新Bugly SDK版本号，也可以指定明确的版本号，例如2.1.9
compile 'com.tencent.bugly:nativecrashreport:latest.release'
//其中latest.release指代最新Bugly NDK版本号，也可以指定明确的版本号，例如3.0
} }
TOP_Pay/app/src/main/AndroidManifest.xml
...@@ -4,13 +4,9 @@ ...@@ -4,13 +4,9 @@
<!-- To auto-complete the email text field in the login form with the user's emails --> <!-- To auto-complete the email text field in the login form with the user's emails -->
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" /> <uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.READ_PROFILE" /> <uses-permission android:name="android.permission.READ_PROFILE" />
<uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.CALL_PHONE" />
<uses-permission android:name="android.permission.SEND_SMS" />
<!-- SDCard中创建与删除文件权限 --> <!-- SDCard中创建与删除文件权限 -->
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" /> <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<!-- 向SDCard写入数据权限 --> <!-- 向SDCard写入数据权限 -->
...@@ -21,10 +17,16 @@ ...@@ -21,10 +17,16 @@
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.FLASHLIGHT" /> <uses-permission android:name="android.permission.FLASHLIGHT" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_LOGS" />
<uses-feature android:name="android.hardware.camera" /> <uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" /> <uses-feature android:name="android.hardware.camera.autofocus" />
<application <application
android:name=".common.AppContext" android:name=".common.AppContext"
android:allowBackup="true" android:allowBackup="true"
......
TOP_Pay/app/src/main/java/com/ifavine/pay/adapter/ConsumRecordReportAdapter.java 0 → 100644
package com.ifavine.pay.adapter;
import android.content.Context;
import android.widget.TextView;
import com.ifavine.pay.R;
import com.ifavine.pay.ui.base.ListBaseAdapter;
import com.ifavine.pay.ui.base.SuperViewHolder;
import com.ifavine.pay.vo.LocalRecordReport;
/**
* Created by Administrator on 2018/10/25.
*/
public class ConsumRecordReportAdapter extends ListBaseAdapter<LocalRecordReport> {
public ConsumRecordReportAdapter(Context context) {
super(context);
}
@Override
public int getLayoutId() {
return R.layout.item_consum_report;
}
@Override
public void onBindItemHolder(SuperViewHolder holder, final int position) {
LocalRecordReport q = mDataList.get(position);
TextView V_no = holder.getView(R.id.V_no);
TextView V_AllowanceAmount = holder.getView(R.id.V_AllowanceAmount);
TextView V_Consumption = holder.getView(R.id.V_Consumption);
TextView V_ConsumptionDate = holder.getView(R.id.V_ConsumptionDate);
TextView V_Department = holder.getView(R.id.V_Department);
TextView V_DinnerAmount = holder.getView(R.id.V_DinnerAmount);
TextView V_DinnerType = holder.getView(R.id.V_DinnerType);
TextView V_EmpName = holder.getView(R.id.V_EmpName);
TextView V_EmpNo = holder.getView(R.id.V_EmpNo);
TextView V_Post = holder.getView(R.id.V_Post);
TextView V_Remark = holder.getView(R.id.V_Remark);
TextView V_TransactionNo = holder.getView(R.id.V_TransactionNo);
TextView V_WindowName = holder.getView(R.id.V_WindowName);
V_no.setText((position + 1) + "");
V_AllowanceAmount.setText(q.AllowanceAmount);
V_Consumption.setText(q.Consumption);
V_ConsumptionDate.setText(q.ConsumptionDate);
V_Department.setText(q.Department);
V_DinnerAmount.setText(q.DinnerAmount);
V_DinnerType.setText(q.DinnerType);
V_EmpName.setText(q.EmpName);
V_EmpNo.setText(q.EmpNo);
V_Post.setText(q.Post);
V_Remark.setText(q.Remark);
V_TransactionNo.setText(q.TransactionNo);
V_WindowName.setText(q.WindowName);
}
}
TOP_Pay/app/src/main/java/com/ifavine/pay/api/APIService.java
...@@ -42,7 +42,7 @@ public abstract interface APIService { ...@@ -42,7 +42,7 @@ public abstract interface APIService {
@POST("WebChat/GetConsumRecordReport") @POST("WebChat/GetConsumRecordReport")
Call<CommonResponse<String>> GetConsumRecordReport(@Body RequestBody info); Call<CommonListResponse<LocalRecordReport>> GetConsumRecordReport(@Body RequestBody info);
@POST("WechatPay/SubmitPaying") @POST("WechatPay/SubmitPaying")
......
TOP_Pay/app/src/main/java/com/ifavine/pay/api/APIWrapper.java
...@@ -162,10 +162,9 @@ public class APIWrapper extends RetrofitUtil { ...@@ -162,10 +162,9 @@ public class APIWrapper extends RetrofitUtil {
* @param record * @param record
* @return * @return
*/ */
public Call<CommonResponse<String>> GetConsumRecordReport(String WinName, String CanteenNo, public Call<CommonListResponse<LocalRecordReport>> GetConsumRecordReport(String WinName, String CanteenNo, String sDate, String eDate,
String sDate, String eDate, String dinnerType, String record, String PageIndex,
String dinnerType, String PageIndex, String PageSize) {
String PageSize, String record) {
// WinName": "7号",//可填或不填，窗口号 // WinName": "7号",//可填或不填，窗口号
// "CanteenNo": "001", // "CanteenNo": "001",
// "sDate": "2018-02-06 15:06:56.000", // "sDate": "2018-02-06 15:06:56.000",
...@@ -180,10 +179,15 @@ public class APIWrapper extends RetrofitUtil { ...@@ -180,10 +179,15 @@ public class APIWrapper extends RetrofitUtil {
obj.put("CanteenNo", CanteenNo); obj.put("CanteenNo", CanteenNo);
obj.put("sDate", sDate); obj.put("sDate", sDate);
obj.put("eDate", eDate); obj.put("eDate", eDate);
obj.put("dinnerType", dinnerType); if (!TextUtils.isEmpty(dinnerType)) {
obj.put("dinnerType", dinnerType);
}
if (!TextUtils.isEmpty(record)) {
obj.put("record", record);
}
obj.put("PageIndex", PageIndex); obj.put("PageIndex", PageIndex);
obj.put("PageSize", PageSize); obj.put("PageSize", PageSize);
obj.put("record", record);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
......
TOP_Pay/app/src/main/java/com/ifavine/pay/common/AppContext.java
...@@ -21,11 +21,7 @@ import com.ifavine.pay.ui.base.BaseApplication; ...@@ -21,11 +21,7 @@ import com.ifavine.pay.ui.base.BaseApplication;
import com.ifavine.pay.utils.SPUtil; import com.ifavine.pay.utils.SPUtil;
import com.ifavine.pay.vo.User; import com.ifavine.pay.vo.User;
import com.tencent.bugly.crashreport.CrashReport;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
import com.uuzuche.lib_zxing.activity.ZXingLibrary;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.FileReader; import java.io.FileReader;
...@@ -105,7 +101,7 @@ public class AppContext extends BaseApplication { ...@@ -105,7 +101,7 @@ public class AppContext extends BaseApplication {
private void init() { private void init() {
ImageLoader.getInstance().init(ImageLoaderConfiguration.createDefault(this)); //ImageLoader.getInstance().init(ImageLoaderConfiguration.createDefault(this));
//Bugly //Bugly
Context context = getApplicationContext(); Context context = getApplicationContext();
...@@ -113,11 +109,9 @@ public class AppContext extends BaseApplication { ...@@ -113,11 +109,9 @@ public class AppContext extends BaseApplication {
String packageName = context.getPackageName(); String packageName = context.getPackageName();
//// 获取当前进程名 //// 获取当前进程名
String processName = getProcessName(android.os.Process.myPid()); String processName = getProcessName(android.os.Process.myPid());
getCurrentAppVer(); getCurrentAppVer();
// ZXingLibrary.initDisplayOpinion(this);
ZXingLibrary.initDisplayOpinion(this); CrashReport.initCrashReport(getApplicationContext(), "0a8411a6a7", false);
} }
......
TOP_Pay/app/src/main/java/com/ifavine/pay/ui/activity/MainActivity.java
...@@ -136,6 +136,12 @@ public class MainActivity extends BaseActivity { ...@@ -136,6 +136,12 @@ public class MainActivity extends BaseActivity {
//获取支付信息 //获取支付信息
GetWindowCostAmount(); GetWindowCostAmount();
//第一次使用设置窗口
String WindowName = SPUtil.getInstance().readString("WindowName");
if (TextUtils.isEmpty(WindowName)) {
DialogUtil.showOkDialog(mContext, null, "设置信息", "请设置饭堂窗口和消费金额", "确定", null);
}
} }
boolean isSend = false; boolean isSend = false;
...@@ -175,6 +181,9 @@ public class MainActivity extends BaseActivity { ...@@ -175,6 +181,9 @@ public class MainActivity extends BaseActivity {
}).start(); }).start();
initPayInfo(); initPayInfo();
et_payCode.requestFocus(); et_payCode.requestFocus();
if (dateTime == 0) {
getServerDate();
}
handler.postDelayed(this, 60 * 1000); handler.postDelayed(this, 60 * 1000);
} }
}; };
...@@ -450,7 +459,7 @@ public class MainActivity extends BaseActivity { ...@@ -450,7 +459,7 @@ public class MainActivity extends BaseActivity {
} }
if (response.body().Status == 200) { if (response.body().Status == 200) {
soundPool.play(soundSucess, 1, 1, 0, 0, 1); soundPool.play(soundSucess, 1, 1, 0, 0, 1);
tv_pay_status.setText("支付成功!"); tv_pay_status.setText("支付成功");
tv_pay_status.setTextColor(getResources().getColor(R.color.green)); tv_pay_status.setTextColor(getResources().getColor(R.color.green));
tv_EmpNo.setText(response.body().EmpNo); tv_EmpNo.setText(response.body().EmpNo);
tv_EmpName.setText(response.body().EmpName); tv_EmpName.setText(response.body().EmpName);
......
TOP_Pay/app/src/main/java/com/ifavine/pay/ui/base/BaseActivity.java
...@@ -14,8 +14,6 @@ import android.view.View; ...@@ -14,8 +14,6 @@ import android.view.View;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.hitomi.tilibrary.transfer.TransferConfig;
import com.hitomi.tilibrary.transfer.Transferee;
import com.ifavine.pay.R; import com.ifavine.pay.R;
import com.ifavine.pay.common.AppContext; import com.ifavine.pay.common.AppContext;
import com.ifavine.pay.interf.BaseViewInterface; import com.ifavine.pay.interf.BaseViewInterface;
...@@ -72,8 +70,7 @@ public class BaseActivity extends SwipeBackActivity implements BaseViewInterface ...@@ -72,8 +70,7 @@ public class BaseActivity extends SwipeBackActivity implements BaseViewInterface
protected LayoutInflater mInflater; protected LayoutInflater mInflater;
protected Context mContext; protected Context mContext;
protected static Dialog loadingDialog; protected static Dialog loadingDialog;
protected Transferee transferee;
protected TransferConfig config;
@Override @Override
......
TOP_Pay/app/src/main/java/com/ifavine/pay/utils/DialogMainSetUtils.java
...@@ -30,6 +30,7 @@ import com.github.jdsjlzx.recyclerview.LRecyclerViewAdapter; ...@@ -30,6 +30,7 @@ import com.github.jdsjlzx.recyclerview.LRecyclerViewAdapter;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.ifavine.pay.R; import com.ifavine.pay.R;
import com.ifavine.pay.adapter.ConsumRecordReportAdapter;
import com.ifavine.pay.adapter.LocalRecordReportAdapter; import com.ifavine.pay.adapter.LocalRecordReportAdapter;
import com.ifavine.pay.adapter.MonthRecordReportAdapter; import com.ifavine.pay.adapter.MonthRecordReportAdapter;
import com.ifavine.pay.adapter.ReportMonthsAdapter; import com.ifavine.pay.adapter.ReportMonthsAdapter;
...@@ -945,6 +946,15 @@ public class DialogMainSetUtils { ...@@ -945,6 +946,15 @@ public class DialogMainSetUtils {
} }
/**
* 本机消费记录
*
* @param mContext
* @param title
* @param okListener
* @param cancelable
* @return
*/
public static Dialog showReportRecordDialog(final Context mContext, final String title, final View.OnClickListener okListener, public static Dialog showReportRecordDialog(final Context mContext, final String title, final View.OnClickListener okListener,
boolean cancelable) { boolean cancelable) {
...@@ -960,29 +970,132 @@ public class DialogMainSetUtils { ...@@ -960,29 +970,132 @@ public class DialogMainSetUtils {
Button btn_search = (Button) view.findViewById(R.id.dialog_search); Button btn_search = (Button) view.findViewById(R.id.dialog_search);
Button btn_close = (Button) view.findViewById(R.id.dialog_close); Button btn_close = (Button) view.findViewById(R.id.dialog_close);
final TextView t0 = (TextView) view.findViewById(R.id.tv_Total);
final TextView t1 = (TextView) view.findViewById(R.id.tv_TotalDinnerAmount);
final TextView t2 = (TextView) view.findViewById(R.id.tv_TotalAllowanceAmount);
final TextView t3 = (TextView) view.findViewById(R.id.tv_TotalConsumption);
final List<TextView> list = new ArrayList<>();
list.add(t0);
list.add(t1);
list.add(t2);
list.add(t3);
final TextView tv_date1 = (TextView) view.findViewById(R.id.tv_date1); final TextView tv_date1 = (TextView) view.findViewById(R.id.tv_date1);
final TextView tv_date2 = (TextView) view.findViewById(R.id.tv_date2); final TextView tv_date2 = (TextView) view.findViewById(R.id.tv_date2);
TextView tv_title = (TextView) view.findViewById(R.id.dialog_title); TextView tv_title = (TextView) view.findViewById(R.id.dialog_title);
ImageView iv_cancel = (ImageView) view.findViewById(R.id.iv_cancel); ImageView iv_cancel = (ImageView) view.findViewById(R.id.iv_cancel);
Spinner spinner1 = (Spinner) view.findViewById(R.id.spinner1);
Spinner spinner2 = (Spinner) view.findViewById(R.id.spinner2); final Spinner spinner1 = (Spinner) view.findViewById(R.id.spinner1);
Spinner spinner3 = (Spinner) view.findViewById(R.id.spinner3); final Spinner spinner2 = (Spinner) view.findViewById(R.id.spinner2);
final Spinner spinner3 = (Spinner) view.findViewById(R.id.spinner3);
tv_date1.setText(DateUtil.formatDate(new Date().getTime(), "yyyy-MM-dd"));
tv_date2.setText(DateUtil.formatDate(new Date().getTime(), "yyyy-MM-dd"));
final LRecyclerView mLRecyclerView = (LRecyclerView) view.findViewById(R.id.mLRecyclerView);
final ConsumRecordReportAdapter adapter = new ConsumRecordReportAdapter(mContext);
LRecyclerViewAdapter mLRecyclerViewAdapter = new LRecyclerViewAdapter(adapter);
mLRecyclerView.setLayoutManager(new LinearLayoutManager(mContext) {
});
mLRecyclerView.setAdapter(mLRecyclerViewAdapter);
mLRecyclerView.setPullRefreshEnabled(true);
mLRecyclerView.setLoadMoreEnabled(true);
mCurrent = 1;
mLRecyclerView.setOnRefreshListener(new OnRefreshListener() {
@Override
public void onRefresh() {
t0.setText(null);
t1.setText(null);
t2.setText(null);
t3.setText(null);
mCurrent = 1;
mLRecyclerView.setNoMore(false);
mLRecyclerView.setLoadMoreEnabled(true);
adapter.clear();
String sDate = tv_date1.getText().toString() + " 00:00:00.001";
String eDate = tv_date2.getText().toString() + " 23:59:59.999";
String dinnerType = "";
String record = "";
int p1 = spinner1.getSelectedItemPosition();
int p2 = spinner2.getSelectedItemPosition();
if (p1 == 0) {
dinnerType = "";
} else {
dinnerType = "" + p1;
}
if (p2 == 0) {
record = "";
} else {
record = "" + p2;
}
String windowName = spinner3.getSelectedItem().toString();
GetConsumRecordReport(mLRecyclerView, adapter, windowName, sDate, eDate, dinnerType, record, String.valueOf(mCurrent), String.valueOf(Constants.PAGE_SIZE), list);
}
});
mLRecyclerView.setOnLoadMoreListener(new OnLoadMoreListener() {
@Override
public void onLoadMore() {
if (mCurrent * Constants.PAGE_SIZE < mCount) {
mCurrent++;
isLoadMore = true;
String sDate = tv_date1.getText().toString() + " 00:00:00.001";
String eDate = tv_date2.getText().toString() + " 23:59:59.999";
String dinnerType = "";
String record = "";
int p1 = spinner1.getSelectedItemPosition();
int p2 = spinner2.getSelectedItemPosition();
if (p1 == 0) {
dinnerType = "";
} else {
dinnerType = "" + p1;
}
if (p2 == 0) {
record = "";
} else {
record = "" + p2;
}
String windowName = spinner3.getSelectedItem().toString();
GetConsumRecordReport(mLRecyclerView, adapter, windowName, sDate, eDate, dinnerType, record, String.valueOf(mCurrent), String.valueOf(Constants.PAGE_SIZE), list);
} else {
mLRecyclerView.setNoMore(true);
isLoadMore = false;
}
}
});
String options[] = mContext.getResources().getStringArray(R.array.main_report_type); String options[] = mContext.getResources().getStringArray(R.array.main_report_type);
SpinnerAdapter adapter = new SpinnerAdapter(mContext, SpinnerAdapter adapter1 = new SpinnerAdapter(mContext,
android.R.layout.simple_spinner_item, options); android.R.layout.simple_spinner_item, options);
spinner1.setAdapter(adapter); spinner1.setAdapter(adapter1);
String options2[] = mContext.getResources().getStringArray(R.array.main_report_record_type); String options2[] = mContext.getResources().getStringArray(R.array.main_report_record_type);
SpinnerAdapter adapter2 = new SpinnerAdapter(mContext, SpinnerAdapter adapter2 = new SpinnerAdapter(mContext,
android.R.layout.simple_spinner_item, options2); android.R.layout.simple_spinner_item, options2);
spinner2.setAdapter(adapter2); spinner2.setAdapter(adapter2);
String options3[] = mContext.getResources().getStringArray(R.array.main_rst_num_options); //窗口设置
String CanTeenCode = SPUtil.getInstance().readString("CanTeenCode");
String data = SPUtil.getInstance().readString("CanteenWindows");
final List<CanteenWindow> datas = gson.fromJson(data, new TypeToken<List<CanteenWindow>>() {
}.getType());
List<CanteenWindow.Window> windows = null;
for (CanteenWindow w : datas) {
if (CanTeenCode.equals(w.CanteenCode)) {
windows = w.Windows;
break;
}
}
List<String> ws = new ArrayList<>();
if (windows != null) {
for (CanteenWindow.Window w : windows) {
ws.add(w.WindowName);
}
}
SpinnerAdapter adapter3 = new SpinnerAdapter(mContext, SpinnerAdapter adapter3 = new SpinnerAdapter(mContext,
android.R.layout.simple_spinner_item, options3); android.R.layout.simple_spinner_item, ws.toArray());
spinner3.setAdapter(adapter3); spinner3.setAdapter(adapter3);
if (title != null) { if (title != null) {
...@@ -998,7 +1111,7 @@ public class DialogMainSetUtils { ...@@ -998,7 +1111,7 @@ public class DialogMainSetUtils {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
dialog.dismiss(); mLRecyclerView.refresh();
} }
}); });
} }
...@@ -1070,6 +1183,57 @@ public class DialogMainSetUtils { ...@@ -1070,6 +1183,57 @@ public class DialogMainSetUtils {
return dialog; return dialog;
} }
private static void GetConsumRecordReport(final LRecyclerView mLRecyclerView, final ConsumRecordReportAdapter adapter, String WindowName, String sDate,
String eDate, String dinnerType, String record,
String PageIndex, String PageSize, final List<TextView> tvs) {
String CanTeenCode = SPUtil.getInstance().readString("CanTeenCode");
Call<CommonListResponse<LocalRecordReport>> call =
APIWrapper.getInstance().GetConsumRecordReport(WindowName, CanTeenCode, sDate, eDate, dinnerType, record, PageIndex, PageSize);
call.enqueue(new Callback<CommonListResponse<LocalRecordReport>>() {
@Override
public void onResponse(Call<CommonListResponse<LocalRecordReport>> call,
Response<CommonListResponse<LocalRecordReport>> response) {
DialogUtil.dismissTipDialog();
mLRecyclerView.refreshComplete(Constants.PAGE_SIZE);
if (response.isSuccessful()) {
if (response.body() == null) {
AppContext.showToast("请求失败，请重试");
return;
}
if (response.body().Status != 200) {
AppContext.showToast(response.body().Message);
return;
}
List<LocalRecordReport> data = response.body().ModelJson;
adapter.addAll(data);
mCount = response.body().Total;
if (mCurrent * Constants.PAGE_SIZE < response.body().Total) {
mLRecyclerView.setNoMore(false);
} else {
mLRecyclerView.setNoMore(true);
isLoadMore = false;
}
if (tvs != null) {
tvs.get(0).setText(response.body().Total + "");
tvs.get(1).setText(response.body().TotalDinnerAmount);
tvs.get(2).setText(response.body().TotalAllowanceAmount);
tvs.get(3).setText(response.body().TotalConsumption);
}
}
}
@Override
public void onFailure(Call<CommonListResponse<LocalRecordReport>> call, Throwable t) {
DialogUtil.dismissTipDialog();
AppContext.showToast("请求失败，请重试");
mLRecyclerView.refreshComplete(Constants.PAGE_SIZE);
}
});
}
static int mCurrent = 1; static int mCurrent = 1;
static int mCount = 20; static int mCount = 20;
static boolean isLoadMore = false; static boolean isLoadMore = false;
......
TOP_Pay/app/src/main/res/layout/dialog_common_ok.xml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="300dp" android:layout_width="500dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:src="@mipmap/ic_launcher" /> android:src="@mipmap/icon" />
<TextView <TextView
android:id="@+id/dialog_title" android:id="@+id/dialog_title"
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:textColor="@color/font_black_32" android:textColor="@color/font_black_26"
android:textSize="19sp" android:textSize="30sp"
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_marginTop="10dp" android:layout_marginTop="20dp"
android:textColor="@color/font_gray_92" android:textColor="@color/font_black_32"
android:textSize="16sp" android:textSize="30sp"
android:visibility="gone" /> android:visibility="gone" />
<View <View
...@@ -53,10 +53,10 @@ ...@@ -53,10 +53,10 @@
android:id="@+id/dialog_ok" android:id="@+id/dialog_ok"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_marginBottom="15dp" android:layout_marginBottom="25dp"
android:layout_marginLeft="30dp" android:layout_marginLeft="100dp"
android:layout_marginRight="30dp" android:layout_marginRight="100dp"
android:layout_marginTop="10dp" android:layout_marginTop="20dp"
android:background="@drawable/btn_click_blue_grey" android:background="@drawable/btn_click_blue_grey"
android:text="@string/toolbar_cancel" android:text="@string/toolbar_cancel"
android:textColor="@color/white" /> android:textColor="@color/white" />
......
TOP_Pay/app/src/main/res/layout/dialog_report_record.xml
...@@ -10,8 +10,9 @@ ...@@ -10,8 +10,9 @@
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="800dp" android:layout_height="800dp"
android:layout_centerHorizontal="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:background="@drawable/bg_white_radius" android:background="@drawable/bg_white_radius"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
...@@ -114,7 +115,7 @@ ...@@ -114,7 +115,7 @@
android:id="@+id/spinner3" android:id="@+id/spinner3"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="50dp" android:layout_height="50dp"
android:entries="@array/main_report_type" /> android:entries="@array/main_rst_num_options" />
</LinearLayout> </LinearLayout>
...@@ -197,48 +198,247 @@ ...@@ -197,48 +198,247 @@
</LinearLayout> </LinearLayout>
<LinearLayout <HorizontalScrollView
android:layout_width="fill_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginLeft="10dp" android:layout_weight="1">
android:layout_marginRight="10dp"
android:layout_marginTop="20dp"
android:layout_weight="1"
android:background="@drawable/bg_white_radius_stroke"
android:orientation="vertical">
<ListView <LinearLayout
android:id="@+id/listView" android:layout_width="wrap_content"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_height="match_parent"></ListView> android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="20dp"
android:layout_weight="1"
android:background="@drawable/bg_white_radius_stroke"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/textView3"
android:layout_width="100dp"
android:layout_height="50dp"
android:gravity="center"
android:text="序号"
android:textColor="@color/font_blue_16"
android:textSize="25dp" />
<TextView
android:layout_width="150dp"
android:layout_height="50dp"
android:layout_marginLeft="15dp"
android:gravity="center"
android:text="窗口"
android:textColor="@color/font_blue_16"
android:textSize="25dp" />
<TextView
android:layout_width="250dp"
android:layout_height="50dp"
android:gravity="center"
android:text="日期"
android:textColor="@color/font_blue_16"
android:textSize="25dp" />
<TextView
android:layout_width="150dp"
android:layout_height="50dp"
android:gravity="center"
android:text="工号"
android:textColor="@color/font_blue_16"
android:textSize="25dp" />
<TextView
android:layout_width="150dp"
android:layout_height="50dp"
android:layout_marginLeft="20dp"
android:gravity="center"
android:text="姓名"
android:textColor="@color/font_blue_16"
android:textSize="25dp" />
<TextView
android:layout_width="250dp"
android:layout_height="50dp"
android:gravity="center"
android:text="部门"
android:textColor="@color/font_blue_16"
android:textSize="25dp" />
<TextView
android:layout_width="150dp"
android:layout_height="50dp"
android:gravity="center"
android:text="职务"
android:textColor="@color/font_blue_16"
android:textSize="25dp" />
<TextView
android:layout_width="150dp"
android:layout_height="50dp"
android:gravity="center"
android:text="用餐类型"
android:textColor="@color/font_blue_16"
android:textSize="25dp" />
<TextView
android:layout_width="150dp"
android:layout_height="50dp"
android:gravity="center"
android:text="消费金额"
android:textColor="@color/font_blue_16"
android:textSize="25dp" />
<TextView
android:layout_width="150dp"
android:layout_height="50dp"
android:gravity="center"
android:text="公司补助"
android:textColor="@color/font_blue_16"
android:textSize="25dp" />
<TextView
android:layout_width="150dp"
android:layout_height="50dp"
android:layout_marginLeft="20dp"
android:gravity="center"
android:text="个人消费"
android:textColor="@color/font_blue_16"
android:textSize="25dp" />
<TextView
android:layout_width="320dp"
android:layout_height="60dp"
android:gravity="center"
android:text="商户单号"
android:textColor="@color/font_blue_16"
android:textSize="25dp" />
<TextView
android:layout_width="300dp"
android:layout_height="50dp"
android:gravity="center"
android:text="备注"
android:textColor="@color/font_blue_16"
android:textSize="25dp" />
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="1dp"
android:background="@color/main_gray" />
<com.github.jdsjlzx.recyclerview.LRecyclerView
android:id="@+id/mLRecyclerView"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginTop="10dp" />
</LinearLayout> </LinearLayout>
</HorizontalScrollView>
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:paddingRight="10dp" android:paddingRight="10dp"
android:text="消费人数:(早餐:100 午餐:100 晚餐:100 宵夜:100)" android:text="消费人数:"
android:textColor="@color/font_black_32" android:textColor="@color/font_black_32"
android:textSize="23dp" /> android:textSize="23dp" />
<TextView <TextView
android:id="@+id/tv_Total"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:textColor="@color/red"
android:textSize="23dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginLeft="150dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:text="合计:(消费金额:"
android:textColor="@color/font_black_32"
android:textSize="23dp" />
<TextView
android:id="@+id/tv_TotalDinnerAmount"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:textColor="@color/red"
android:textSize="23dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:text=" 公司补助: "
android:textColor="@color/font_black_32"
android:textSize="23dp" />
<TextView
android:id="@+id/tv_TotalAllowanceAmount"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:textColor="@color/red"
android:textSize="23dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:text=" 个人消费: "
android:textColor="@color/font_black_32"
android:textSize="23dp" />
<TextView
android:id="@+id/tv_TotalConsumption"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:textColor="@color/red"
android:textSize="23dp" />
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:paddingRight="10dp" android:paddingRight="10dp"
android:text="合计:(消费金额:100 公司补助:100 个人消费:100)" android:text=")"
android:textColor="@color/font_black_32" android:textColor="@color/font_black_32"
android:textSize="23dp" /> android:textSize="23dp" />
......
TOP_Pay/app/src/main/res/layout/item_consum_report.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="60dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="60dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/V_no"
android:layout_width="100dp"
android:layout_height="60dp"
android:gravity="center"
android:text="序号"
android:textColor="@color/font_black_20"
android:textSize="25dp" />
<TextView
android:id="@+id/V_WindowName"
android:layout_width="160dp"
android:layout_height="60dp"
android:gravity="center"
android:text="窗口"
android:textColor="@color/font_black_20"
android:textSize="25dp" />
<TextView
android:id="@+id/V_ConsumptionDate"
android:layout_width="250dp"
android:layout_height="60dp"
android:gravity="center"
android:text="日期"
android:textColor="@color/font_black_20"
android:textSize="20dp" />
<TextView
android:id="@+id/V_EmpNo"
android:layout_width="160dp"
android:layout_height="60dp"
android:gravity="center"
android:text="工号"
android:textColor="@color/font_black_20"
android:textSize="25dp" />
<TextView
android:id="@+id/V_EmpName"
android:layout_width="160dp"
android:layout_height="60dp"
android:gravity="center"
android:text="姓名"
android:textColor="@color/font_black_20"
android:textSize="25dp" />
<TextView
android:id="@+id/V_Department"
android:layout_width="200dp"
android:layout_height="60dp"
android:gravity="center"
android:text="部门"
android:textColor="@color/font_black_20"
android:textSize="25dp" />
<TextView
android:id="@+id/V_Post"
android:layout_width="160dp"
android:layout_height="60dp"
android:layout_marginLeft="50dp"
android:gravity="center"
android:text="职务"
android:textColor="@color/font_black_20"
android:textSize="25dp" />
<TextView
android:id="@+id/V_DinnerType"
android:layout_width="160dp"
android:layout_height="60dp"
android:gravity="center"
android:text="用餐类型"
android:textColor="@color/font_black_20"
android:textSize="25dp" />
<TextView
android:id="@+id/V_DinnerAmount"
android:layout_width="160dp"
android:layout_height="60dp"
android:gravity="center"
android:text="消费金额"
android:textColor="@color/font_black_20"
android:textSize="25dp" />
<TextView
android:id="@+id/V_AllowanceAmount"
android:layout_width="160dp"
android:layout_height="60dp"
android:gravity="center"
android:text="公司补助"
android:textColor="@color/font_black_20"
android:textSize="25dp" />
<TextView
android:id="@+id/V_Consumption"
android:layout_width="160dp"
android:layout_height="60dp"
android:gravity="center"
android:text="个人消费"
android:textColor="@color/font_black_20"
android:textSize="25dp" />
<TextView
android:id="@+id/V_TransactionNo"
android:layout_width="320dp"
android:layout_height="60dp"
android:gravity="center"
android:text="商户单号"
android:textColor="@color/font_black_20"
android:textSize="20dp" />
<TextView
android:id="@+id/V_Remark"
android:layout_width="300dp"
android:layout_height="60dp"
android:gravity="center"
android:text="备注"
android:textColor="@color/font_black_20"
android:textSize="25dp" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
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