Skip to content

T
TopPay
Commit 44a32eb0 by qyw
Options

微信支付成功

parent 1d9d8e7c
Showing with 127 additions and 51 deletions
TOP_Pay/app/src/main/java/com/ifavine/pay/adapter/SpinnerAdapter.java
......@@ -15,17 +15,26 @@ import com.ifavine.pay.utils.BaseUtil;
* Created by Administrator on 2018/10/18.
*/
public class SpinnerAdapter extends ArrayAdapter<String> {
public class SpinnerAdapter extends ArrayAdapter<Object> {
Context context;
String[] items = new String[]{};
Object[] items = new Object[]{};
public SpinnerAdapter(final Context context,
final int textViewResourceId, final String[] objects) {
final int textViewResourceId, final Object[] objects) {
super(context, textViewResourceId, objects);
this.items = objects;
this.context = context;
}
public void setData(final Object[] objects) {
this.items = objects;
}
@Override
public int getCount() {
return items.length;
}
@Override
public View getDropDownView(int position, View convertView,
ViewGroup parent) {
......@@ -39,7 +48,7 @@ public class SpinnerAdapter extends ArrayAdapter<String> {
TextView tv = (TextView) convertView
.findViewById(android.R.id.text1);
tv.setPadding(10, 10, 10, 10);
tv.setText(items[position]);
tv.setText((String) items[position]);
tv.setGravity(Gravity.CENTER);
tv.setTextColor(Color.BLACK);
tv.setTextSize(BaseUtil.Dp2Px(context, 23));
......@@ -56,7 +65,7 @@ public class SpinnerAdapter extends ArrayAdapter<String> {
TextView tv = (TextView) convertView
.findViewById(android.R.id.text1);
tv.setPadding(10, 10, 10, 10);
tv.setText(items[position]);
tv.setText((String) items[position]);
tv.setGravity(Gravity.CENTER);
tv.setTextColor(Color.BLACK);
tv.setTextSize(BaseUtil.Dp2Px(context, 20));
......
TOP_Pay/app/src/main/java/com/ifavine/pay/api/APIService.java
......@@ -5,6 +5,7 @@ import com.ifavine.pay.vo.CanteenWindow;
import com.ifavine.pay.vo.CommonListResponse;
import com.ifavine.pay.vo.CommonResponse;
import com.ifavine.pay.vo.User;
import com.ifavine.pay.vo.WindowCostAmount;
import okhttp3.RequestBody;
import retrofit2.Call;
......@@ -17,49 +18,46 @@ import retrofit2.http.POST;
public abstract interface APIService {
@FormUrlEncoded
@POST("getMsgDaliyList")
@POST("WebChat/getMsgDaliyList")
Call<CommonResponse<User>> getMsgDaliyList(@Field("data") String data);
@FormUrlEncoded
@POST("getMeetingTaskReplyList")
@POST("WebChat/getMeetingTaskReplyList")
Call<CommonListResponse<User>> getMsgDaliyList2(@Field("data") String data);
@FormUrlEncoded
@POST("GetServerDate")
@POST("WebChat/GetServerDate")
Call<CommonResponse<String>> GetServerDate(@Body RequestBody info);
@FormUrlEncoded
@POST("GetLocalRecordReport")
@POST("WebChat/GetLocalRecordReport")
Call<CommonResponse<String>> GetLocalRecordReport(@Body RequestBody info);
@FormUrlEncoded
@POST("GetMonthRecordReport")
@POST("WebChat/GetMonthRecordReport")
Call<CommonResponse<String>> GetMonthRecordReport(@Body RequestBody info);
@FormUrlEncoded
@POST("GetConsumRecordReport")
@POST("WebChat/GetConsumRecordReport")
Call<CommonResponse<String>> GetConsumRecordReport(@Body RequestBody info);
@FormUrlEncoded
@POST("SubmitPaying")
@POST("WechatPay/SubmitPaying")
Call<CommonResponse<String>> SubmitPaying(@Body RequestBody body);
@POST("GetCanteenWindows")
@POST("WebChat/GetCanteenWindows")
Call<CommonListResponse<CanteenWindow>> GetCanteenWindows(@Body RequestBody body);
@POST("SaveCanteenWindows")
@POST("WebChat/SaveCanteenWindows")
Call<CommonResponse> SaveCanteenWindows(@Body RequestBody body);
@POST("GetWindowCostAmount")
Call<CommonListResponse<CanteenWindow>> GetWindowCostAmount(@Body RequestBody body);
@POST("WebChat/GetWindowCostAmount")
Call<CommonListResponse<WindowCostAmount>> GetWindowCostAmount(@Body RequestBody body);
@POST("SaveWindowCostAmount")
@POST("WebChat/SaveWindowCostAmount")
Call<CommonResponse> SaveWindowCostAmount(@Body RequestBody body);
}
TOP_Pay/app/src/main/java/com/ifavine/pay/api/APIWrapper.java
......@@ -6,6 +6,7 @@ import com.ifavine.pay.vo.CommonListResponse;
import com.ifavine.pay.vo.CommonResponse;
import com.ifavine.pay.vo.User;
import com.ifavine.pay.vo.WindowCostAmount;
import org.json.JSONObject;
......@@ -92,8 +93,15 @@ public class APIWrapper extends RetrofitUtil {
}
public Call<CommonResponse<String>> SubmitPaying(String PayCode, String Mac, String DeviceNo) {
String obj = "";
RequestBody body = RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), obj);
JSONObject data = new JSONObject();
try {
data.put("PayCode", PayCode);
data.put("Mac", Mac);
data.put("DeviceNo", DeviceNo);
} catch (Exception e) {
e.printStackTrace();
}
RequestBody body = RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), data.toString());
return getAPIService().SubmitPaying(body);
}
......@@ -242,7 +250,7 @@ public class APIWrapper extends RetrofitUtil {
* @param Mac
* @return
*/
public Call<CommonListResponse<CanteenWindow>> GetWindowCostAmount(String Mac) {
public Call<CommonListResponse<WindowCostAmount>> GetWindowCostAmount(String Mac) {
JSONObject obj = new JSONObject();
try {
obj.put("MacAddress", Mac);
......
TOP_Pay/app/src/main/java/com/ifavine/pay/api/JsonResponseBodyConverter.java
......@@ -48,7 +48,7 @@ public class JsonResponseBodyConverter<T> implements Converter<ResponseBody, T>
//数据解密
String d = responseBody.string().replaceAll("\\\\", "");
data = d.substring(1, d.length() - 1);
Log.i("aaaaa", "response data2：" + data);
Log.i("aaaaa", "response data：" + data);
} catch (Exception e) {
e.printStackTrace();
}
......
TOP_Pay/app/src/main/java/com/ifavine/pay/common/Constants.java
......@@ -6,7 +6,7 @@ package com.ifavine.pay.common;
public class Constants {
public static final String BASE_URL = "http://121.33.220.19:3080/api/WebChat/";
public static final String BASE_URL = "http://121.33.220.19:3080/api/";
public static final String IMAGE_URL = "http://sisource.topcreating.com";
public static String LANG = "zn-cn";
......
TOP_Pay/app/src/main/java/com/ifavine/pay/ui/activity/WelcomeActivity.java
......@@ -81,6 +81,7 @@ public class WelcomeActivity extends BaseActivity {
}
if (!TextUtils.isEmpty(Mac)) {
SPUtil.getInstance().writeString("Mac", Mac);
SPUtil.getInstance().writeString("DeviceNo", MD5Util.MD5(Mac));
}
Log.i("ggg", Mac);
gotoActivity(MainActivity.class);
......
TOP_Pay/app/src/main/java/com/ifavine/pay/utils/BaseUtil.java
......@@ -545,6 +545,17 @@ public class BaseUtil {
return null;
}
public static long getDateFormat(String date, String inFormat) {
try {
SimpleDateFormat in = new SimpleDateFormat(inFormat);
Date d = in.parse(date);
return d.getTime();
} catch (Exception e) {
}
return System.currentTimeMillis();
}
public static String getDateFormat(long date, String OutFormat) {
try {
Date d = new Date();
......
TOP_Pay/app/src/main/java/com/ifavine/pay/view/AmountView.java
......@@ -21,8 +21,8 @@ import com.ifavine.pay.R;
public class AmountView extends LinearLayout implements View.OnClickListener, TextWatcher {
private static final String TAG = "AmountView";
private double amount = 1; //购买数量
private int goods_storage = 100; //商品库存
private double amount = 1.0; //购买数量
private int goods_storage = 1000; //商品库存
private OnAmountChangeListener mListener;
......@@ -75,17 +75,21 @@ public class AmountView extends LinearLayout implements View.OnClickListener, Te
this.goods_storage = goods_storage;
}
public void setAmount(double amount) {
etAmount.setText("" + amount);
}
@Override
public void onClick(View v) {
int i = v.getId();
if (i == R.id.btnDecrease) {
if (amount > 0) {
amount--;
amount -= 0.5;
etAmount.setText(amount + "");
}
} else if (i == R.id.btnIncrease) {
if (amount < goods_storage) {
amount++;
amount += 0.5;
etAmount.setText(amount + "");
}
}
......
TOP_Pay/app/src/main/java/com/ifavine/pay/vo/CommonResponse.java
......@@ -12,6 +12,15 @@ public class CommonResponse<T> extends Entity {
public T ModelJson;
public int Status;
public String Message;
public String EmpNo;
public String EmpName;
public String EmpDept;
public String EmpDuty;
public String Cost;
public String SubCost;
public String Consumption;
public String IsConsumed;
public String TradeNo;
public boolean isSuccess() {
return (this.Status == 200) || (this.Status == 201);
......
TOP_Pay/app/src/main/java/com/ifavine/pay/vo/WindowCostAmount.java 0 → 100644
package com.ifavine.pay.vo;
import java.io.Serializable;
import java.util.List;
/**
* Created by Administrator on 2018/10/25.
*/
public class WindowCostAmount extends Entity {
// "ID":1,
// "DinnerType":1,
// "DinnerAmount":3.00,
// "AllowanceAmount":2.00,
// "StartTime":"05:00",
// "EndTime":"09:59",
// "MacAddress":"90:2B:34:7D:47:56"
public String ID;
public String DinnerType;
public double DinnerAmount;
public double AllowanceAmount;
public String StartTime;
public String EndTime;
public String MacAddress;
}
TOP_Pay/app/src/main/res/layout/activity_main.xml
......@@ -217,12 +217,11 @@
android:textSize="28dp" />
<TextView
android:id="@+id/tv_type"
android:id="@+id/t_DinnerType"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_marginLeft="20dp"
android:gravity="center"
android:text="类型1"
android:textColor="@color/black"
android:textSize="28dp" />
</LinearLayout>
......@@ -243,12 +242,11 @@
android:textSize="28dp" />
<TextView
android:id="@+id/tv_total"
android:id="@+id/t_DinnerAmount"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_marginLeft="20dp"
android:gravity="center"
android:text="10"
android:textColor="@color/black"
android:textSize="28dp" />
</LinearLayout>
......@@ -269,12 +267,11 @@
android:textSize="28dp" />
<TextView
android:id="@+id/tv_"
android:id="@+id/t_AllowanceAmount"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_marginLeft="20dp"
android:gravity="center"
android:text="6.5"
android:textColor="@color/black"
android:textSize="28dp" />
</LinearLayout>
......@@ -295,12 +292,11 @@
android:textSize="28dp" />
<TextView
android:id="@+id/tv"
android:id="@+id/tv_self"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_marginLeft="20dp"
android:gravity="center"
android:text="3.5"
android:textColor="@color/black"
android:textSize="28dp" />
</LinearLayout>
......@@ -639,11 +635,11 @@
android:paddingTop="10dp">
<TextView
android:layout_width="wrap_content"
android:id="@+id/tv_net"
android:layout_width="150dp"
android:layout_height="fill_parent"
android:layout_marginLeft="20dp"
android:gravity="center"
android:text="网络通畅"
android:textColor="@color/green"
android:textSize="30dp" />
......@@ -653,7 +649,6 @@
android:layout_height="fill_parent"
android:layout_marginRight="150dp"
android:gravity="center"
android:text="支付成功!"
android:textColor="@color/green"
android:textSize="80dp" />
</LinearLayout>
......
TOP_Pay/app/src/main/res/layout/dialog_amt_set.xml
......@@ -62,13 +62,13 @@
android:textSize="28dp" />
<TextView
android:id="@+id/tv_CanTeenName"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="10dp"
android:gravity="center_vertical"
android:text="第一饭堂"
android:textColor="@color/font_black_32"
android:textSize="28dp" />
......@@ -84,13 +84,13 @@
android:textSize="28dp" />
<TextView
android:id="@+id/tv_WindowName"
android:layout_width="110dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="10dp"
android:gravity="center_vertical"
android:text="1号"
android:textColor="@color/font_black_32"
android:textSize="28dp" />
......@@ -196,7 +196,7 @@
app:tvWidth="120dp" />
<EditText
android:id="@+id/dialog_msg"
android:id="@+id/et_amt1"
android:layout_width="200dp"
android:layout_height="50dp"
android:layout_marginLeft="70dp"
......@@ -233,6 +233,7 @@
android:textSize="28dp" />
<TextView
android:id="@+id/tv_date2"
android:layout_width="120dp"
android:layout_height="50dp"
android:layout_marginTop="10dp"
......@@ -287,6 +288,7 @@
app:tvWidth="120dp" />
<EditText
android:id="@+id/et_amt2"
android:layout_width="200dp"
android:layout_height="50dp"
android:layout_marginLeft="70dp"
......@@ -300,6 +302,7 @@
android:textSize="16sp" />
<TextView
android:id="@+id/tv_date3"
android:layout_width="120dp"
android:layout_height="50dp"
android:layout_marginLeft="50dp"
......@@ -322,6 +325,7 @@
android:textSize="28dp" />
<TextView
android:id="@+id/tv_date4"
android:layout_width="120dp"
android:layout_height="50dp"
android:layout_marginTop="10dp"
......@@ -376,6 +380,7 @@
app:tvWidth="120dp" />
<EditText
android:id="@+id/et_amt3"
android:layout_width="200dp"
android:layout_height="50dp"
android:layout_marginLeft="70dp"
......@@ -389,6 +394,7 @@
android:textSize="16sp" />
<TextView
android:id="@+id/tv_date5"
android:layout_width="120dp"
android:layout_height="50dp"
android:layout_marginLeft="50dp"
......@@ -411,6 +417,7 @@
android:textSize="28dp" />
<TextView
android:id="@+id/tv_date6"
android:layout_width="120dp"
android:layout_height="50dp"
android:layout_marginTop="10dp"
......@@ -465,6 +472,7 @@
app:tvWidth="120dp" />
<EditText
android:id="@+id/et_amt4"
android:layout_width="200dp"
android:layout_height="50dp"
android:layout_marginLeft="70dp"
......@@ -478,6 +486,7 @@
android:textSize="16sp" />
<TextView
android:id="@+id/tv_date7"
android:layout_width="120dp"
android:layout_height="50dp"
android:layout_marginLeft="50dp"
......@@ -500,6 +509,7 @@
android:textSize="28dp" />
<TextView
android:id="@+id/tv_date8"
android:layout_width="120dp"
android:layout_height="50dp"
android:layout_marginTop="10dp"
......
TOP_Pay/app/src/main/res/layout/view_progressbar.xml
......@@ -13,13 +13,14 @@
<ProgressBar
android:id="@+id/animProgress"
style="@style/loading"
android:layout_width="50dip"
android:layout_height="50dip" />
android:layout_width="100dip"
android:layout_height="100dip" />
<TextView
android:id="@+id/tipTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="加载中……" />
android:text="加载中……"
android:textSize="30dp" />
</LinearLayout>
\ No newline at end of file
TOP_Pay/app/src/main/res/layout/view_toast.xml
......@@ -36,7 +36,7 @@
android:layout_toRightOf="@id/icon_iv"
android:gravity="center_vertical"
android:textColor="@color/white"
android:textSize="30.0dip" />
android:textSize="35.0dip" />
</RelativeLayout>
</FrameLayout>
......
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