diff --git a/qinnb.txt b/qinnb.txt deleted file mode 100644 index d7883f5..0000000 --- a/qinnb.txt +++ /dev/null @@ -1 +0,0 @@ -试问 diff --git a/readme.txt b/readme.txt deleted file mode 100644 index 897744d..0000000 --- a/readme.txt +++ /dev/null @@ -1,14 +0,0 @@ -1. bmob_test_pull——后台更新代码测试1 -2. Shop ——小组任务代码 -3. 文档中：王尚文的project和许家铭的project - 19:41 2016/8/18 -4. bmob_test_pull——云端数据下载显示代码测试1——成功 - 13:16 2016/8/19 -5. 文档更新，第三章修改，增加需求分析设计用例图 - 8:38 2016/8/20 -6. Shop代码更新，增加“学校通知”功能；整合覃佳明同学 - 图书馆代码，修正部分冲突；增加图书馆，学校通知， - 商店，商品的云端数据 - 18:33 2016/8/22 -7. 修改需求设计用例图，软件体系结构包图，代码问题修正 - 9:06 2016/8/23 diff --git a/test.txt b/test.txt deleted file mode 100644 index 47af198..0000000 --- a/test.txt +++ /dev/null @@ -1,9 +0,0 @@ -11:17 2016/8/1711:17 2016/8/17 -11:17 2016/8/17 -11:18 2016/8/17 - -1. 在标记为“对勾”的第一个文件夹下commit -2. commit只是提交到本地 -3. 在相同的文件夹上进行push即可 - -4.change!8:20 2016/8/18 diff --git a/涓汉浠诲姟鍒嗗伐琛╛涔嬪墠閭ｄ釜浼犻敊浜.png b/涓汉浠诲姟鍒嗗伐琛╛涔嬪墠閭ｄ釜浼犻敊浜.png deleted file mode 100644 index 338edc1..0000000 Binary files a/涓汉浠诲姟鍒嗗伐琛╛涔嬪墠閭ｄ釜浼犻敊浜.png and /dev/null differ diff --git a/浠ｇ爜/鍦ㄨ繖閲3.0/.classpath b/浠ｇ爜/鍦ㄨ繖閲3.0/.classpath index 0461652..feef834 100644 --- a/浠ｇ爜/鍦ㄨ繖閲3.0/.classpath +++ b/浠ｇ爜/鍦ㄨ繖閲3.0/.classpath @@ -5,5 +5,6 @@ + diff --git a/浠ｇ爜/鍦ㄨ繖閲3.0/bin/classes/com/stone/shop/adapter/NewsListAdapter.java~HEAD b/浠ｇ爜/鍦ㄨ繖閲3.0/bin/classes/com/stone/shop/adapter/NewsListAdapter.java~HEAD new file mode 100644 index 0000000..92264ca --- /dev/null +++ b/浠ｇ爜/鍦ㄨ繖閲3.0/bin/classes/com/stone/shop/adapter/NewsListAdapter.java~HEAD @@ -0,0 +1,82 @@ +package com.stone.shop.adapter; + +import java.util.ArrayList; +import java.util.List; + +import com.stone.shop.R; +import com.stone.shop.model.News; + +import android.R.integer; +import android.content.Context; +import android.graphics.pdf.PdfDocument.Page; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.TextView; + +/** + * 鏂伴椈鍒楄〃閫傞厤鍣 + * + * @date 2014-5-3 + * @author Stone + */ +public class NewsListAdapter extends BaseAdapter { + + private Context mContext; + private LayoutInflater mInflater = null; + private List mNewsList = null; // 鎵閫夊垎绫讳笅鐨勬墍鏈夊簵閾哄垪琛 + + public NewsListAdapter(Context context, List newsList) { + mContext = context; + mNewsList = newsList; + mInflater = LayoutInflater.from(context); + } + + @Override + public int getCount() { + return mNewsList.size(); + } + + @Override + public Object getItem(int position) { + return mNewsList.get(position); + } + + @Override + public long getItemId(int position) { + return position; + } + + // 鍒锋柊鍒楄〃涓殑鏁版嵁 + public void refresh(ArrayList list) { + mNewsList = list; + notifyDataSetChanged(); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + NewsHolder newsHolder; + if (convertView == null) { + convertView = mInflater.inflate(R.layout.news_list_item, null); + newsHolder = new NewsHolder(); + newsHolder.tvNewsType = (TextView) convertView + .findViewById(R.id.tv_news_type); + newsHolder.tvNewsTitle = (TextView) convertView + .findViewById(R.id.tv_news_title); + newsHolder.tvNewsDate = (TextView) convertView + .findViewById(R.id.tv_news_date); + convertView.setTag(newsHolder); + } else { + newsHolder = (NewsHolder) convertView.getTag(); + } + //鎷嗗垎瀛楃涓诧紝鍙彇骞存湀鏃 + String[] ss = new String[2]; + ss = mNewsList.get(position).getCreatedAt().split(" "); + newsHolder.tvNewsType.setText(mNewsList.get(position).getType()); //鏂伴椈绫诲瀷 + newsHolder.tvNewsTitle.setText(mNewsList.get(position).getTitle()); //鏂伴椈鏍囬 + newsHolder.tvNewsDate.setText(ss[0]); //鏂伴椈鍙戝竷鏃ユ湡 + return convertView; + } + +} diff --git a/浠ｇ爜/鍦ㄨ繖閲3.0/bin/classes/com/stone/shop/adapter/NewsListAdapter.java~qinjiaming_branch b/浠ｇ爜/鍦ㄨ繖閲3.0/bin/classes/com/stone/shop/adapter/NewsListAdapter.java~qinjiaming_branch new file mode 100644 index 0000000..98c82f2 --- /dev/null +++ b/浠ｇ爜/鍦ㄨ繖閲3.0/bin/classes/com/stone/shop/adapter/NewsListAdapter.java~qinjiaming_branch @@ -0,0 +1,81 @@ +package com.stone.shop.adapter; + +import java.util.ArrayList; +import java.util.List; + +import com.stone.shop.R; +import com.stone.shop.model.News; + +import android.R.integer; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.TextView; + +/** + * 鏂伴椈鍒楄〃閫傞厤鍣 + * + * @date 2014-5-3 + * @author Stone + */ +public class NewsListAdapter extends BaseAdapter { + + private Context mContext; + private LayoutInflater mInflater = null; + private List mNewsList = null; // 鎵閫夊垎绫讳笅鐨勬墍鏈夊簵閾哄垪琛 + + public NewsListAdapter(Context context, List newsList) { + mContext = context; + mNewsList = newsList; + mInflater = LayoutInflater.from(context); + } + + @Override + public int getCount() { + return mNewsList.size(); + } + + @Override + public Object getItem(int position) { + return mNewsList.get(position); + } + + @Override + public long getItemId(int position) { + return position; + } + + // 鍒锋柊鍒楄〃涓殑鏁版嵁 + public void refresh(ArrayList list) { + mNewsList = list; + notifyDataSetChanged(); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + NewsHolder newsHolder; + if (convertView == null) { + convertView = mInflater.inflate(R.layout.news_list_item, null); + newsHolder = new NewsHolder(); + newsHolder.tvNewsType = (TextView) convertView + .findViewById(R.id.tv_news_type); + newsHolder.tvNewsTitle = (TextView) convertView + .findViewById(R.id.tv_news_title); + newsHolder.tvNewsDate = (TextView) convertView + .findViewById(R.id.tv_news_date); + convertView.setTag(newsHolder); + } else { + newsHolder = (NewsHolder) convertView.getTag(); + } + //鎷嗗垎瀛楃涓诧紝鍙彇骞存湀鏃 + String[] ss = new String[2]; + ss = mNewsList.get(position).getCreatedAt().split(" "); + newsHolder.tvNewsType.setText(mNewsList.get(position).getType()); //鏂伴椈绫诲瀷 + newsHolder.tvNewsTitle.setText(mNewsList.get(position).getTitle()); //鏂伴椈鏍囬 + newsHolder.tvNewsDate.setText(ss[0]); //鏂伴椈鍙戝竷鏃ユ湡 + return convertView; + } + +} diff --git a/浠ｇ爜/鍦ㄨ繖閲3.0/bin/classes/com/stone/shop/view/MineInfoActivity.java~HEAD b/浠ｇ爜/鍦ㄨ繖閲3.0/bin/classes/com/stone/shop/view/MineInfoActivity.java~HEAD new file mode 100644 index 0000000..d5ce189 --- /dev/null +++ b/浠ｇ爜/鍦ㄨ繖閲3.0/bin/classes/com/stone/shop/view/MineInfoActivity.java~HEAD @@ -0,0 +1,124 @@ +package com.stone.shop.view; + +import java.util.List; + +import cn.bmob.v3.BmobQuery; +import cn.bmob.v3.BmobUser; +import cn.bmob.v3.listener.FindListener; + +import com.stone.date.MessageDef; +import com.stone.shop.R; +import com.stone.shop.model.User; + +import android.app.Activity; +import android.content.Intent; +import android.os.Bundle; +import android.os.Handler; +import android.os.Message; +import android.view.View; +import android.widget.TextView; +import android.widget.Toast; + +/** + * 涓汉璧勬枡鍗 + * @date 2014-5-21 + * @author Stone + */ +public class MineInfoActivity extends Activity { + + private TextView tvUsername; + private TextView tvSchool; + private TextView tvCademy; + private TextView tvDorPart; + private TextView tvDorNum; + private TextView tvPhone; + private TextView tvQQ; + + private User curUser = new User(); + + private Handler mHandler = new Handler() { + @Override + public void handleMessage(Message msg) { + switch (msg.what) { + case MessageDef.MINE_INFO_FINISH_FIND_USER: + initView(); + break; + default: + break; + } + } + }; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_mine_info); + + getCurUser(); + } + + private void initView() { + tvUsername = (TextView) findViewById(R.id.tv_mineinfo_username); + tvSchool = (TextView) findViewById(R.id.tv_mineinfo_school); + tvCademy = (TextView) findViewById(R.id.tv_mineinfo_cademy); + tvDorPart = (TextView) findViewById(R.id.tv_mineinfo_dorpart); + tvDorNum = (TextView) findViewById(R.id.tv_mineinfo_dornum); + tvPhone = (TextView) findViewById(R.id.tv_mineinfo_phone); + tvQQ = (TextView) findViewById(R.id.tv_mineinfo_qq); + + tvUsername.setText(curUser.getUsername()); + tvSchool.setText(curUser.getSchool()); + tvCademy.setText(curUser.getCademy()); + tvDorPart.setText(curUser.getDorPart()); + tvDorNum.setText(curUser.getDorNum()); + tvPhone.setText(curUser.getPhone()); + tvQQ.setText(curUser.getQQ()); + + } + + private void getCurUser() { + BmobUser bmobUser = BmobUser.getCurrentUser(this); + BmobQuery query = new BmobQuery(); + query.addWhereEqualTo("objectId", bmobUser.getObjectId()); + query.findObjects(this, new FindListener() { + + @Override + public void onSuccess(List object) { + curUser = object.get(0); + Message msg = new Message(); + msg.what = MessageDef.MINE_INFO_FINISH_FIND_USER; + mHandler.sendMessage(msg); + } + + @Override + public void onError(int arg0, String arg1) { + toast("浜诧紝 鑾峰彇褰撳墠鐢ㄦ埛澶辫触"); + } + }); + + } + + public void clickEdit(View v) { + Intent toEditMineInfo = new Intent(MineInfoActivity.this, MineInfoEditActivity.class); +// Bundle bundle = new Bundle(); +// bundle.putString("username", curUser.getUsername()); +// bundle.putString("school", curUser.getSchool()); +// bundle.putString("cademy", curUser.getCademy()); +// bundle.putString("dorpart", curUser.getDorPart()); +// bundle.putString("dornum", curUser.getDorNum()); +// bundle.putString("phone", curUser.getPhone()); +// bundle.putString("qq", curUser.getQQ()); +// toEditMineInfo.putExtras(bundle); + startActivity(toEditMineInfo); + } + + public void clickBack(View v) { + finish(); + } + + private void toast(String toast) { + Toast.makeText(this, toast, Toast.LENGTH_SHORT).show(); + } + + +} diff --git a/浠ｇ爜/鍦ㄨ繖閲3.0/bin/classes/com/stone/shop/view/MineInfoActivity.java~qinjiaming_branch b/浠ｇ爜/鍦ㄨ繖閲3.0/bin/classes/com/stone/shop/view/MineInfoActivity.java~qinjiaming_branch new file mode 100644 index 0000000..fd57ca9 --- /dev/null +++ b/浠ｇ爜/鍦ㄨ繖閲3.0/bin/classes/com/stone/shop/view/MineInfoActivity.java~qinjiaming_branch @@ -0,0 +1,116 @@ +package com.stone.shop.view; + +import java.util.List; + +import cn.bmob.v3.BmobQuery; +import cn.bmob.v3.BmobUser; +import cn.bmob.v3.listener.FindListener; + +import com.stone.date.MessageDef; +import com.stone.shop.R; +import com.stone.shop.model.User; + +import android.app.Activity; +import android.content.Intent; +import android.os.Bundle; +import android.os.Handler; +import android.os.Message; +import android.view.View; +import android.widget.TextView; +import android.widget.Toast; + +/** + * 涓汉璧勬枡鍗 + * @date 2014-5-21 + * @author Stone + */ +public class MineInfoActivity extends Activity { + + private TextView tvUsername; + private TextView tvSchool; + private TextView tvCademy; + private TextView tvDorPart; + private TextView tvDorNum; + private TextView tvPhone; + private TextView tvQQ; + + private User curUser = new User(); + + private Handler mHandler = new Handler() { + @Override + public void handleMessage(Message msg) { + switch (msg.what) { + case MessageDef.MINE_INFO_FINISH_FIND_USER: + initView(); + break; + default: + break; + } + } + }; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_mine_info); + + getCurUser(); + } + + private void initView() { + tvUsername = (TextView) findViewById(R.id.tv_mineinfo_username); + tvSchool = (TextView) findViewById(R.id.tv_mineinfo_school); + tvCademy = (TextView) findViewById(R.id.tv_mineinfo_cademy); + tvDorPart = (TextView) findViewById(R.id.tv_mineinfo_dorpart); + tvDorNum = (TextView) findViewById(R.id.tv_mineinfo_dornum); + tvPhone = (TextView) findViewById(R.id.tv_mineinfo_phone); + tvQQ = (TextView) findViewById(R.id.tv_mineinfo_qq); + + tvUsername.setText(curUser.getUsername()); + tvSchool.setText(curUser.getSchool()); + tvCademy.setText(curUser.getCademy()); + tvDorPart.setText(curUser.getDorPart()); + tvDorNum.setText(curUser.getDorNum()); + tvPhone.setText(curUser.getPhone()); + tvQQ.setText(curUser.getQQ()); + + } + + private void getCurUser() { + BmobUser bmobUser = BmobUser.getCurrentUser(this); + BmobQuery query = new BmobQuery(); + query.addWhereEqualTo("objectId", bmobUser.getObjectId()); + query.findObjects(this, new FindListener() { + + @Override + public void onSuccess(List object) { + curUser = object.get(0); + Message msg = new Message(); + msg.what = MessageDef.MINE_INFO_FINISH_FIND_USER; + mHandler.sendMessage(msg); + } + + @Override + public void onError(int arg0, String arg1) { + toast("浜诧紝 鑾峰彇褰撳墠鐢ㄦ埛澶辫触"); + } + }); + + } + + public void clickEdit(View v) { + Intent toEditMineInfo = new Intent(MineInfoActivity.this, MineInfoEditActivity.class); + + startActivity(toEditMineInfo); + } + + public void clickBack(View v) { + finish(); + } + + private void toast(String toast) { + Toast.makeText(this, toast, Toast.LENGTH_SHORT).show(); + } + + +} diff --git a/浠ｇ爜/鍦ㄨ繖閲3.0/bin/classes/com/stone/util/UtilTest.class b/浠ｇ爜/鍦ㄨ繖閲3.0/bin/classes/com/stone/util/UtilTest.class new file mode 100644 index 0000000..21c4792 Binary files /dev/null and b/浠ｇ爜/鍦ㄨ繖閲3.0/bin/classes/com/stone/util/UtilTest.class differ diff --git a/浠ｇ爜/鍦ㄨ繖閲3.0/project.properties b/浠ｇ爜/鍦ㄨ繖閲3.0/project.properties index 17bdc51..5c5f4c7 100644 --- a/浠ｇ爜/鍦ㄨ繖閲3.0/project.properties +++ b/浠ｇ爜/鍦ㄨ繖閲3.0/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-18 +target=android-20 proguard.config=proguard.cfg diff --git a/浠ｇ爜/鍦ㄨ繖閲3.0/src/com/stone/util/UtilTest.java b/浠ｇ爜/鍦ㄨ繖閲3.0/src/com/stone/util/UtilTest.java new file mode 100644 index 0000000..bfe34cc --- /dev/null +++ b/浠ｇ爜/鍦ㄨ繖閲3.0/src/com/stone/util/UtilTest.java @@ -0,0 +1,24 @@ +package com.stone.util; + +import static org.junit.Assert.*; + +import org.junit.Before; +import org.junit.Test; + +public class UtilTest { + + private static Util util = new Util(); + + @Before + public void setUp() throws Exception { + } + + @Test + public void testIsPhoneNumberValid() { + + String testPhone = "12345678900"; + assertEquals(false,testPhone); + + } + +} diff --git a/鍦ㄨ繖閲岋細杞欢闇姹傝鏍艰鏄庝功.doc b/鍦ㄨ繖閲岋細杞欢闇姹傝鏍艰鏄庝功.doc deleted file mode 100644 index fdef825..0000000 Binary files a/鍦ㄨ繖閲岋細杞欢闇姹傝鏍艰鏄庝功.doc and /dev/null differ diff --git a/鏂囨。/鐜嬪皻鏂--涓ゅ懆浠诲姟璁″垝琛.mpp b/鏂囨。/鐜嬪皻鏂--涓ゅ懆浠诲姟璁″垝琛.mpp deleted file mode 100644 index 3ead97a..0000000 Binary files a/鏂囨。/鐜嬪皻鏂--涓ゅ懆浠诲姟璁″垝琛.mpp and /dev/null differ diff --git a/鏂囨。/绗簩娆¤凯浠PT.pptx b/鏂囨。/绗簩娆¤凯浠PT.pptx deleted file mode 100644 index 487dd4a..0000000 Binary files a/鏂囨。/绗簩娆¤凯浠PT.pptx and /dev/null differ diff --git a/鏂囨。/璁稿閾--涓ゅ懆浠诲姟璁″垝琛.mpp b/鏂囨。/璁稿閾--涓ゅ懆浠诲姟璁″垝琛.mpp deleted file mode 100644 index 11de7ef..0000000 Binary files a/鏂囨。/璁稿閾--涓ゅ懆浠诲姟璁″垝琛.mpp and /dev/null differ diff --git a/鏂囨。/杞欢闇姹傝鏍艰鏄庝功.doc b/鏂囨。/杞欢闇姹傝鏍艰鏄庝功.doc index 89748dd..0b7fec2 100644 Binary files a/鏂囨。/杞欢闇姹傝鏍艰鏄庝功.doc and b/鏂囨。/杞欢闇姹傝鏍艰鏄庝功.doc differ diff --git a/鏂囨。/杞欢闇姹傝鏍艰鏄庝功_璧靛啀鏄.doc b/鏂囨。/杞欢闇姹傝鏍艰鏄庝功_璧靛啀鏄.doc deleted file mode 100644 index 0162400..0000000 Binary files a/鏂囨。/杞欢闇姹傝鏍艰鏄庝功_璧靛啀鏄.doc and /dev/null differ diff --git a/妯″瀷/璁ㄨ鍖哄姛鑳介『搴忓浘.vsd b/妯″瀷/璁ㄨ鍖哄姛鑳介『搴忓浘.vsd index 2d6e9b2..08b16ad 100644 Binary files a/妯″瀷/璁ㄨ鍖哄姛鑳介『搴忓浘.vsd and b/妯″瀷/璁ㄨ鍖哄姛鑳介『搴忓浘.vsd differ diff --git a/妯″瀷/杞欢浣撶郴缁撴瀯鍖呭浘.vsdx b/妯″瀷/杞欢浣撶郴缁撴瀯鍖呭浘.vsdx index b69d1b4..6f0314f 100644 Binary files a/妯″瀷/杞欢浣撶郴缁撴瀯鍖呭浘.vsdx and b/妯″瀷/杞欢浣撶郴缁撴瀯鍖呭浘.vsdx differ diff --git a/妯″瀷/闇姹傝璁＄敤渚嬪浘.vsdx b/妯″瀷/闇姹傝璁＄敤渚嬪浘.vsdx index a6caaf0..db260a3 100644 Binary files a/妯″瀷/闇姹傝璁＄敤渚嬪浘.vsdx and b/妯″瀷/闇姹傝璁＄敤渚嬪浘.vsdx differ diff --git a/闇姹傝璁＄敤渚嬪浘.vsdx b/闇姹傝璁＄敤渚嬪浘.vsdx deleted file mode 100644 index 4d2b2a5..0000000 Binary files a/闇姹傝璁＄敤渚嬪浘.vsdx and /dev/null differ diff --git a/椤哄簭鍥.vsdx b/椤哄簭鍥.vsdx deleted file mode 100644 index 72588db..0000000 Binary files a/椤哄簭鍥.vsdx and /dev/null differ