Skip to content

T
TopPay
Commit 47574b7a by qyw
Options

查询ok

parent 9d39ad23
Showing with 277 additions and 32 deletions
TOP_Pay/app/src/main/AndroidManifest.xml
......@@ -23,6 +23,7 @@
<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" />
......
TOP_Pay/app/src/main/java/com/ifavine/pay/adapter/ConsumRecordReportAdapter.java
package com.ifavine.pay.adapter;
import android.content.Context;
import android.text.TextUtils;
import android.widget.TextView;
import com.ifavine.pay.R;
......@@ -60,7 +61,7 @@ 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("失败")) {
if (!TextUtils.isEmpty(q.Remark)) {
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));
......
TOP_Pay/app/src/main/java/com/ifavine/pay/adapter/LocalRecordReportAdapter.java
package com.ifavine.pay.adapter;
import android.content.Context;
import android.text.TextUtils;
import android.widget.TextView;
import com.ifavine.pay.R;
......@@ -61,7 +62,7 @@ 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("失败")) {
if (!TextUtils.isEmpty(q.Remark)) {
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));
......
TOP_Pay/app/src/main/java/com/ifavine/pay/ui/activity/WelcomeActivity.java
......@@ -83,7 +83,7 @@ public class WelcomeActivity extends BaseActivity {
SPUtil.getInstance().writeString("Mac", Mac);
SPUtil.getInstance().writeString("DeviceNo", MD5Util.MD5(Mac));
}
Log.i("ggg", Mac);
Log.i("ggg", "Mac:" + Mac);
gotoActivity(MainActivity.class);
finish();
}
......
TOP_Pay/app/src/main/java/com/ifavine/pay/utils/DialogUtil.java
......@@ -5,7 +5,9 @@ import android.app.Dialog;
import android.app.TimePickerDialog;
import android.content.Context;
import android.graphics.Typeface;
import android.text.Editable;
import android.text.InputType;
import android.text.TextWatcher;
import android.text.method.PasswordTransformationMethod;
import android.view.LayoutInflater;
import android.view.View;
......@@ -18,11 +20,12 @@ import android.widget.TimePicker;
import com.ifavine.pay.R;
import com.ifavine.pay.common.AppContext;
import com.ifavine.pay.ui.activity.MainActivity;
import java.util.Calendar;
public class DialogUtil {
private static Dialog tipDialog;
public static Dialog tipDialog;
private static TextView tipTextView;
public static final int OK = 0xff888801;
......@@ -182,6 +185,22 @@ public class DialogUtil {
return tipDialog;
}
public static TextWatcher textWatcher = new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
public void afterTextChanged(Editable editable) {
MainActivity.Current_Count_DialogInput = 0;
}
};
/**
* showConfirmDialog
......@@ -203,6 +222,7 @@ public class DialogUtil {
Button btn_ok = (Button) view.findViewById(R.id.dialog_ok);
Button btn_cancel = (Button) view.findViewById(R.id.dialog_cancel);
final EditText tv_msg = (EditText) view.findViewById(R.id.dialog_msg);
tv_msg.addTextChangedListener(textWatcher);
TextView tv_title = (TextView) view.findViewById(R.id.dialog_title);
ImageView iv = (ImageView) view.findViewById(R.id.dialog_iv);
ImageView iv_cancel = (ImageView) view.findViewById(R.id.iv_cancel);
......@@ -268,6 +288,7 @@ public class DialogUtil {
dialog.dismiss();
}
});
tipDialog = dialog;
dialog.show();
return dialog;
}
......@@ -279,7 +300,7 @@ public class DialogUtil {
String[] times = tv.getText().toString().split(":");
calendar.set(Calendar.HOUR_OF_DAY, Integer.parseInt(times[0]));
calendar.set(Calendar.MINUTE, Integer.parseInt(times[1]));
new TimePickerDialog(activity, themeResId,
tipDialog = new TimePickerDialog(activity, themeResId,
// 绑定监听器
new TimePickerDialog.OnTimeSetListener() {
@Override
......@@ -291,6 +312,7 @@ public class DialogUtil {
, calendar.get(Calendar.HOUR_OF_DAY)
, calendar.get(Calendar.MINUTE)
// true表示采用24小时制
, true).show();
, true);
tipDialog.show();
}
}
TOP_Pay/app/src/main/java/com/ifavine/pay/view/MDialog.java 0 → 100644
package com.ifavine.pay.view;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.util.Log;
import android.view.Display;
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
import android.view.WindowManager;
import android.widget.TextView;
import com.ifavine.pay.R;
import java.util.ArrayList;
import java.util.List;
public class MDialog extends android.app.Dialog {
public MDialog(Context context, int defStyle) {
super(context, defStyle);
}
@Override
public boolean onTouchEvent(@NonNull MotionEvent event) {
Log.e("ggg", "MDialog");
return super.onTouchEvent(event);
}
@Override
public boolean dispatchKeyEvent(@NonNull KeyEvent event) {
Log.e("ggg", "MDialog");
return super.dispatchKeyEvent(event);
}
@Override
public boolean dispatchTrackballEvent(@NonNull MotionEvent ev) {
Log.e("ggg", "MDialog");
return super.dispatchTrackballEvent(ev);
}
@Override
public boolean dispatchGenericMotionEvent(@NonNull MotionEvent ev) {
Log.e("ggg", "MDialog");
return super.dispatchGenericMotionEvent(ev);
}
@Override
public boolean onTrackballEvent(@NonNull MotionEvent event) {
Log.e("ggg", "MDialog");
return super.onTrackballEvent(event);
}
@Override
public boolean onGenericMotionEvent(@NonNull MotionEvent event) {
Log.e("ggg", "MDialog");
return super.onGenericMotionEvent(event);
}
}
\ No newline at end of file
TOP_Pay/app/src/main/java/com/ifavine/pay/vo/CommonListResponse.java
......@@ -17,6 +17,10 @@ public class CommonListResponse<T> extends Entity {
public String TotalDinnerAmount;
public String TotalAllowanceAmount;
public String TotalConsumption;
public String BreakFastTotal;
public String LunchTotal;
public String SupperTotal;
public String NightTotal;
public int Total;
public class Data<T> {
......
TOP_Pay/app/src/main/res/layout/dialog_amt_set.xml
......@@ -8,6 +8,7 @@
<LinearLayout
android:id="@+id/ll"
android:layout_width="fill_parent"
android:layout_height="800dp"
android:layout_centerHorizontal="true"
......
TOP_Pay/app/src/main/res/layout/dialog_report_local.xml
......@@ -8,6 +8,7 @@
<LinearLayout
android:id="@+id/ll"
android:layout_width="fill_parent"
android:layout_height="800dp"
android:layout_centerHorizontal="true"
......@@ -339,28 +340,101 @@
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:text="消费人数:"
android:text="消费人数:(早餐:"
android:textColor="@color/font_black_32"
android:textSize="23dp" />
<TextView
android:id="@+id/tv_Total"
android:id="@+id/tv_BreakFastTotal"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:paddingRight="5dp"
android:textColor="@color/red"
android:textSize="23dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginLeft="150dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:paddingRight="5dp"
android:text="午餐:"
android:textColor="@color/font_black_32"
android:textSize="23dp" />
<TextView
android:id="@+id/tv_LunchTotal"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="5dp"
android:textColor="@color/red"
android:textSize="23dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="5dp"
android:text="晚餐:"
android:textColor="@color/font_black_32"
android:textSize="23dp" />
<TextView
android:id="@+id/tv_SupperTotal"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="5dp"
android:textColor="@color/red"
android:textSize="23dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="5dp"
android:text="夜宵:"
android:textColor="@color/font_black_32"
android:textSize="23dp" />
<TextView
android:id="@+id/tv_NightTotal"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
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="5dp"
android:text=")"
android:textColor="@color/font_black_32"
android:textSize="23dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginLeft="30dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="5dp"
android:text="合计:(消费金额:"
android:textColor="@color/font_black_32"
android:textSize="23dp" />
......@@ -371,7 +445,7 @@
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:paddingRight="5dp"
android:textColor="@color/red"
android:textSize="23dp" />
......@@ -380,8 +454,8 @@
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:text=" 公司补助: "
android:paddingRight="5dp"
android:text="公司补助: "
android:textColor="@color/font_black_32"
android:textSize="23dp" />
......@@ -391,7 +465,7 @@
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:paddingRight="5dp"
android:textColor="@color/red"
android:textSize="23dp" />
......@@ -400,8 +474,8 @@
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:text=" 个人消费: "
android:paddingRight="5dp"
android:text="个人消费: "
android:textColor="@color/font_black_32"
android:textSize="23dp" />
......@@ -411,7 +485,6 @@
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:textColor="@color/red"
android:textSize="23dp" />
......
TOP_Pay/app/src/main/res/layout/dialog_report_record.xml
......@@ -8,6 +8,7 @@
<LinearLayout
android:id="@+id/ll"
android:layout_width="fill_parent"
android:layout_height="800dp"
android:layout_alignParentLeft="true"
......@@ -356,28 +357,102 @@
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:text="消费人数:"
android:text="消费人数:(早餐:"
android:textColor="@color/font_black_32"
android:textSize="23dp" />
<TextView
android:id="@+id/tv_Total"
android:id="@+id/tv_BreakFastTotal"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:paddingRight="5dp"
android:textColor="@color/red"
android:textSize="23dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginLeft="150dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:paddingRight="5dp"
android:text="午餐:"
android:textColor="@color/font_black_32"
android:textSize="23dp" />
<TextView
android:id="@+id/tv_LunchTotal"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="5dp"
android:textColor="@color/red"
android:textSize="23dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="5dp"
android:text="晚餐:"
android:textColor="@color/font_black_32"
android:textSize="23dp" />
<TextView
android:id="@+id/tv_SupperTotal"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="5dp"
android:textColor="@color/red"
android:textSize="23dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="5dp"
android:text="夜宵:"
android:textColor="@color/font_black_32"
android:textSize="23dp" />
<TextView
android:id="@+id/tv_NightTotal"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
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="5dp"
android:text=")"
android:textColor="@color/font_black_32"
android:textSize="23dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginLeft="30dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="5dp"
android:text="合计:(消费金额:"
android:textColor="@color/font_black_32"
android:textSize="23dp" />
......@@ -388,7 +463,7 @@
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:paddingRight="5dp"
android:textColor="@color/red"
android:textSize="23dp" />
......@@ -397,8 +472,8 @@
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:text=" 公司补助: "
android:paddingRight="5dp"
android:text="公司补助: "
android:textColor="@color/font_black_32"
android:textSize="23dp" />
......@@ -408,7 +483,7 @@
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:paddingRight="5dp"
android:textColor="@color/red"
android:textSize="23dp" />
......@@ -417,8 +492,8 @@
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:text=" 个人消费: "
android:paddingRight="5dp"
android:text="个人消费: "
android:textColor="@color/font_black_32"
android:textSize="23dp" />
......@@ -428,7 +503,6 @@
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:paddingRight="10dp"
android:textColor="@color/red"
android:textSize="23dp" />
......
TOP_Pay/app/src/main/res/layout/dialog_report_sum.xml
......@@ -8,6 +8,7 @@
<LinearLayout
android:id="@+id/ll"
android:layout_width="fill_parent"
android:layout_height="800dp"
android:layout_centerHorizontal="true"
......
TOP_Pay/app/src/main/res/layout/item_consum_report.xml
......@@ -126,6 +126,7 @@
android:layout_width="300dp"
android:layout_height="60dp"
android:gravity="center"
android:paddingRight="20dp"
android:text="备注"
android:textColor="@color/font_black_20"
android:textSize="25dp" />
......
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