Skip to content

T
TopPay
Commit 9d39ad23 by qyw
Options

查询ok

parent 599fa19f
Showing with 150 additions and 38 deletions
TOP_Pay/app/build.gradle
......@@ -61,8 +61,7 @@ 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 'me.yokeyword:swipebackfragment:0.3+'
// load with universal-image-loader
compile project(path: ':lib-zxing')
compile 'pub.devrel:easypermissions:0.2.0'
......
TOP_Pay/app/src/main/AndroidManifest.xml
......@@ -12,7 +12,7 @@
<!-- 向SDCard写入数据权限 -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.CAMERA" />
......@@ -36,7 +36,6 @@
android:theme="@style/AppTheme">
<activity
android:name=".ui.activity.WelcomeActivity"
android:keepScreenOn="true"
android:label="@string/app_name"
android:launchMode="singleTask"
android:screenOrientation="landscape"
......@@ -50,7 +49,6 @@
<activity
android:name=".ui.activity.MainActivity"
android:keepScreenOn="true"
android:label="@string/app_name"
android:launchMode="singleTask"
android:screenOrientation="landscape"
......
TOP_Pay/app/src/main/java/com/ifavine/pay/adapter/ConsumRecordReportAdapter.java
......@@ -6,6 +6,7 @@ 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.view.datepicker.DateUtil;
import com.ifavine.pay.vo.LocalRecordReport;
/**
......@@ -42,10 +43,14 @@ public class ConsumRecordReportAdapter extends ListBaseAdapter<LocalRecordReport
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);
if (q.ConsumptionDate != null && q.ConsumptionDate.length() > 19) {
q.ConsumptionDate = q.ConsumptionDate.substring(0, 19);
}
V_ConsumptionDate.setText(q.ConsumptionDate.replaceAll("T", " "));
V_Department.setText(q.Department);
V_DinnerAmount.setText(q.DinnerAmount);
V_DinnerType.setText(q.DinnerType);
......@@ -55,5 +60,34 @@ public class ConsumRecordReportAdapter extends ListBaseAdapter<LocalRecordReport
V_Remark.setText(q.Remark);
V_TransactionNo.setText(q.TransactionNo);
V_WindowName.setText(q.WindowName);
if (q.Remark != null && q.Remark.contains("失败")) {
V_no.setTextColor(mContext.getResources().getColor(R.color.red));
V_AllowanceAmount.setTextColor(mContext.getResources().getColor(R.color.red));
V_Consumption.setTextColor(mContext.getResources().getColor(R.color.red));
V_ConsumptionDate.setTextColor(mContext.getResources().getColor(R.color.red));
V_Department.setTextColor(mContext.getResources().getColor(R.color.red));
V_DinnerAmount.setTextColor(mContext.getResources().getColor(R.color.red));
V_DinnerType.setTextColor(mContext.getResources().getColor(R.color.red));
V_EmpName.setTextColor(mContext.getResources().getColor(R.color.red));
V_EmpNo.setTextColor(mContext.getResources().getColor(R.color.red));
V_Post.setTextColor(mContext.getResources().getColor(R.color.red));
V_Remark.setTextColor(mContext.getResources().getColor(R.color.red));
V_TransactionNo.setTextColor(mContext.getResources().getColor(R.color.red));
V_WindowName.setTextColor(mContext.getResources().getColor(R.color.red));
} else {
V_no.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_AllowanceAmount.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_Consumption.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_ConsumptionDate.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_Department.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_DinnerAmount.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_DinnerType.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_EmpName.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_EmpNo.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_Post.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_Remark.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_TransactionNo.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_WindowName.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
}
}
}
TOP_Pay/app/src/main/java/com/ifavine/pay/adapter/LocalRecordReportAdapter.java
......@@ -48,7 +48,10 @@ public class LocalRecordReportAdapter extends ListBaseAdapter<LocalRecordReport>
V_AllowanceAmount.setText(q.AllowanceAmount);
V_CanteenName.setText(q.CanteenName);
V_Consumption.setText(q.Consumption);
V_ConsumptionDate.setText(q.ConsumptionDate);
if (q.ConsumptionDate != null && q.ConsumptionDate.length() > 19) {
q.ConsumptionDate = q.ConsumptionDate.substring(0, 19);
}
V_ConsumptionDate.setText(q.ConsumptionDate.replaceAll("T", " "));
V_Department.setText(q.Department);
V_DinnerAmount.setText(q.DinnerAmount);
V_DinnerType.setText(q.DinnerType);
......@@ -58,5 +61,36 @@ public class LocalRecordReportAdapter extends ListBaseAdapter<LocalRecordReport>
V_Remark.setText(q.Remark);
V_TransactionNo.setText(q.TransactionNo);
V_WindowName.setText(q.WindowName);
if (q.Remark != null && q.Remark.contains("失败")) {
V_no.setTextColor(mContext.getResources().getColor(R.color.red));
V_AllowanceAmount.setTextColor(mContext.getResources().getColor(R.color.red));
V_Consumption.setTextColor(mContext.getResources().getColor(R.color.red));
V_ConsumptionDate.setTextColor(mContext.getResources().getColor(R.color.red));
V_Department.setTextColor(mContext.getResources().getColor(R.color.red));
V_DinnerAmount.setTextColor(mContext.getResources().getColor(R.color.red));
V_DinnerType.setTextColor(mContext.getResources().getColor(R.color.red));
V_EmpName.setTextColor(mContext.getResources().getColor(R.color.red));
V_EmpNo.setTextColor(mContext.getResources().getColor(R.color.red));
V_Post.setTextColor(mContext.getResources().getColor(R.color.red));
V_Remark.setTextColor(mContext.getResources().getColor(R.color.red));
V_TransactionNo.setTextColor(mContext.getResources().getColor(R.color.red));
V_WindowName.setTextColor(mContext.getResources().getColor(R.color.red));
V_CanteenName.setTextColor(mContext.getResources().getColor(R.color.red));
} else {
V_no.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_AllowanceAmount.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_Consumption.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_ConsumptionDate.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_Department.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_DinnerAmount.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_DinnerType.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_EmpName.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_EmpNo.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_Post.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_Remark.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_TransactionNo.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_WindowName.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
V_CanteenName.setTextColor(mContext.getResources().getColor(R.color.font_black_20));
}
}
}
TOP_Pay/app/src/main/java/com/ifavine/pay/ui/activity/MainActivity.java
......@@ -6,6 +6,7 @@ import android.media.SoundPool;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.provider.Settings;
import android.support.annotation.Nullable;
import android.text.Editable;
import android.text.TextUtils;
......@@ -124,7 +125,6 @@ public class MainActivity extends BaseActivity {
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
//支付提示
soundPool = new SoundPool(3, AudioManager.STREAM_MUSIC, 100);
......@@ -184,6 +184,10 @@ public class MainActivity extends BaseActivity {
if (dateTime == 0) {
getServerDate();
}
Current_Count++;
if (Current_Count >= MAX_Mi) {
setSCREEN_OFF_TIMEOUT();
}
handler.postDelayed(this, 60 * 1000);
}
};
......@@ -207,9 +211,11 @@ public class MainActivity extends BaseActivity {
@Override
protected void onResume() {
super.onResume();
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
updateCanTeenName();
getServerDate();
initPayInfo();
}
@Override
......@@ -261,6 +267,7 @@ public class MainActivity extends BaseActivity {
@OnClick({R.id.tv_set, R.id.tv_table, R.id.tv_close, R.id.tv_reflesh, R.id.btn_pay})
public void onClick(View view) {
Current_Count = 0;
switch (view.getId()) {
case R.id.tv_set:
new PopWindowMainSet(mContext, new PopWindowMainSet.CallBackPosition() {
......@@ -380,18 +387,21 @@ public class MainActivity extends BaseActivity {
@Override
public boolean onTouchEvent(MotionEvent event) {
Log.e("ggg", "onTouchEvent");
Current_Count = 0;
return super.onTouchEvent(event);
}
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
Log.e("ggg", "dispatchTouchEvent");
Current_Count = 0;
return super.dispatchTouchEvent(ev);
}
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
Log.e("ggg", "onKeyUp");
Current_Count = 0;
return super.onKeyUp(keyCode, event);
}
......@@ -443,8 +453,21 @@ public class MainActivity extends BaseActivity {
*/
//线路处理
private void doPay(String payCode) {
Current_Count = 0;
et_payCode.setText(null);
et_payCode.requestFocus();
tv_EmpNo.setText(null);
tv_EmpName.setText(null);
tv_EmpDuty.setText(null);
tv_EmpDept.setText(null);
tv_SubCost.setText(null);
tv_Consumption.setText(null);
tv_Cost.setText(null);
tv_IsConsumed.setText(null);
tv_TradeNo.setText(null);
tv_pay_status.setText("支付中...");
tv_pay_status.setTextColor(getResources().getColor(R.color.font_black_20));
String Mac = SPUtil.getInstance().readString("Mac");
String DeviceNo = SPUtil.getInstance().readString("DeviceNo");
Call<CommonResponse<String>> call =
......@@ -457,10 +480,7 @@ public class MainActivity extends BaseActivity {
if (response.body() == null) {
return;
}
if (response.body().Status == 200) {
soundPool.play(soundSucess, 1, 1, 0, 0, 1);
tv_pay_status.setText("支付成功");
tv_pay_status.setTextColor(getResources().getColor(R.color.green));
if (response.body() != null) {
tv_EmpNo.setText(response.body().EmpNo);
tv_EmpName.setText(response.body().EmpName);
tv_EmpDuty.setText(response.body().EmpDuty);
......@@ -470,6 +490,11 @@ public class MainActivity extends BaseActivity {
tv_Cost.setText(response.body().Cost);
tv_IsConsumed.setText(response.body().IsConsumed);
tv_TradeNo.setText(response.body().TradeNo);
}
if (response.body().Status == 200) {
soundPool.play(soundSucess, 1, 1, 0, 0, 1);
tv_pay_status.setText("支付成功");
tv_pay_status.setTextColor(getResources().getColor(R.color.green));
} else {
soundPool.play(soundFail, 1, 1, 0, 0, 1);
tv_pay_status.setText(response.body().Message);
......@@ -588,9 +613,9 @@ public class MainActivity extends BaseActivity {
private boolean getTimeCompare(String start, String end) {
String date = DateUtil.formatDate(dateTime, "yyyy-MM-dd");
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String startDate = date + " " + start;
String endDate = date + " " + end;
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String startDate = date + " " + start + ":00";
String endDate = date + " " + end + ":59";
try {
Date s = df.parse(startDate);
Date e = df.parse(endDate);
......@@ -603,4 +628,14 @@ public class MainActivity extends BaseActivity {
return false;
}
private final static int MAX_Mi = 10;
private int Current_Count = 0;
/**
* 设置锁屏 60分钟没有消费操作锁屏
*/
private void setSCREEN_OFF_TIMEOUT() {
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
Settings.System.putInt(getContentResolver(), android.provider.Settings.System.SCREEN_OFF_TIMEOUT, 10 * 1000);
}
}
TOP_Pay/app/src/main/java/com/ifavine/pay/utils/DialogMainSetUtils.java
......@@ -405,8 +405,18 @@ public class DialogMainSetUtils {
View.OnClickListener cancelListener, boolean cancelable) {
// 数据来源
String data = SPUtil.getInstance().readString("WindowCostAmounts");
final List<WindowCostAmount> DATA = gson.fromJson(data, new TypeToken<List<WindowCostAmount>>() {
final List<WindowCostAmount> DATA = new ArrayList<>();
final List<WindowCostAmount> D = gson.fromJson(data, new TypeToken<List<WindowCostAmount>>() {
}.getType());
if (D == null) {
for (int i = 0; i < 4; i++) {
WindowCostAmount wca = new WindowCostAmount();
wca.DinnerType = (i + 1) + "";
DATA.add(wca);
}
} else {
DATA.addAll(D);
}
View view = View.inflate(mContext, R.layout.dialog_amt_set, null);
final Dialog dialog = new Dialog(mContext, R.style.dialog_common);// 创建自定义样式dialog
......@@ -439,10 +449,10 @@ public class DialogMainSetUtils {
AmountView amt6 = (AmountView) view.findViewById(R.id.amt6);
AmountView amt7 = (AmountView) view.findViewById(R.id.amt7);
AmountView amt8 = (AmountView) view.findViewById(R.id.amt8);
final EditText et1 = (EditText) view.findViewById(R.id.et_amt1);
final EditText et2 = (EditText) view.findViewById(R.id.et_amt2);
final EditText et3 = (EditText) view.findViewById(R.id.et_amt3);
final EditText et4 = (EditText) view.findViewById(R.id.et_amt4);
final TextView et1 = (TextView) view.findViewById(R.id.et_amt1);
final TextView et2 = (TextView) view.findViewById(R.id.et_amt2);
final TextView et3 = (TextView) view.findViewById(R.id.et_amt3);
final TextView et4 = (TextView) view.findViewById(R.id.et_amt4);
TextView tv_title = (TextView) view.findViewById(R.id.dialog_title);
ImageView iv_cancel = (ImageView) view.findViewById(R.id.iv_cancel);
......@@ -807,6 +817,7 @@ public class DialogMainSetUtils {
SpinnerAdapter adapter2 = new SpinnerAdapter(mContext,
android.R.layout.simple_spinner_item, options2);
spinner2.setAdapter(adapter2);
spinner2.setSelection(1);
if (title != null) {
tv_title.setText(title);
......@@ -1075,7 +1086,7 @@ public class DialogMainSetUtils {
SpinnerAdapter adapter2 = new SpinnerAdapter(mContext,
android.R.layout.simple_spinner_item, options2);
spinner2.setAdapter(adapter2);
spinner2.setSelection(1);
//窗口设置
String CanTeenCode = SPUtil.getInstance().readString("CanTeenCode");
String data = SPUtil.getInstance().readString("CanteenWindows");
......
TOP_Pay/app/src/main/java/com/ifavine/pay/view/datepicker/DateUtil.java
......@@ -84,16 +84,17 @@ public class DateUtil {
}
public static String formatDate(String date, String format) {
String resultD = date;
SimpleDateFormat sdf = new SimpleDateFormat(format);
public static String formatDate(String date, String inFormat, String outFormat) {
SimpleDateFormat in = new SimpleDateFormat(inFormat);
SimpleDateFormat out = new SimpleDateFormat(outFormat);
try {
Date d = sdf.parse(date);
resultD = sdf.format(d);
Date d = in.parse(date);
return out.format(d);
} catch (Exception e) {
e.printStackTrace();
}
return resultD;
return null;
}
public static String formatDate(long milliseconds, String format) {
......
TOP_Pay/app/src/main/java/com/ifavine/pay/vo/WindowCostAmount.java
......@@ -21,8 +21,8 @@ public class WindowCostAmount extends Entity {
public String DinnerType;
public double DinnerAmount;
public double AllowanceAmount;
public String StartTime;
public String EndTime;
public String StartTime = "00:00";
public String EndTime = "00:00";
public String MacAddress;
......
TOP_Pay/app/src/main/res/layout/dialog_amt_set.xml
......@@ -195,7 +195,7 @@
app:btnWidth="36dp"
app:tvWidth="120dp" />
<EditText
<TextView
android:id="@+id/et_amt1"
android:layout_width="200dp"
android:layout_height="50dp"
......@@ -207,7 +207,7 @@
android:minHeight="40dp"
android:paddingLeft="5dp"
android:textColor="@color/font_black_32"
android:textSize="16sp" />
android:textSize="25sp" />
<TextView
android:id="@+id/tv_date1"
......@@ -271,7 +271,7 @@
android:layout_marginRight="15dp"
android:gravity="center"
android:paddingTop="10dp"
app:btnTextSize="25sp"
app:btnTextSize="30sp"
app:btnWidth="36dp"
app:tvWidth="120dp" />
......@@ -287,7 +287,7 @@
app:btnWidth="36dp"
app:tvWidth="120dp" />
<EditText
<TextView
android:id="@+id/et_amt2"
android:layout_width="200dp"
android:layout_height="50dp"
......@@ -299,7 +299,7 @@
android:minHeight="40dp"
android:paddingLeft="5dp"
android:textColor="@color/font_black_32"
android:textSize="16sp" />
android:textSize="25sp" />
<TextView
android:id="@+id/tv_date3"
......@@ -379,7 +379,7 @@
app:btnWidth="36dp"
app:tvWidth="120dp" />
<EditText
<TextView
android:id="@+id/et_amt3"
android:layout_width="200dp"
android:layout_height="50dp"
......@@ -391,7 +391,7 @@
android:minHeight="40dp"
android:paddingLeft="5dp"
android:textColor="@color/font_black_32"
android:textSize="16sp" />
android:textSize="25sp" />
<TextView
android:id="@+id/tv_date5"
......@@ -471,7 +471,7 @@
app:btnWidth="36dp"
app:tvWidth="120dp" />
<EditText
<TextView
android:id="@+id/et_amt4"
android:layout_width="200dp"
android:layout_height="50dp"
......@@ -483,7 +483,7 @@
android:minHeight="40dp"
android:paddingLeft="5dp"
android:textColor="@color/font_black_32"
android:textSize="16sp" />
android:textSize="25sp" />
<TextView
android:id="@+id/tv_date7"
......
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