diff --git a/src/app-release.apk b/src/app-release.apk index 367cbe7..c26f0c9 100644 Binary files a/src/app-release.apk and b/src/app-release.apk differ diff --git a/src/showme/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_12_8_40_[Default_Changelist]/shelved.patch b/src/showme/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_12_8_40_[Default_Changelist]/shelved.patch new file mode 100644 index 0000000..c107758 --- /dev/null +++ b/src/showme/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_12_8_40_[Default_Changelist]/shelved.patch @@ -0,0 +1,62 @@ +Index: app/src/main/java/com/diary/showme/diary/ui/CardActivity.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>package com.diary.showme.diary.ui;\r\n\r\nimport android.app.Activity;\r\nimport android.content.Intent;\r\nimport android.os.Bundle;\r\nimport android.view.View;\r\nimport android.widget.Button;\r\nimport android.content.Context;\r\nimport android.graphics.Color;\r\nimport android.os.Environment;\r\nimport android.widget.EditText;\r\nimport android.widget.Toast;\r\n\r\nimport androidx.annotation.Nullable;\r\nimport androidx.appcompat.app.AppCompatActivity;\r\n\r\nimport com.diary.showme.Course.AddCourseActivity;\r\nimport com.diary.showme.Course.Course;\r\nimport com.diary.showme.Course.CourseActivity;\r\nimport com.diary.showme.R;\r\n\r\n\r\npublic class CardActivity extends AppCompatActivity {\r\n\r\n private Button card1;\r\n\r\n private Button card2;\r\n\r\n private Button card3;\r\n\r\n @Override\r\n protected void onCreate(Bundle savedInstanceState) {\r\n super.onCreate(savedInstanceState);\r\n setContentView(R.layout.card);\r\n\r\n card1 = findViewById(R.id.card1);\r\n card2 = findViewById(R.id.card2);\r\n card3 = findViewById(R.id.card3);\r\n card1.setOnClickListener(new View.OnClickListener() {\r\n @Override\r\n public void onClick(View v) {\r\n startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0);\r\n }\r\n });\r\n card2.setOnClickListener(new View.OnClickListener() {\r\n @Override\r\n public void onClick(View v) {\r\n startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0);\r\n }\r\n });\r\n card3.setOnClickListener(new View.OnClickListener() {\r\n @Override\r\n public void onClick(View v) {\r\n startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0);\r\n }\r\n });\r\n }\r\n\r\n public static void startActivity(Context context) {\r\n Intent intent = new Intent(context, CardActivity.class);\r\n context.startActivity(intent);\r\n }\r\n\r\n\r\n}\r\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- app/src/main/java/com/diary/showme/diary/ui/CardActivity.java (revision c7e2ad49109864f6c4a19759f6af43db764bb204) ++++ app/src/main/java/com/diary/showme/diary/ui/CardActivity.java (date 1626049324133) +@@ -39,19 +39,22 @@ + card1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { +- startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0); ++ Intent intent = new Intent(CardActivity.this, AddDiaryActivity.class); ++ startActivity(intent); + } + }); + card2.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { +- startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0); ++ Intent intent = new Intent(CardActivity.this, AddDiaryActivity.class); ++ startActivity(intent); + } + }); + card3.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { +- startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0); ++ Intent intent = new Intent(CardActivity.this, AddDiaryActivity.class); ++ startActivity(intent); + } + }); + } +Index: app/src/main/res/layout/question_item.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\r\n\r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- app/src/main/res/layout/question_item.xml (revision c7e2ad49109864f6c4a19759f6af43db764bb204) ++++ app/src/main/res/layout/question_item.xml (date 1626048966859) +@@ -8,12 +8,14 @@ + android:layout_height="match_parent" + android:orientation="horizontal"> + +- ++ android:layout_weight="1" ++ android:background="#A4CF2626" ++ android:text="今天有遇到什么开心的事情吗？" ++ /> + + + diff --git a/src/showme/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_12_8_40__Default_Changelist_.xml b/src/showme/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_12_8_40__Default_Changelist_.xml new file mode 100644 index 0000000..e7337a1 --- /dev/null +++ b/src/showme/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_12_8_40__Default_Changelist_.xml @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/src/showme/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_12_9_04_[Default_Changelist]/app-release.apk b/src/showme/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_12_9_04_[Default_Changelist]/app-release.apk new file mode 100644 index 0000000..833f6fd Binary files /dev/null and b/src/showme/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_12_9_04_[Default_Changelist]/app-release.apk differ diff --git a/src/showme/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_12_9_04_[Default_Changelist]/shelved.patch b/src/showme/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_12_9_04_[Default_Changelist]/shelved.patch new file mode 100644 index 0000000..aa6b7be --- /dev/null +++ b/src/showme/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_12_9_04_[Default_Changelist]/shelved.patch @@ -0,0 +1,107 @@ +Index: app/release/output-metadata.json +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- app/release/output-metadata.json (revision ee8f4f23a86ef2ed85a888f5056c5a24d8ab57d2) ++++ app/release/output-metadata.json (revision ee8f4f23a86ef2ed85a888f5056c5a24d8ab57d2) +@@ -1,18 +0,0 @@ +-{ +- "version": 2, +- "artifactType": { +- "type": "APK", +- "kind": "Directory" +- }, +- "applicationId": "com.diary.showme", +- "variantName": "release", +- "elements": [ +- { +- "type": "SINGLE", +- "filters": [], +- "versionCode": 1, +- "versionName": "1.0", +- "outputFile": "app-release.apk" +- } +- ] +-} +\ No newline at end of file +Index: app/src/main/java/com/diary/showme/MainActivity.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>package com.diary.showme;\r\n\r\nimport android.annotation.SuppressLint;\r\nimport android.app.Activity;\r\nimport android.content.Intent;\r\nimport android.database.sqlite.SQLiteDatabase;\r\nimport android.os.Bundle;\r\nimport android.util.DisplayMetrics;\r\nimport android.widget.TextView;\r\nimport android.widget.Toast;\r\n\r\nimport androidx.annotation.Nullable;\r\nimport androidx.appcompat.app.AppCompatActivity;\r\nimport androidx.recyclerview.widget.LinearLayoutManager;\r\nimport androidx.recyclerview.widget.RecyclerView;\r\n\r\nimport com.diary.database.DatabaseHelper.CourseSQLHelper;\r\nimport com.diary.database.DatabaseHelper.ScheduleSQLHelper;\r\nimport com.diary.database.MySQLiteDatabase;\r\nimport com.diary.database.utils.ScheduleSQLUtils;\r\nimport com.diary.showme.Course.CourseActivity;\r\nimport com.diary.showme.Schedule.AddScheduleActivity;\r\nimport com.diary.showme.Schedule.EditScheduleActivity;\r\nimport com.diary.showme.diary.ui.QuestionActivity;\r\nimport com.diary.showme.diary.ui.DiaryActivity;\r\nimport com.idealist.calendarview.CalendarAttr;\r\nimport com.idealist.calendarview.CalendarDay;\r\nimport com.idealist.calendarview.CalendarPager;\r\nimport com.idealist.calendarview.CalendarUtils;\r\nimport com.idealist.calendarview.CalendarView;\r\nimport com.idealist.calendarview.CalendarViewAdapter;\r\n//import com.idealist.calendarview.RecyclerViewAdapter;\r\n//import com.idealist.calendarview.SpaceItemDecoration;\r\nimport com.idealist.calendarview.RecyclerViewAdapter;\r\nimport com.idealist.calendarview.SpaceItemDecoration;\r\nimport com.idealist.calendarview.State;\r\nimport com.idealist.calendarview.interf.OnSelectDateListener;\r\n\r\nimport java.util.List;\r\nimport java.util.TimeZone;\r\n\r\nimport cc.trity.floatingactionbutton.FloatingActionButton;\r\n\r\npublic class MainActivity extends AppCompatActivity {\r\n\r\n private TextView tvMonth;\r\n private TextView tvYear;\r\n\r\n private CalendarDay currentDay;\r\n\r\n private CalendarView currentView;\r\n\r\n private CalendarPager pager;\r\n\r\n private RecyclerView schedule;\r\n\r\n private CalendarViewAdapter viewAdapter;\r\n\r\n private CalendarAttr attr;\r\n\r\n private OnSelectDateListener onSelectDateListener;\r\n\r\n private CalendarView.OnCalendarClickListener clickListener;\r\n\r\n private FloatingActionButton scheduleFAB, courseFAB, diaryFAB;\r\n\r\n\r\n @Override\r\n protected void onCreate(Bundle savedInstanceState) {\r\n super.onCreate(savedInstanceState);\r\n setContentView(R.layout.activity_main);\r\n TimeZone.setDefault(TimeZone.getTimeZone(\"GMT+8\"));\r\n DisplayMetrics dm = new DisplayMetrics();\r\n getWindowManager().getDefaultDisplay().getRealMetrics(dm);\r\n int height = dm.heightPixels;\r\n State.setDefaultItemHeightFull((height - 42 - 3*State.DEFAULT_ITEM_HEIGHT) / 6);\r\n\r\n initSQL();\r\n initCalendar();\r\n initFAB();\r\n initCourseB();\r\n initDiaryB();\r\n\r\n attr = new CalendarAttr();\r\n attr.setCalendarType(State.VIEW_MONTH);\r\n attr.setScrollLevel(State.LEVEL_MEDIUM);\r\n\r\n initListener();\r\n\r\n viewAdapter = new CalendarViewAdapter(this, attr, onSelectDateListener,\r\n clickListener);\r\n initPager();\r\n// initSchedule();\r\n }\r\n\r\n private void initSQL() {\r\n ScheduleSQLHelper myScheduleSQLHelper = new ScheduleSQLHelper(this);\r\n SQLiteDatabase scheduleSQL = myScheduleSQLHelper.getWritableDatabase();\r\n CourseSQLHelper myCourseSQLHelper = new CourseSQLHelper(this);\r\n SQLiteDatabase courseSQL = myCourseSQLHelper.getWritableDatabase();\r\n\r\n MySQLiteDatabase.scheduleSQL = scheduleSQL;\r\n MySQLiteDatabase.courseSQL = courseSQL;\r\n }\r\n\r\n private void initFAB() {\r\n scheduleFAB = findViewById(R.id.add_schedule);\r\n scheduleFAB.setOnClickListener(v -> {\r\n Toast.makeText(getApplicationContext(), viewAdapter.getSelectDay().toString(), Toast.LENGTH_SHORT).show();\r\n Intent intent = new Intent(MainActivity.this, AddScheduleActivity.class);\r\n intent.putExtra(\"date\", viewAdapter.getSelectDay().toString());\r\n startActivityForResult(intent, 0);\r\n });\r\n }\r\n\r\n private void initCourseB() {\r\n courseFAB = findViewById(R.id.course_entry);\r\n courseFAB.setOnClickListener(v -> {\r\n Intent intent = new Intent(MainActivity.this, CourseActivity.class);\r\n startActivity(intent);\r\n });\r\n }\r\n\r\n private void initDiaryB() {\r\n diaryFAB = findViewById(R.id.diary_entry);\r\n diaryFAB.setOnClickListener(v -> {\r\n Intent intent = new Intent(MainActivity.this, DiaryActivity.class);\r\n startActivity(intent);\r\n });\r\n }\r\n\r\n\r\n private void initCalendar() {\r\n tvMonth = findViewById(R.id.custom_month_view);\r\n tvYear = findViewById(R.id.custom_year_view);\r\n currentDay = CalendarUtils.getCurrDay();\r\n updateCalendar();\r\n }\r\n\r\n private void initPager() {\r\n pager = findViewById(R.id.custom_vp);\r\n pager.setAttr(attr);\r\n pager.setAdapter(viewAdapter);\r\n\r\n pager.setmOnPageChangeListener(new CalendarPager.OnPageChangeListener() {\r\n\r\n @Override\r\n public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {\r\n }\r\n\r\n @Override\r\n public void onPageSelected(int position) {\r\n currentView = viewAdapter.getViews().get(position % 3);\r\n currentDay = currentView.getSeedDay();\r\n updateCalendar();\r\n }\r\n\r\n @Override\r\n public void onPageScrollStateChanged(int state) {\r\n }\r\n });\r\n }\r\n\r\n private void initListener() {\r\n onSelectDateListener = offset -> pager.selectOtherMonth(offset);\r\n clickListener = new CalendarView.OnCalendarClickListener() {\r\n @Override\r\n public void OnClick(CalendarDay day) {\r\n updateSchedule(day);\r\n }\r\n\r\n @Override\r\n public void OnLongClick(CalendarDay day) {\r\n Intent intent = new Intent(MainActivity.this, QuestionActivity.class);\r\n intent.putExtra(\"date\", viewAdapter.getSelectDay().toString());\r\n startActivity(intent);\r\n }\r\n };\r\n }\r\n\r\n private void initSchedule() {\r\n\r\n schedule = findViewById(R.id.list_item);\r\n List mData = ScheduleSQLUtils.queryByDate(currentDay.toString());\r\n\r\n RecyclerViewAdapter adapter = new RecyclerViewAdapter(mData);\r\n adapter.setOnItemClickListener((view, position) -> {\r\n Intent intent = new Intent(MainActivity.this, EditScheduleActivity.class);\r\n intent.putExtra(\"date\", viewAdapter.getSelectDay().toString());\r\n String name = ((TextView) view.findViewById(R.id.schedule_title)).getText().toString();\r\n intent.putExtra(\"scheduleName\", name);\r\n startActivityForResult(intent, 0);\r\n });\r\n schedule.setAdapter(adapter);\r\n\r\n LinearLayoutManager layoutManager = new LinearLayoutManager(this);\r\n schedule.setLayoutManager(layoutManager);\r\n schedule.addItemDecoration(new SpaceItemDecoration(30));\r\n }\r\n\r\n\r\n @SuppressLint(\"SetTextI18n\")\r\n private void updateCalendar() {\r\n tvMonth.setText(currentDay.getMonth() + \"\");\r\n tvYear.setText(currentDay.getYear() + \"\");\r\n }\r\n\r\n private void updateSchedule(CalendarDay day) {\r\n ScheduleSQLUtils.queryByDate(day.toString());\r\n List mData = ScheduleSQLUtils.queryByDate(day.toString());\r\n RecyclerViewAdapter adapter = (RecyclerViewAdapter) schedule.getAdapter();\r\n adapter.setmDatabase(mData);\r\n adapter.notifyDataSetChanged();\r\n }\r\n\r\n @Override\r\n protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {\r\n super.onActivityResult(requestCode, resultCode, data);\r\n if (requestCode == 0 && resultCode == Activity.RESULT_OK) {\r\n updateSchedule(viewAdapter.getSelectDay());\r\n viewAdapter.updateViewScheduleChange();\r\n }\r\n }\r\n\r\n} +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- app/src/main/java/com/diary/showme/MainActivity.java (revision ee8f4f23a86ef2ed85a888f5056c5a24d8ab57d2) ++++ app/src/main/java/com/diary/showme/MainActivity.java (date 1626050917747) +@@ -90,7 +90,7 @@ + viewAdapter = new CalendarViewAdapter(this, attr, onSelectDateListener, + clickListener); + initPager(); +-// initSchedule(); ++ initSchedule(); + } + + private void initSQL() { +Index: app/src/main/java/com/diary/showme/diary/ui/CardActivity.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>package com.diary.showme.diary.ui;\r\n\r\nimport android.app.Activity;\r\nimport android.content.Intent;\r\nimport android.os.Bundle;\r\nimport android.view.View;\r\nimport android.widget.Button;\r\nimport android.content.Context;\r\nimport android.graphics.Color;\r\nimport android.os.Environment;\r\nimport android.widget.EditText;\r\nimport android.widget.Toast;\r\n\r\nimport androidx.annotation.Nullable;\r\nimport androidx.appcompat.app.AppCompatActivity;\r\n\r\nimport com.diary.showme.Course.AddCourseActivity;\r\nimport com.diary.showme.Course.Course;\r\nimport com.diary.showme.Course.CourseActivity;\r\nimport com.diary.showme.R;\r\n\r\n\r\npublic class CardActivity extends AppCompatActivity {\r\n\r\n private Button card1;\r\n\r\n private Button card2;\r\n\r\n private Button card3;\r\n\r\n @Override\r\n protected void onCreate(Bundle savedInstanceState) {\r\n super.onCreate(savedInstanceState);\r\n setContentView(R.layout.card);\r\n\r\n card1 = findViewById(R.id.card1);\r\n card2 = findViewById(R.id.card2);\r\n card3 = findViewById(R.id.card3);\r\n card1.setOnClickListener(new View.OnClickListener() {\r\n @Override\r\n public void onClick(View v) {\r\n startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0);\r\n }\r\n });\r\n card2.setOnClickListener(new View.OnClickListener() {\r\n @Override\r\n public void onClick(View v) {\r\n startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0);\r\n }\r\n });\r\n card3.setOnClickListener(new View.OnClickListener() {\r\n @Override\r\n public void onClick(View v) {\r\n startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0);\r\n }\r\n });\r\n }\r\n\r\n public static void startActivity(Context context) {\r\n Intent intent = new Intent(context, CardActivity.class);\r\n context.startActivity(intent);\r\n }\r\n\r\n @Override\r\n public void onBackPressed() {\r\n super.onBackPressed();\r\n\r\n }\r\n}\r\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- app/src/main/java/com/diary/showme/diary/ui/CardActivity.java (revision ee8f4f23a86ef2ed85a888f5056c5a24d8ab57d2) ++++ app/src/main/java/com/diary/showme/diary/ui/CardActivity.java (date 1626050458181) +@@ -39,19 +39,22 @@ + card1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { +- startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0); ++ Intent intent = new Intent(CardActivity.this, AddDiaryActivity.class); ++ startActivity(intent); + } + }); + card2.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { +- startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0); ++ Intent intent = new Intent(CardActivity.this, AddDiaryActivity.class); ++ startActivity(intent); + } + }); + card3.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { +- startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0); ++ Intent intent = new Intent(CardActivity.this, AddDiaryActivity.class); ++ startActivity(intent); + } + }); + } +Index: app/src/main/res/layout/question_item.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\r\n\r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- app/src/main/res/layout/question_item.xml (revision ee8f4f23a86ef2ed85a888f5056c5a24d8ab57d2) ++++ app/src/main/res/layout/question_item.xml (date 1626050458213) +@@ -8,12 +8,14 @@ + android:layout_height="match_parent" + android:orientation="horizontal"> + +- ++ android:layout_weight="1" ++ android:background="#A4CF2626" ++ android:text="今天有遇到什么开心的事情吗？" ++ /> + + + diff --git a/src/showme/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_12_9_04__Default_Changelist_.xml b/src/showme/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_12_9_04__Default_Changelist_.xml new file mode 100644 index 0000000..674856f --- /dev/null +++ b/src/showme/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_12_9_04__Default_Changelist_.xml @@ -0,0 +1,14 @@ + + \ No newline at end of file diff --git a/src/showme/app/release/app-release.apk b/src/showme/app/release/app-release.apk index 367cbe7..c26f0c9 100644 Binary files a/src/showme/app/release/app-release.apk and b/src/showme/app/release/app-release.apk differ diff --git a/src/showme/app/src/main/java/com/diary/showme/diary/ui/CardActivity.java b/src/showme/app/src/main/java/com/diary/showme/diary/ui/CardActivity.java index 637cc3d..755264c 100644 --- a/src/showme/app/src/main/java/com/diary/showme/diary/ui/CardActivity.java +++ b/src/showme/app/src/main/java/com/diary/showme/diary/ui/CardActivity.java @@ -41,19 +41,22 @@ public class CardActivity extends AppCompatActivity { card1.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0); + Intent intent = new Intent(CardActivity.this, AddDiaryActivity.class); + startActivity(intent); } }); card2.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0); + Intent intent = new Intent(CardActivity.this, AddDiaryActivity.class); + startActivity(intent); } }); card3.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0); + Intent intent = new Intent(CardActivity.this, AddDiaryActivity.class); + startActivity(intent); } }); } diff --git a/src/showme/app/src/main/res/layout/question_item.xml b/src/showme/app/src/main/res/layout/question_item.xml index 1d58e4f..0765b3e 100644 --- a/src/showme/app/src/main/res/layout/question_item.xml +++ b/src/showme/app/src/main/res/layout/question_item.xml @@ -8,12 +8,14 @@ android:layout_height="match_parent" android:orientation="horizontal"> - + android:layout_weight="1" + android:background="#A4CF2626" + android:text="今天有遇到什么开心的事情吗？" + />