Skip to content

T
TopPay
Commit 599fa19f by qyw
Options

查询ok

parent 8f373818
Showing with 247 additions and 40 deletions
TOP_Pay/app/build.gradle
......@@ -11,6 +11,10 @@ android {
versionCode 120
versionName "1.2.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
ndk {
// 设置支持的SO库架构
abiFilters 'armeabi' //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
}
}
buildTypes {
release {
......@@ -57,14 +61,17 @@ dependencies {
compile 'com.gjiazhe:wavesidebar:1.3'
compile 'com.nbsp:library:1.6'
compile 'com.github.sendtion:XRichText:1.1'
compile 'me.yokeyword:swipebackfragment:0.3.0'
compile 'com.github.Hitomis.transferee:Transferee:v1.0.0'
compile 'com.github.Hitomis.transferee:GlideLoader:v1.0.0' // load with glide
compile 'com.github.Hitomis.transferee:UniversalLoader:v1.0.0'
compile 'me.yokeyword:swipebackfragment:0.3+' +
'0'
// load with universal-image-loader
compile project(path: ':lib-zxing')
compile 'pub.devrel:easypermissions:0.2.0'
testCompile 'junit:junit:4.12'
compile 'com.github.w446108264:XhsEmoticonsKeyboard:2.0.3'
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 @@
<!-- 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.READ_PROFILE" />
<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中创建与删除文件权限 -->
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<!-- 向SDCard写入数据权限 -->
......@@ -21,10 +17,16 @@
<uses-permission android:name="android.permission.CAMERA" />
<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.autofocus" />
<application
android:name=".common.AppContext"
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 {
@POST("WebChat/GetConsumRecordReport")
Call<CommonResponse<String>> GetConsumRecordReport(@Body RequestBody info);
Call<CommonListResponse<LocalRecordReport>> GetConsumRecordReport(@Body RequestBody info);
@POST("WechatPay/SubmitPaying")
......
TOP_Pay/app/src/main/java/com/ifavine/pay/api/APIWrapper.java
......@@ -162,10 +162,9 @@ public class APIWrapper extends RetrofitUtil {
* @param record
* @return
*/
public Call<CommonResponse<String>> GetConsumRecordReport(String WinName, String CanteenNo,
String sDate, String eDate,
String dinnerType, String PageIndex,
String PageSize, String record) {
public Call<CommonListResponse<LocalRecordReport>> GetConsumRecordReport(String WinName, String CanteenNo, String sDate, String eDate,
String dinnerType, String record, String PageIndex,
String PageSize) {
// WinName": "7号",//可填或不填，窗口号
// "CanteenNo": "001",
// "sDate": "2018-02-06 15:06:56.000",
......@@ -180,10 +179,15 @@ public class APIWrapper extends RetrofitUtil {
obj.put("CanteenNo", CanteenNo);
obj.put("sDate", sDate);
obj.put("eDate", eDate);
if (!TextUtils.isEmpty(dinnerType)) {
obj.put("dinnerType", dinnerType);
}
if (!TextUtils.isEmpty(record)) {
obj.put("record", record);
}
obj.put("PageIndex", PageIndex);
obj.put("PageSize", PageSize);
obj.put("record", record);
} catch (Exception e) {
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;
import com.ifavine.pay.utils.SPUtil;
import com.ifavine.pay.vo.User;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
import com.uuzuche.lib_zxing.activity.ZXingLibrary;
import com.tencent.bugly.crashreport.CrashReport;
import java.io.BufferedReader;
import java.io.FileReader;
......@@ -105,7 +101,7 @@ public class AppContext extends BaseApplication {
private void init() {
ImageLoader.getInstance().init(ImageLoaderConfiguration.createDefault(this));
//ImageLoader.getInstance().init(ImageLoaderConfiguration.createDefault(this));
//Bugly
Context context = getApplicationContext();
......@@ -113,11 +109,9 @@ public class AppContext extends BaseApplication {
String packageName = context.getPackageName();
//// 获取当前进程名
String processName = getProcessName(android.os.Process.myPid());
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 {
//获取支付信息
GetWindowCostAmount();
//第一次使用设置窗口
String WindowName = SPUtil.getInstance().readString("WindowName");
if (TextUtils.isEmpty(WindowName)) {
DialogUtil.showOkDialog(mContext, null, "设置信息", "请设置饭堂窗口和消费金额", "确定", null);
}
}
boolean isSend = false;
......@@ -175,6 +181,9 @@ public class MainActivity extends BaseActivity {
}).start();
initPayInfo();
et_payCode.requestFocus();
if (dateTime == 0) {
getServerDate();
}
handler.postDelayed(this, 60 * 1000);
}
};
......@@ -450,7 +459,7 @@ public class MainActivity extends BaseActivity {
}
if (response.body().Status == 200) {
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_EmpNo.setText(response.body().EmpNo);
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;
import android.widget.LinearLayout;
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.common.AppContext;
import com.ifavine.pay.interf.BaseViewInterface;
......@@ -72,8 +70,7 @@ public class BaseActivity extends SwipeBackActivity implements BaseViewInterface
protected LayoutInflater mInflater;
protected Context mContext;
protected static Dialog loadingDialog;
protected Transferee transferee;
protected TransferConfig config;
@Override
......
TOP_Pay/app/src/main/res/layout/dialog_common_ok.xml
......@@ -6,7 +6,7 @@
android:orientation="vertical">
<LinearLayout
android:layout_width="300dp"
android:layout_width="500dp"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
......@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:src="@mipmap/ic_launcher" />
android:src="@mipmap/icon" />
<TextView
android:id="@+id/dialog_title"
......@@ -27,8 +27,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="15dp"
android:textColor="@color/font_black_32"
android:textSize="19sp"
android:textColor="@color/font_black_26"
android:textSize="30sp"
android:visibility="gone" />
<TextView
......@@ -38,9 +38,9 @@
android:layout_gravity="center"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="10dp"
android:textColor="@color/font_gray_92"
android:textSize="16sp"
android:layout_marginTop="20dp"
android:textColor="@color/font_black_32"
android:textSize="30sp"
android:visibility="gone" />
<View
......@@ -53,10 +53,10 @@
android:id="@+id/dialog_ok"
android:layout_width="fill_parent"
android:layout_height="45dp"
android:layout_marginBottom="15dp"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="25dp"
android:layout_marginLeft="100dp"
android:layout_marginRight="100dp"
android:layout_marginTop="20dp"
android:background="@drawable/btn_click_blue_grey"
android:text="@string/toolbar_cancel"
android:textColor="@color/white" />
......
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