Merge pull request '1' (#14) from develop into master

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);
         });
 

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.setLabel(cursor.getString(1));
-            app.setPackage_name(cursor.getString(3));
+            app.setPackage_name(cursor.getString(2));
-            app.setClassify(cursor.getString(4));
+            app.setClassify(cursor.getString(3));
 
             list.add(app);
         }

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() {
+        jump_appUse.setOnClickListener(v -> {
-            @Override
+            Intent intent13 =new Intent();
-            public void onClick(View v) {
+            intent13.setClass(report.this, appTimeUse.class);
-                Intent intent=new Intent();
+            intent13.putExtra("date",today1);
-                intent.setClass(report.this, appTime.class);
-                intent.putExtra("date",today1);
             showProgressDialog("","正在加载");
-                startActivity(intent);
+            startActivity(intent13);
 
-            }
         });
 
-        jump_list.setOnClickListener(new View.OnClickListener() {
+        jump_list.setOnClickListener(v -> {
-            @Override
+            Intent intent12 =new Intent(report.this,task_show.class);
-            public void onClick(View v) {
+            startActivity(intent12);
-                Intent intent=new Intent(report.this,task_show.class);
-                startActivity(intent);
 
-            }
         });
 
-        jump_appClassify.setOnClickListener(new View.OnClickListener() {
+        jump_appClassify.setOnClickListener(v -> {
-            @Override
+            Intent intent1 =new Intent();
-            public void onClick(View v) {
+            intent1.setClass(report.this, software_classification.class);
-                Intent intent=new Intent();
+            intent1.putExtra("date",today1);
-                intent.setClass(report.this, software_classification.class);
+            startActivity(intent1);
-                intent.putExtra("date",today1);
-                startActivity(intent);
-            }
         });
 
 

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);

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);