From 41350183060365b51945c17a4ad3170e21569a2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=AA=E7=9D=A1=E7=9A=84=E6=B0=B4=E7=93=B6?= Date: Fri, 25 Nov 2022 12:32:03 +0800 Subject: [PATCH] 1 --- .../java/com/tanshui/timeuse/appTimeUse.java | 10 ++++- .../timeuse/database/timeUseDBHelper.java | 6 +-- .../main/java/com/tanshui/timeuse/report.java | 37 +++++++------------ .../timeuse/software_classification.java | 2 +- .../java/com/tanshui/timeuse/task_show.java | 2 +- 5 files changed, 27 insertions(+), 30 deletions(-) diff --git a/src/timeUse/app/src/main/java/com/tanshui/timeuse/appTimeUse.java b/src/timeUse/app/src/main/java/com/tanshui/timeuse/appTimeUse.java index 56af700..dccb411 100644 --- a/src/timeUse/app/src/main/java/com/tanshui/timeuse/appTimeUse.java +++ b/src/timeUse/app/src/main/java/com/tanshui/timeuse/appTimeUse.java @@ -62,11 +62,17 @@ public class appTimeUse extends AppCompatActivity { startActivity(intent); }); report.setOnClickListener(v -> { - Intent intent=new Intent(appTimeUse.this,report.class); + Intent intent=new Intent(); + intent.setClass(appTimeUse.this, report.class); + intent.putExtra("date",date); + showProgressDialog("","正在加载"); startActivity(intent); + }); appClassify.setOnClickListener(v -> { - Intent intent=new Intent(appTimeUse.this,software_classification.class); + Intent intent=new Intent(); + intent.setClass(appTimeUse.this, software_classification.class); + intent.putExtra("date",date); startActivity(intent); }); diff --git a/src/timeUse/app/src/main/java/com/tanshui/timeuse/database/timeUseDBHelper.java b/src/timeUse/app/src/main/java/com/tanshui/timeuse/database/timeUseDBHelper.java index ae92c21..36f5096 100644 --- a/src/timeUse/app/src/main/java/com/tanshui/timeuse/database/timeUseDBHelper.java +++ b/src/timeUse/app/src/main/java/com/tanshui/timeuse/database/timeUseDBHelper.java @@ -209,9 +209,9 @@ public class timeUseDBHelper extends SQLiteOpenHelper { while(cursor.moveToNext()){ AppInfo app=new AppInfo(); app.setUid(cursor.getInt(0)); - app.setLabel(cursor.getString(2)); - app.setPackage_name(cursor.getString(3)); - app.setClassify(cursor.getString(4)); + app.setLabel(cursor.getString(1)); + app.setPackage_name(cursor.getString(2)); + app.setClassify(cursor.getString(3)); list.add(app); } diff --git a/src/timeUse/app/src/main/java/com/tanshui/timeuse/report.java b/src/timeUse/app/src/main/java/com/tanshui/timeuse/report.java index cc3cf9a..38740ba 100644 --- a/src/timeUse/app/src/main/java/com/tanshui/timeuse/report.java +++ b/src/timeUse/app/src/main/java/com/tanshui/timeuse/report.java @@ -211,35 +211,26 @@ public class report extends AppCompatActivity { - jump_appUse.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent intent=new Intent(); - intent.setClass(report.this, appTime.class); - intent.putExtra("date",today1); - showProgressDialog("","正在加载"); - startActivity(intent); + jump_appUse.setOnClickListener(v -> { + Intent intent13 =new Intent(); + intent13.setClass(report.this, appTimeUse.class); + intent13.putExtra("date",today1); + showProgressDialog("","正在加载"); + startActivity(intent13); - } }); - jump_list.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent intent=new Intent(report.this,task_show.class); - startActivity(intent); + jump_list.setOnClickListener(v -> { + Intent intent12 =new Intent(report.this,task_show.class); + startActivity(intent12); - } }); - jump_appClassify.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent intent=new Intent(); - intent.setClass(report.this, software_classification.class); - intent.putExtra("date",today1); - startActivity(intent); - } + jump_appClassify.setOnClickListener(v -> { + Intent intent1 =new Intent(); + intent1.setClass(report.this, software_classification.class); + intent1.putExtra("date",today1); + startActivity(intent1); }); diff --git a/src/timeUse/app/src/main/java/com/tanshui/timeuse/software_classification.java b/src/timeUse/app/src/main/java/com/tanshui/timeuse/software_classification.java index a94585c..52ddd14 100644 --- a/src/timeUse/app/src/main/java/com/tanshui/timeuse/software_classification.java +++ b/src/timeUse/app/src/main/java/com/tanshui/timeuse/software_classification.java @@ -123,7 +123,7 @@ public class software_classification extends AppCompatActivity { @Override public void onClick(View v) { Intent intent=new Intent(); - intent.setClass(software_classification.this, appTime.class); + intent.setClass(software_classification.this, appTimeUse.class); intent.putExtra("date",date); showProgressDialog("","正在加载"); startActivity(intent); diff --git a/src/timeUse/app/src/main/java/com/tanshui/timeuse/task_show.java b/src/timeUse/app/src/main/java/com/tanshui/timeuse/task_show.java index 8abd448..f602954 100644 --- a/src/timeUse/app/src/main/java/com/tanshui/timeuse/task_show.java +++ b/src/timeUse/app/src/main/java/com/tanshui/timeuse/task_show.java @@ -201,7 +201,7 @@ public class task_show extends Activity { @Override public void onClick(View v) { Intent intent=new Intent(); - intent.setClass(task_show.this, appTime.class); + intent.setClass(task_show.this, appTimeUse.class); intent.putExtra("date",decs); showProgressDialog("","正在加载"); startActivity(intent); -- 2.34.1