From 87ba09909657dc2decc55ad90d7c637fef52b6d2 Mon Sep 17 00:00:00 2001 From: Administrator <1512995449@qq.com> Date: Sun, 5 Jan 2020 16:13:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/dictionaries/.xml | 10 - .idea/misc.xml | 3 - .../BrowseDonateRecordActivity.java | 7 +- .../sj/raise_money/DataBase/UserService.java | 75 +++---- .../hunnu/sj/raise_money/DonateActivity.java | 12 +- .../java/hunnu/sj/raise_money/InfoUtils.java | 4 +- .../hunnu/sj/raise_money/MainActivity.java | 56 +----- .../sj/raise_money/NewsContentActivity.java | 15 +- .../hunnu/sj/raise_money/RegiteActivity.java | 2 +- .../hunnu/sj/raise_money/SignInActivity.java | 12 +- .../hunnu/sj/raise_money/UploadActivity.java | 4 +- .../main/java/hunnu/sj/raise_money/User.java | 54 +++-- .../donated_record/DonatedRecordAdapter.java | 2 +- .../java/hunnu/sj/raise_money/news/News.java | 43 ++-- .../sj/raise_money/news/NewsAdapter.java | 4 +- .../hunnu/sj/raise_money/record/Record.java | 39 ++-- app/src/main/res/layout/activity_registe.xml | 186 +++++++++++------- 17 files changed, 273 insertions(+), 255 deletions(-) delete mode 100644 .idea/dictionaries/.xml diff --git a/.idea/dictionaries/.xml b/.idea/dictionaries/.xml deleted file mode 100644 index 6273c96..0000000 --- a/.idea/dictionaries/.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - descri - donatemon - recordlist - sttmt - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 37a7509..10467e7 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,7 +3,4 @@ - - \ No newline at end of file diff --git a/app/src/main/java/hunnu/sj/raise_money/BrowseDonateRecordActivity.java b/app/src/main/java/hunnu/sj/raise_money/BrowseDonateRecordActivity.java index f54bf5e..dc25c39 100644 --- a/app/src/main/java/hunnu/sj/raise_money/BrowseDonateRecordActivity.java +++ b/app/src/main/java/hunnu/sj/raise_money/BrowseDonateRecordActivity.java @@ -18,7 +18,7 @@ public class BrowseDonateRecordActivity extends AppCompatActivity { private ArrayList records = new ArrayList<>(); private ListView lv_record; private DonateRecordAdapter recordAdapter; - private String username; + private long user_id; private long stu_id; private Handler mhandler = new Handler(){ @Override @@ -34,8 +34,7 @@ public class BrowseDonateRecordActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_browse_record); Intent intent = getIntent(); - int flags = intent.getIntExtra("flags",-1); - username = intent.getStringExtra("username"); + user_id = intent.getLongExtra("user_id",0); recordAdapter = new DonateRecordAdapter(this,records); lv_record = findViewById(R.id.lv_browse_denate_record); lv_record.setAdapter(recordAdapter); @@ -47,7 +46,7 @@ public class BrowseDonateRecordActivity extends AppCompatActivity { @Override public void run() { Message msg =mhandler.obtainMessage(); - int flags = InfoUtils.getDonateRecords(records,username); + int flags = InfoUtils.getDonateRecords(records,user_id); msg.what = flags; mhandler.sendMessage(msg); } diff --git a/app/src/main/java/hunnu/sj/raise_money/DataBase/UserService.java b/app/src/main/java/hunnu/sj/raise_money/DataBase/UserService.java index c3e0848..7d77002 100644 --- a/app/src/main/java/hunnu/sj/raise_money/DataBase/UserService.java +++ b/app/src/main/java/hunnu/sj/raise_money/DataBase/UserService.java @@ -4,7 +4,6 @@ import android.content.Context; import androidx.core.content.ContextCompat; import java.io.IOException; -import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; import java.sql.Connection; @@ -16,7 +15,6 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; -import java.util.Date; import hunnu.sj.raise_money.record.Record; import hunnu.sj.raise_money.news.News; @@ -32,10 +30,10 @@ public class UserService { public int login(String username,String password){ conn = db.getConnection(); - Statement sttmt = null; + Statement sttmt; try{ sttmt = conn.createStatement(); - String sql = "select * from user where username = '"+username+"'"; + String sql = "select * from user_info where username = '"+username+"'"; PreparedStatement ps = conn.prepareStatement(sql); ResultSet rs1 = ps.executeQuery(); boolean flag1 = rs1.next(); @@ -43,7 +41,7 @@ public class UserService { sttmt.close(); return 0; //当用户名不存在时返回0 } - ResultSet rs2 = sttmt.executeQuery("select * from user where username = '"+username+"'&&password = '"+password+"'"); + ResultSet rs2 = sttmt.executeQuery("select * from user_info where username = '"+username+"'&&password = '"+password+"'"); boolean flag2 = rs2.next(); if(!flag2){ rs2.close(); @@ -55,13 +53,13 @@ public class UserService { }catch (Exception e){ e.printStackTrace(); } - return 0; + return -1; } public boolean register(User user){ conn = db.getConnection();//将用户的信息上传到数据库，上传成功返回true，失败false try{ - String sql = "insert into user(username,password,role) values('"+user.getName()+"','"+user.getPasd()+"','"+user.getRole()+"')"; + String sql = "insert into user_info(username,password,role,phone) values('"+user.getUsername()+"','"+user.getPassword()+"','"+user.getRole()+"','"+user.getPhone()+"')"; Statement sttmt = conn.createStatement(); sttmt.executeUpdate(sql); sttmt.close(); @@ -71,14 +69,15 @@ public class UserService { } return false; } - public boolean donate(String username ,String studentName,Long id,float money){ + + public boolean donate(long stu_id,long user_id,float money){ conn = db.getConnection();//将用户捐款信息上传到数据库，成功返回true，失败返回false try{ String time=getNetTime(); // Date date = new Date();sdf.format(date) //SimpleDateFormat sdf = (SimpleDateFormat) DateFormat.getDateTimeInstance(); - String sql = "insert into record(stu_name,donatemon,username,id,time) values('"+studentName+"','"+money+"','"+username+"','"+id+"','"+time+"')"; - String sql1 ="update stu_info set hasdonated=hasdonated+'"+money+"' where id='"+id+"'"; + String sql = "insert into record(stu_id,user_id,donatemon,time) values('"+stu_id+"','"+user_id+"','"+money+"','"+time+"')"; + String sql1 ="update stu_info set hasdonated=hasdonated+'"+money+"' where stu_id='"+stu_id+"'"; //stu_id,stu_name,donatemon,time,username Statement sttmt = conn.createStatement(); sttmt.executeUpdate(sql); @@ -91,17 +90,16 @@ public class UserService { return false; } public String getNetTime() throws IOException { - URL url=null; - url = new URL("http://www.baidu.com"); - URLConnection baidu = url.openConnection();//生成连接对象 - baidu.connect(); //发出连接 - long time13 = baidu.getDate(); - DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Calendar calendar = Calendar.getInstance(); - calendar.setTimeInMillis(time13); - final String format = formatter.format(calendar.getTime()); - String time=String.valueOf(format); - return time; + URL url; + url = new URL("http://www.baidu.com"); + URLConnection baidu = url.openConnection();//生成连接对象 + baidu.connect(); //发出连接 + long time13 = baidu.getDate(); + DateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss"); + Calendar calendar = Calendar.getInstance(); + calendar.setTimeInMillis(time13); + String format = formatter.format(calendar.getTime()); + return format; } public boolean longterm(String name,String phone,String descri, Long ID){ conn = db.getConnection();//将长期资助信息上传到数据库，成功返回true，失败返回false @@ -118,18 +116,23 @@ public class UserService { } return false; } - public String getRole(String username){//从数据库获取用户的角色 + public User getUserInfo(String username,String password){//从数据库获取用户的角色 //SQLiteDatabase sdb=dbHelper.getReadableDatabase(); - String sql="select role from user where username = '" + username+"'"; + String sql="select * from user_info where username = '" + username+"'and password = '"+password+"'"; + User user = new User(); conn = db.getConnection(); try{ Statement sttmt = conn.createStatement(); ResultSet rs = sttmt.executeQuery(sql); rs.next(); - String role = rs.getString(1); + user.setUser_id(rs.getLong("user_id")); + user.setUsername(rs.getNString("username")); + user.setPassword(rs.getNString("password")); + user.setPhone(rs.getNString("phone")); + user.setRole(rs.getNString("role")); rs.close(); sttmt.close(); - return role; + return user; }catch (SQLException e){ e.printStackTrace(); } @@ -137,7 +140,7 @@ public class UserService { } public boolean UploadInfo(News news){//用户上传信息到数据库，服务器 - String sql = "insert into stu_info(name,descri) values('"+news.getTitle()+"','"+news.getDes() + "')"; + String sql = "insert into stu_info(name,descri) values('"+news.getName()+"','"+news.getDescri() + "')"; conn = db.getConnection(); try{ Statement sttmt = conn.createStatement(); @@ -152,16 +155,16 @@ public class UserService { public void getAllNews(Context context,ArrayList list){ //ArrayList mlist = list; - String sql = "select * from stu_info"; + String sql = "select * from stu_info where flags = 1"; conn = db.getConnection(); try{ Statement sttmt = conn.createStatement(); ResultSet rs = sttmt.executeQuery(sql); while (rs.next()){ News news= new News(); - news.setId(rs.getLong("id")); - news.setTitle(rs.getNString("name")); - news.setDes(rs.getNString("descri")); + news.setStu_id(rs.getLong("stu_id")); + news.setName(rs.getNString("name")); + news.setDescri(rs.getNString("descri")); news.setHead_icon(ContextCompat.getDrawable(context, R.drawable.ic_launcher_background)); list.add(news); } @@ -172,15 +175,17 @@ public class UserService { } } - public void getDonateRecords(ArrayList recordlist,String username){ - String sql = "select * from record where username = '"+username+"'"; + public void getDonateRecords(ArrayList recordlist,long user_id){ + String sql = "select * from record,stu_info where record.stu_id = stu_info.stu_id and record.user_id='"+user_id+"'"; + conn = db.getConnection(); try{ Statement sttmt = conn.createStatement(); ResultSet rs = sttmt.executeQuery(sql); + while(rs.next()){ Record record = new Record(); - record.setStu_name(rs.getNString("stu_name")); + record.setStu_name(rs.getNString("name")); record.setTime(rs.getNString("time")); record.setDonatemon(rs.getFloat("donatemon")); recordlist.add(record); @@ -193,14 +198,14 @@ public class UserService { } public void getDonatedRecords(ArrayList recordlist,long id){ - String sql = "select * from record where id= '"+id+"'"; + String sql = "select * from record,user_info where record.user_id = user_info.user_id and record.stu_id = '"+id+"'"; conn = db.getConnection(); try{ Statement sttmt = conn.createStatement(); ResultSet rs = sttmt.executeQuery(sql); while(rs.next()){ Record record = new Record(); - record.setUsername(rs.getNString("username")); + record.setUser_name(rs.getNString("username")); record.setTime(rs.getNString("time")); record.setDonatemon(rs.getFloat("donatemon")); recordlist.add(record); diff --git a/app/src/main/java/hunnu/sj/raise_money/DonateActivity.java b/app/src/main/java/hunnu/sj/raise_money/DonateActivity.java index d2f9204..b205f58 100644 --- a/app/src/main/java/hunnu/sj/raise_money/DonateActivity.java +++ b/app/src/main/java/hunnu/sj/raise_money/DonateActivity.java @@ -19,7 +19,8 @@ public class DonateActivity extends AppCompatActivity { UserService userService=new UserService(); String username; - String stu_name; + private long stu_id; + private long user_id; Long id; Handler mHandler = new Handler(){//用于处理子线程传回的消息，对主线的UI进行修改 int flag = -1; @@ -52,9 +53,8 @@ public class DonateActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_donate); - id= getIntent().getLongExtra("stu_id",0); - username=getIntent().getStringExtra("username"); - stu_name=getIntent().getStringExtra("stu_name"); + stu_id = getIntent().getLongExtra("stu_id",0); + user_id = getIntent().getLongExtra("user_id",0); // Button commit = (Button) findViewById(R.id.commit); // commit.setOnClickListener(new View.OnClickListener() { // @Override @@ -72,8 +72,6 @@ public class DonateActivity extends AppCompatActivity { } public void onClick(View view){ -// name=findViewById(R.id.Name); -// number=findViewById(R.id.TeleNumber); money=findViewById(R.id.Money); new CommitThread().start(); @@ -154,7 +152,7 @@ public class DonateActivity extends AppCompatActivity { Looper.prepare(); Toast toast=Toast.makeText(DonateActivity.this, "提交成功",Toast.LENGTH_LONG); float money=Float.parseFloat(mon); - userService.donate(username,stu_name,id,money); + userService.donate(stu_id,user_id,money); toast.setGravity(Gravity.CENTER, 100, 100); toast.show(); Looper.loop(); diff --git a/app/src/main/java/hunnu/sj/raise_money/InfoUtils.java b/app/src/main/java/hunnu/sj/raise_money/InfoUtils.java index 35c34a9..be0f5ec 100644 --- a/app/src/main/java/hunnu/sj/raise_money/InfoUtils.java +++ b/app/src/main/java/hunnu/sj/raise_money/InfoUtils.java @@ -15,9 +15,9 @@ public class InfoUtils { return 1; } - public static int getDonateRecords(ArrayList recordlist,String username){ + public static int getDonateRecords(ArrayList recordlist,long user_id){ UserService uService = new UserService(); - uService.getDonateRecords(recordlist,username); + uService.getDonateRecords(recordlist,user_id); return 1; } diff --git a/app/src/main/java/hunnu/sj/raise_money/MainActivity.java b/app/src/main/java/hunnu/sj/raise_money/MainActivity.java index 7e83c4a..e97dcc3 100644 --- a/app/src/main/java/hunnu/sj/raise_money/MainActivity.java +++ b/app/src/main/java/hunnu/sj/raise_money/MainActivity.java @@ -37,9 +37,6 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte private ActionBarDrawerToggle mToggle; private DrawerLayout mDrawerlayout; private NavigationView navigationView; -// private -// TextView menu_name; -// TextView menu_role; private User user; ArrayList list = new ArrayList<>(); Context mContext; @@ -58,55 +55,19 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - Intent intent = getIntent(); user = (User) intent.getSerializableExtra("user"); setContentView(R.layout.activity_main); mContext = this; newsAdapter = new NewsAdapter(this,list); - - init(); if(navigationView.getHeaderCount() > 0) {//设置侧滑栏的显示的值 View header = navigationView.getHeaderView(0); TextView menu_name = header.findViewById(R.id.user_name); TextView menu_role = header.findViewById(R.id.user_role); - menu_name.setText(user.getName()); + menu_name.setText(user.getUsername()); menu_role.setText(user.getRole()); } - /*Toolbar toolbar = findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - FloatingActionButton fab = findViewById(R.id.fab); - fab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) - .setAction("Action", null).show(); - } - }); - DrawerLayout drawer = findViewById(R.id.drawer_layout); - NavigationView navigationView = findViewById(R.id.nav_view); - // Passing each menu ID as a set of Ids because each - // menu should be considered as top level destinations. - mAppBarConfiguration = new AppBarConfiguration.Builder( - R.id.nav_home, R.id.nav_gallery, R.id.nav_slideshow, - R.id.nav_tools, R.id.nav_share, R.id.nav_send) - .setDrawerLayout(drawer) - .build(); - NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment); - NavigationUI.setupActionBarWithNavController(this, navController, mAppBarConfiguration); - NavigationUI.setupWithNavController(navigationView, navController); - - if(navigationView.getHeaderCount() > 0) {//设置侧滑栏的显示的值 - View header = navigationView.getHeaderView(0); - TextView menu_name = header.findViewById(R.id.user_name); - TextView menu_role = header.findViewById(R.id.user_role); - menu_name.setText(user.getName()); - menu_role.setText(user.getRole()); - }*/ - - //setContentView(R.layout.content_main); - //new UploadThread().start(); lv_news = findViewById(R.id.list); lv_news.setAdapter(newsAdapter); lv_news.setOnItemClickListener(this); @@ -128,21 +89,19 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte @Override//点击条目时调用该方法，parent指listview，position指条目位置 public void onItemClick(AdapterView parent, View view, int position, long id) { News news = (News)parent.getItemAtPosition(position); - String title=news.getTitle(); - String des=news.getDes(); - long stu_id = news.getId(); + String title=news.getName(); + String des=news.getDescri(); + long stu_id = news.getStu_id(); Intent intent = new Intent(this,NewsContentActivity.class); intent.putExtra("news_title",title); intent.putExtra("news_des",des); intent.putExtra("stu_id",stu_id); - String username = user.getName(); - intent.putExtra("username",username); + intent.putExtra("user_id",user.getUser_id()); startActivity(intent); } @Override public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. getMenuInflater().inflate(R.menu.main, menu); return true; } @@ -171,9 +130,8 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte public void onBrowseDonateRecord(MenuItem item){ Intent intent = new Intent(this, BrowseDonateRecordActivity.class); - String username = user.getName(); - intent.putExtra("flags",0);//读取用户的捐助信息 - intent.putExtra("username",username); + long user_id = user.getUser_id(); + intent.putExtra("user_id",user_id); startActivity(intent); } diff --git a/app/src/main/java/hunnu/sj/raise_money/NewsContentActivity.java b/app/src/main/java/hunnu/sj/raise_money/NewsContentActivity.java index a86b6ce..f41d5cf 100644 --- a/app/src/main/java/hunnu/sj/raise_money/NewsContentActivity.java +++ b/app/src/main/java/hunnu/sj/raise_money/NewsContentActivity.java @@ -12,6 +12,7 @@ import androidx.appcompat.app.AppCompatActivity; public class NewsContentActivity extends AppCompatActivity{ private long stu_id; + private long user_id; String username; String newsTitle; // public static void actionStart(Context context, String newsTitle, String newsContent) { @@ -29,7 +30,7 @@ public class NewsContentActivity extends AppCompatActivity{ newsTitle = getIntent().getStringExtra("news_title"); // 获取传入的新闻标题 String newsContent = getIntent().getStringExtra("news_content"); // 获取传入的新闻内容 stu_id = getIntent().getLongExtra("stu_id",0); - username=getIntent().getStringExtra("username"); + user_id = getIntent().getLongExtra("user_id",0); NewsContentFragment newsContentFragment = (NewsContentFragment) getFragmentManager().findFragmentById(R.id.news_content_fragment); newsContentFragment.refresh(newsTitle, newsContent); // 刷新NewsContentFragment界面 @@ -44,12 +45,11 @@ public class NewsContentActivity extends AppCompatActivity{ button1.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - Intent intent1 = new Intent(); - intent1.setClass(NewsContentActivity.this, DonateActivity.class);//this前面为当前activty名称，class前面为要跳转到得activity名称 - intent1.putExtra("stu_id",stu_id); - intent1.putExtra("username",username); - intent1.putExtra("stu_name",newsTitle); - startActivity(intent1); + Intent intent = new Intent(); + intent.setClass(NewsContentActivity.this, DonateActivity.class);//this前面为当前activty名称，class前面为要跳转到得activity名称 + intent.putExtra("stu_id",stu_id); + intent.putExtra("user_id",user_id); + startActivity(intent); } }); } @@ -65,6 +65,7 @@ public class NewsContentActivity extends AppCompatActivity{ } }); } + public void onToLongTerm( ){ Button longterm=(Button) findViewById(R.id.longterm); longterm.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/hunnu/sj/raise_money/RegiteActivity.java b/app/src/main/java/hunnu/sj/raise_money/RegiteActivity.java index 70eae4d..fac1527 100644 --- a/app/src/main/java/hunnu/sj/raise_money/RegiteActivity.java +++ b/app/src/main/java/hunnu/sj/raise_money/RegiteActivity.java @@ -88,7 +88,7 @@ public class RegiteActivity extends AppCompatActivity { message.what = 2; message.obj = "密码验证错误"; rHandler.sendMessage(message); - }else if(uService.login(username,password)==2){ + }else if(uService.login(username,password)!=0){ message.what = 3; message.obj = "用户已存在"; rHandler.sendMessage(message);//发送信息给handler diff --git a/app/src/main/java/hunnu/sj/raise_money/SignInActivity.java b/app/src/main/java/hunnu/sj/raise_money/SignInActivity.java index e8db57e..065152a 100644 --- a/app/src/main/java/hunnu/sj/raise_money/SignInActivity.java +++ b/app/src/main/java/hunnu/sj/raise_money/SignInActivity.java @@ -11,6 +11,7 @@ import android.os.Message; import android.view.View; import android.widget.Button; import android.widget.EditText; +import android.widget.Toast; import java.util.ArrayList; @@ -81,12 +82,13 @@ public class SignInActivity extends AppCompatActivity { message.what = 1; message.obj = "密码错误"; mHandler.sendMessage(message); + }else if(flag==-1){ + Looper.prepare(); + Toast toast = Toast.makeText(SignInActivity.this,"断网了！",Toast.LENGTH_SHORT); + toast.show(); + Looper.loop(); }else{ - User user = new User(); - user.setName(name); - user.setPasd(pasd); - String role = uService.getRole(name); - user.setRole(role); + User user = uService.getUserInfo(name,pasd); Bundle bundle = new Bundle();//将类包装到bundle里，再放到intent里 bundle.putSerializable("user",user); Intent intent =new Intent(SignInActivity.this,MainActivity.class); diff --git a/app/src/main/java/hunnu/sj/raise_money/UploadActivity.java b/app/src/main/java/hunnu/sj/raise_money/UploadActivity.java index 843a311..8ff322e 100644 --- a/app/src/main/java/hunnu/sj/raise_money/UploadActivity.java +++ b/app/src/main/java/hunnu/sj/raise_money/UploadActivity.java @@ -65,8 +65,8 @@ public class UploadActivity extends AppCompatActivity { String name = info_name.getText().toString(); String desc = info_desc.getText().toString(); News news = new News(); - news.setTitle(name); - news.setDes(desc); + news.setName(name); + news.setDescri(desc); UserService uService = new UserService(); if(uService.UploadInfo(news)){ Looper.prepare(); diff --git a/app/src/main/java/hunnu/sj/raise_money/User.java b/app/src/main/java/hunnu/sj/raise_money/User.java index d4493e5..df1ee48 100644 --- a/app/src/main/java/hunnu/sj/raise_money/User.java +++ b/app/src/main/java/hunnu/sj/raise_money/User.java @@ -1,42 +1,62 @@ package hunnu.sj.raise_money; import java.io.Serializable; - public class User implements Serializable{ - private String name; - private String pasd; + + private String username; + private String password; private String role; + private String phone; + private String name; + private long user_id; public User(){ - super(); + name = null; } - public User(String name,String pasd,String role){ - super(); - this.name = name; - this.pasd = pasd; - this.role = role; + public String getName() { + return name; } public void setName(String name) { this.name = name; } - public String getName() { - return name; + public String getUsername() { + return username; } - public void setPasd(String pasd) { - this.pasd = pasd; + public void setUsername(String username) { + this.username = username; } - public String getPasd() { - return pasd; + public String getPassword() { + return password; } - public void setRole(String role) { - this.role = role; + public void setPassword(String password) { + this.password = password; } public String getRole() { return role; } + + public void setRole(String role) { + this.role = role; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public long getUser_id() { + return user_id; + } + + public void setUser_id(long user_id) { + this.user_id = user_id; + } } diff --git a/app/src/main/java/hunnu/sj/raise_money/donated_record/DonatedRecordAdapter.java b/app/src/main/java/hunnu/sj/raise_money/donated_record/DonatedRecordAdapter.java index dfa19a3..db81e6d 100644 --- a/app/src/main/java/hunnu/sj/raise_money/donated_record/DonatedRecordAdapter.java +++ b/app/src/main/java/hunnu/sj/raise_money/donated_record/DonatedRecordAdapter.java @@ -44,7 +44,7 @@ public class DonatedRecordAdapter extends BaseAdapter { } Record record = recordlist.get(position); TextView record_vw = view.findViewById(R.id.record_descri); - String descri = "用户"+record.getUsername()+"于"+record.getTime()+"捐赠了"+record.getDonatemon()+"元"; + String descri = "用户"+record.getUser_name()+"于"+record.getTime()+"捐赠了"+record.getDonatemon()+"元"; record_vw.setText(descri); return view; } diff --git a/app/src/main/java/hunnu/sj/raise_money/news/News.java b/app/src/main/java/hunnu/sj/raise_money/news/News.java index f62c99c..722ae68 100644 --- a/app/src/main/java/hunnu/sj/raise_money/news/News.java +++ b/app/src/main/java/hunnu/sj/raise_money/news/News.java @@ -3,22 +3,11 @@ package hunnu.sj.raise_money.news; import android.graphics.drawable.Drawable; public class News {//主界面浏览的信息的类 - private long id; - private String title; - private String des; + private long stu_id; + private String name; + private String descri; private Drawable head_icon; - public String getTitle() { - return title; - } - public void setTitle(String title) { - this.title = title; - } - public String getDes() { - return des; - } - public void setDes(String content) { - this.des = content; - } + public Drawable getHead_icon() { return head_icon; } @@ -26,11 +15,27 @@ public class News {//主界面浏览的信息的类 this.head_icon = head_icon; } - public void setId(long id) { - this.id = id; + public long getStu_id() { + return stu_id; + } + + public void setStu_id(long stu_id) { + this.stu_id = stu_id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescri() { + return descri; } - public long getId() { - return id; + public void setDescri(String descri) { + this.descri = descri; } } \ No newline at end of file diff --git a/app/src/main/java/hunnu/sj/raise_money/news/NewsAdapter.java b/app/src/main/java/hunnu/sj/raise_money/news/NewsAdapter.java index 158c237..a6a7ed3 100644 --- a/app/src/main/java/hunnu/sj/raise_money/news/NewsAdapter.java +++ b/app/src/main/java/hunnu/sj/raise_money/news/NewsAdapter.java @@ -49,8 +49,8 @@ public class NewsAdapter extends BaseAdapter { TextView item_des = (TextView) view.findViewById(R.id.item_info_des); News news = list.get(position); item_icon.setImageDrawable(news.getHead_icon()); - item_title.setText(news.getTitle()); - item_des.setText(news.getDes()); + item_title.setText(news.getName()); + item_des.setText(news.getDescri()); return view; } } \ No newline at end of file diff --git a/app/src/main/java/hunnu/sj/raise_money/record/Record.java b/app/src/main/java/hunnu/sj/raise_money/record/Record.java index 0d30a88..6e72ba1 100644 --- a/app/src/main/java/hunnu/sj/raise_money/record/Record.java +++ b/app/src/main/java/hunnu/sj/raise_money/record/Record.java @@ -1,10 +1,11 @@ package hunnu.sj.raise_money.record; public class Record { - private long id = 0; - private String stu_name = null; - private String username = null; + private long user_id; + private long stu_id; private float donatemon = 0; + private String user_name; + private String stu_name; private String time = null; public float getDonatemon() { @@ -15,12 +16,12 @@ public class Record { this.donatemon = donatemon; } - public String getStu_name() { - return stu_name; + public long getUser_id() { + return user_id; } - public void setStu_name(String stu_name) { - this.stu_name = stu_name; + public void setUser_id(long user_id) { + this.user_id = user_id; } public String getTime() { @@ -31,19 +32,27 @@ public class Record { this.time = time; } - public String getUsername() { - return username; + public long getStu_id() { + return stu_id; + } + + public void setStu_id(long stu_id) { + this.stu_id = stu_id; } - public void setUsername(String username) { - this.username = username; + public String getUser_name() { + return user_name; } - public long getId() { - return id; + public void setUser_name(String user_name) { + this.user_name = user_name; } - public void setId(long id) { - this.id = id; + public String getStu_name() { + return stu_name; + } + + public void setStu_name(String stu_name) { + this.stu_name = stu_name; } } diff --git a/app/src/main/res/layout/activity_registe.xml b/app/src/main/res/layout/activity_registe.xml index 11a16cc..c449cd3 100644 --- a/app/src/main/res/layout/activity_registe.xml +++ b/app/src/main/res/layout/activity_registe.xml @@ -4,99 +4,133 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_marginTop="0dp" tools:context=".RegiteActivity"> - - + app:layout_constraintTop_toTopOf="parent"> - + -