diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/Shop.apk b/代码/Shop_8.18_by_qinjiaming/Shop/bin/Shop.apk index c89a74b..69e8996 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/Shop.apk and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/Shop.apk differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes.dex b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes.dex index ca27ad7..066b62b 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes.dex and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes.dex differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/adapter/GridAdapter.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/adapter/GridAdapter.class index b01cf90..4b7f1ed 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/adapter/GridAdapter.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/adapter/GridAdapter.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/model/Library.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/model/Library.class new file mode 100644 index 0000000..c8b07ce Binary files /dev/null and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/model/Library.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1$1.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1$1.class index aef0b35..4be8b1a 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1$1.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1$1.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1.class index 539451d..5d44a7a 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LibraryReservationActivity$2.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LibraryReservationActivity$2.class index 9f9f57d..6861c5a 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LibraryReservationActivity$2.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LibraryReservationActivity$2.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LibraryReservationActivity.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LibraryReservationActivity.class index 12dbdd5..02c4463 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LibraryReservationActivity.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LibraryReservationActivity.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$1.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$1.class index 6be525c..ac77d35 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$1.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$1.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$2.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$2.class index 7e52794..f111978 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$2.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$2.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$3.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$3.class index 2b5c29e..ef5ddd1 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$3.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$3.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$4$1.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$4$1.class index 72a769b..a3e7784 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$4$1.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$4$1.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$4.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$4.class index b6566b4..e388588 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$4.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$4.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class index f4ee115..6b855b5 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity.class index 28f181a..2fbbb96 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/LoginActivity.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/OrderActivity$1.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/OrderActivity$1.class index 0415ea2..9342797 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/OrderActivity$1.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/OrderActivity$1.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/OrderActivity$2.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/OrderActivity$2.class index c0cbaae..ba5b6e4 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/OrderActivity$2.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/OrderActivity$2.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/OrderActivity.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/OrderActivity.class index d381663..f87e17d 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/OrderActivity.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/OrderActivity.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/ReservationActivity$2$1$1.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/ReservationActivity$2$1$1.class index 505a578..63e5192 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/ReservationActivity$2$1$1.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/ReservationActivity$2$1$1.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/ReservationActivity$2$1.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/ReservationActivity$2$1.class index 9180f97..eb3dd22 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/ReservationActivity$2$1.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/ReservationActivity$2$1.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/ReservationActivity$2.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/ReservationActivity$2.class index faa17b7..12cc9db 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/ReservationActivity$2.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/ReservationActivity$2.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/ReservationActivity.class b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/ReservationActivity.class index 4a81a33..8941309 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/ReservationActivity.class and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/classes/com/stone/shop/view/ReservationActivity.class differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/dexedLibs/android-support-v4-a84f6ebbc3d7b255c744e57a676b8dfa.jar b/代码/Shop_8.18_by_qinjiaming/Shop/bin/dexedLibs/android-support-v4-a84f6ebbc3d7b255c744e57a676b8dfa.jar new file mode 100644 index 0000000..143a3d2 Binary files /dev/null and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/dexedLibs/android-support-v4-a84f6ebbc3d7b255c744e57a676b8dfa.jar differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/dexedLibs/bmobPush_0.1beta-dab08440ba884dfdc0546cfc7de01dcd.jar b/代码/Shop_8.18_by_qinjiaming/Shop/bin/dexedLibs/bmobPush_0.1beta-dab08440ba884dfdc0546cfc7de01dcd.jar new file mode 100644 index 0000000..d2f40af Binary files /dev/null and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/dexedLibs/bmobPush_0.1beta-dab08440ba884dfdc0546cfc7de01dcd.jar differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/dexedLibs/bmob_v3.1.0beta-14b096b6bd33db5db1c327fa10d94b48.jar b/代码/Shop_8.18_by_qinjiaming/Shop/bin/dexedLibs/bmob_v3.1.0beta-14b096b6bd33db5db1c327fa10d94b48.jar new file mode 100644 index 0000000..48c1ed6 Binary files /dev/null and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/dexedLibs/bmob_v3.1.0beta-14b096b6bd33db5db1c327fa10d94b48.jar differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/dexedLibs/mta-sdk-1.6.2-a0aa2450df71e3e69828e574c78ca9fa.jar b/代码/Shop_8.18_by_qinjiaming/Shop/bin/dexedLibs/mta-sdk-1.6.2-a0aa2450df71e3e69828e574c78ca9fa.jar new file mode 100644 index 0000000..103fc93 Binary files /dev/null and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/dexedLibs/mta-sdk-1.6.2-a0aa2450df71e3e69828e574c78ca9fa.jar differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/dexedLibs/open_sdk_r5756-42045eb2713d4838034e6b85d78bafd9.jar b/代码/Shop_8.18_by_qinjiaming/Shop/bin/dexedLibs/open_sdk_r5756-42045eb2713d4838034e6b85d78bafd9.jar new file mode 100644 index 0000000..27a8da4 Binary files /dev/null and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/dexedLibs/open_sdk_r5756-42045eb2713d4838034e6b85d78bafd9.jar differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/bin/resources.ap_ b/代码/Shop_8.18_by_qinjiaming/Shop/bin/resources.ap_ index a3d63e5..534173e 100644 Binary files a/代码/Shop_8.18_by_qinjiaming/Shop/bin/resources.ap_ and b/代码/Shop_8.18_by_qinjiaming/Shop/bin/resources.ap_ differ diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/adapter/GridAdapter.java b/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/adapter/GridAdapter.java index 9cc78c8..ef753d3 100644 --- a/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/adapter/GridAdapter.java +++ b/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/adapter/GridAdapter.java @@ -1,6 +1,6 @@ package com.stone.shop.adapter; -import android.R.integer; +//import android.R.integer; import android.content.Context; import android.view.View; import android.view.ViewGroup; @@ -83,7 +83,6 @@ public class GridAdapter extends BaseAdapter { public View getView(int position, View convertView, ViewGroup parent) { View view = View.inflate(mContext, R.layout.shop_grid_item, null); // RelativeLayout rl = (RelativeLayout) - // view.findViewById(R.id.relaGrid); ImageView image = (ImageView) view.findViewById(R.id.img_chooseImage); TextView text = (TextView) view.findViewById(R.id.tv_chooseText); diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/model/Library.java b/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/model/Library.java new file mode 100644 index 0000000..f627301 --- /dev/null +++ b/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/model/Library.java @@ -0,0 +1,30 @@ +package com.stone.shop.model; + +import cn.bmob.v3.BmobObject; + +public class Library { + private String name; + private String type; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + @Override + public String toString() { + return "Library [name= " + name + "tpye= " + type + "]"; + } + +} diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/view/LibraryReservationActivity.java b/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/view/LibraryReservationActivity.java index 6b8b5c3..325c8b5 100644 --- a/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/view/LibraryReservationActivity.java +++ b/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/view/LibraryReservationActivity.java @@ -72,7 +72,7 @@ public class LibraryReservationActivity extends Activity { btnLogin.setText("已经预定" + (TextUtils.isEmpty(dateTime) ? "" : (" " + dateTime))); } } catch (ParseException e) { - // TODO Auto-generated catch block + // TODO //e.printStackTrace(); logger.log(Level.SEVERE, "something may be wrong", e); } @@ -86,12 +86,13 @@ public class LibraryReservationActivity extends Activity { btnLogin.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - // TODO Auto-generated method stub + // TODO DateTimePickDialogUtil dateTimePicKDialog = new DateTimePickDialogUtil(LibraryReservationActivity.this, dateFormat.format(new Date())); dateTimePicKDialog.dateTimePicKDialog(new DateTimeListener() { @Override public void onDateTimeChane(final String dateTime) { + //TODO Reservation libreservation = new Reservation(); libreservation.setRoomId(roomId); libreservation.setRoomName(roomName); @@ -100,14 +101,14 @@ public class LibraryReservationActivity extends Activity { libreservation.save(LibraryReservationActivity.this, new SaveListener() { @Override public void onSuccess() { - // TODO Auto-generated method stub + // TODO toast("预定成功"); btnLogin.setEnabled(false); btnLogin.setText("已经预定 " + dateTime); } @Override public void onFailure(int arg0, String arg1) { - // TODO Auto-generated method stub + // TODO toast("预定失败"); } }); diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/view/LoginActivity.java b/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/view/LoginActivity.java index 8d76303..14562f2 100644 --- a/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/view/LoginActivity.java +++ b/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/view/LoginActivity.java @@ -1,9 +1,8 @@ package com.stone.shop.view; -import java.io.IOException; -import java.io.InputStream; -import java.net.HttpURLConnection; -import java.net.URL; + +import java.util.logging.Level; +import java.util.logging.Logger; import org.json.JSONException; import org.json.JSONObject; @@ -13,8 +12,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.Color; + import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -68,7 +66,7 @@ public class LoginActivity extends Activity implements OnClickListener { // QQ登陆 private static Tencent mTencent; - // private QQAuth mQQAuth; + Handler mHandler = new Handler() { @@ -76,12 +74,15 @@ public class LoginActivity extends Activity implements OnClickListener { public void handleMessage(Message msg) { if (msg.what == 0) { JSONObject response = (JSONObject) msg.obj; - if (response.has("nickname")) { + if (response.has("nickname")) + { + Logger logger = Logger.getLogger("lavasoft"); try { mUserInfo.setVisibility(android.view.View.VISIBLE); mUserInfo.setText(response.getString("nickname")); } catch (JSONException e) { - e.printStackTrace(); + //e.printStackTrace(); + logger.log(Level.SEVERE, "something may be wrong", e); } } @@ -226,22 +227,28 @@ public class LoginActivity extends Activity implements OnClickListener { @Override public void onComplete(Object response) { - if (null == response) { + if (response == null) { Util.showResultDialog(LoginActivity.this, "返回为空", "登录失败"); return; } JSONObject jsonResponse = (JSONObject) response; - if (null != jsonResponse && jsonResponse.length() == 0) { + if (jsonResponse!=null && jsonResponse.length() == 0) + { Util.showResultDialog(LoginActivity.this, "返回为空", "登录失败"); return; } // Util.showResultDialog(LoginActivity.this, response.toString(), "登录成功"); doComplete((JSONObject) response); - try { + Logger logger = Logger.getLogger("lavasoft"); + try + { User.userId = jsonResponse.getString("openid"); - } catch (JSONException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + } + catch (JSONException e) + { + // TODO + //e.printStackTrace(); + logger.log(Level.SEVERE, "something may be wrong", e); } Intent toHome = new Intent(LoginActivity.this, BaseActivity.class); @@ -288,10 +295,12 @@ public class LoginActivity extends Activity implements OnClickListener { JSONObject json = (JSONObject) response; if (json.has("figureurl")) { Bitmap bitmap = null; + Logger logger = Logger.getLogger("lavasoft"); try { bitmap = Util.getbitmap(json.getString("figureurl_qq_2")); - } catch (JSONException e) { - + } catch (JSONException e) + { + logger.log(Level.SEVERE, "something may be wrong", e); } Message msg = new Message(); msg.obj = bitmap; @@ -318,7 +327,9 @@ public class LoginActivity extends Activity implements OnClickListener { } } - public static void initOpenidAndToken(JSONObject jsonObject) { + public static void initOpenidAndToken(JSONObject jsonObject) + { + Logger logger = Logger.getLogger("lavasoft"); try { String token = jsonObject.getString(Constants.PARAM_ACCESS_TOKEN); String expires = jsonObject.getString(Constants.PARAM_EXPIRES_IN); @@ -327,7 +338,11 @@ public class LoginActivity extends Activity implements OnClickListener { mTencent.setAccessToken(token, expires); mTencent.setOpenId(openId); } - } catch (Exception e) { + } + + catch (Exception e) + { + logger.log(Level.SEVERE, "something may be wrong", e); } } diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/view/OrderActivity.java b/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/view/OrderActivity.java index 07cde0c..761dbbf 100644 --- a/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/view/OrderActivity.java +++ b/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/view/OrderActivity.java @@ -43,10 +43,9 @@ public class OrderActivity extends Activity implements OnClickListener{ private Button btnOrderCountLess; // 减少数量 private Button btnOrderSetTime; // 设置时间 - private Button btnDlgOk; // 设置时间完成 +// private Button btnDlgOk; // 设置时间完成 private Button btnOrderSubmit; // 提交订单 -// private DialogOrder dlgSetOrderTime; // private View dlgOrderView; private int mHour; private int mMinute; @@ -77,7 +76,6 @@ public class OrderActivity extends Activity implements OnClickListener{ shopID = getIntent().getStringExtra("shopID"); initView(); - //initDlgView(); } private void initView() { @@ -104,14 +102,7 @@ public class OrderActivity extends Activity implements OnClickListener{ } -// private void initDlgView() { -// LayoutInflater inflater = LayoutInflater.from(this); -// dlgOrderView = inflater.inflate(R.layout.dlg_order_settime, null); -// tpOrderTime = (TimePicker) dlgOrderView.findViewById(R.id.tp_dlg_time); -// tpOrderTime.setIs24HourView(true); -// btnDlgOk = (Button) dlgOrderView.findViewById(R.id.btn_dlg_ok); -// btnDlgOk.setOnClickListener(this); -// } + @Override public void onClick(View v) { @@ -146,10 +137,8 @@ public class OrderActivity extends Activity implements OnClickListener{ time = tpOrderTime.getCurrentHour()+ " : " + tpOrderTime.getCurrentMinute(); dlgSetOrderTime.dismiss(); case R.id.btn_order_submit: - //toast("小菜订单提交成功"); postOrder(); finish(); - //back(); break; default: break; diff --git a/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/view/ReservationActivity.java b/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/view/ReservationActivity.java index ad891a7..a474de8 100644 --- a/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/view/ReservationActivity.java +++ b/代码/Shop_8.18_by_qinjiaming/Shop/src/com/stone/shop/view/ReservationActivity.java @@ -73,7 +73,7 @@ public class ReservationActivity extends Activity { btnLogin.setText("已经预定" + (TextUtils.isEmpty(dateTime) ? "" : (" " + dateTime))); } } catch (ParseException e) { - // TODO Auto-generated catch block + // TODO //e.printStackTrace(); logger.log(Level.SEVERE, "something may be wrong", e); @@ -90,13 +90,14 @@ public class ReservationActivity extends Activity { @Override public void onClick(View v) { + // TODO DateTimePickDialogUtil dateTimePicKDialog = new DateTimePickDialogUtil(ReservationActivity.this, dateFormat.format(new Date())); dateTimePicKDialog.dateTimePicKDialog(new DateTimeListener() { @Override public void onDateTimeChane(final String dateTime) { - // TODO Auto-generated method stub + // TODO Reservation reservation = new Reservation(); reservation.setRoomId(roomId); reservation.setRoomName(roomName); @@ -106,6 +107,7 @@ public class ReservationActivity extends Activity { reservation.save(ReservationActivity.this, new SaveListener() { @Override public void onSuccess() { + // TODO toast("预定成功"); btnLogin.setEnabled(false); btnLogin.setText("已经预定 " + dateTime); @@ -113,6 +115,7 @@ public class ReservationActivity extends Activity { @Override public void onFailure(int arg0, String arg1) { + // TODO toast("预定失败"); } }); diff --git a/在这里：软件需求规格说明书.doc b/在这里：软件需求规格说明书.doc index e2d137c..fdef825 100644 Binary files a/在这里：软件需求规格说明书.doc and b/在这里：软件需求规格说明书.doc differ diff --git a/顺序图.vsdx b/顺序图.vsdx new file mode 100644 index 0000000..1230cc5 Binary files /dev/null and b/顺序图.vsdx differ