From c07927802691d7a8e7ba0239fae78ce7eccd5182 Mon Sep 17 00:00:00 2001 From: hjw <1632328072@qq.com> Date: Thu, 13 Jan 2022 13:21:04 +0800 Subject: [PATCH] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=9F=BA=E6=9C=AC=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/src/main/AndroidManifest.xml | 173 +++++++++------ .../Activity/AboutActivity.java | 11 + .../Activity/AddEventActivity.java | 7 +- .../Activity/AttentionActivity.java | 15 +- .../Activity/BaseActivity.java | 2 +- .../Activity/MyInfoActivity.java | 13 ++ .../Activity/SafetyActivity.java | 12 ++ .../Activity/SendInvitationActivity.java | 4 +- .../Activity/SendQuestionActivity.java | 4 +- .../Activity/SplashActivity.java | 29 +++ .../Adapter/HistoryPageFragmentAdapter.java | 4 +- .../Fragment/CollectFragment.java | 2 +- .../Fragment/HistoryFragment.java | 2 +- .../Fragment/MessageChannelFragment.java | 2 +- .../Fragment/MessageFragment.java | 2 +- .../app/src/main/res/drawable/about_logo.png | Bin 0 -> 4878 bytes .../src/main/res/drawable/about_logov2.png | Bin 0 -> 11985 bytes .../res/drawable/button_set_clock_time.xml | 17 ++ .../app/src/main/res/drawable/chat_send.xml | 17 ++ .../src/main/res/drawable/clock_commit.png | Bin 0 -> 1111 bytes .../app/src/main/res/drawable/down.png | Bin 0 -> 686 bytes .../src/main/res/drawable/find_new_user.png | Bin 0 -> 2684 bytes .../src/main/res/drawable/read_already.png | Bin 0 -> 1072 bytes .../src/main/res/drawable/read_already_v3.png | Bin 0 -> 3719 bytes .../res/drawable/shape_corner_add_clock.xml | 6 + .../res/drawable/shape_round_corner_my.xml | 6 + .../main/res/drawable/splash_background.jpg | Bin 0 -> 20121 bytes .../src/main/res/layout/activity_about.xml | 88 +++++--- .../main/res/layout/activity_add_clock.xml | 187 ++++++++++------ .../main/res/layout/activity_add_event.xml | 200 +++++++++++------- .../src/main/res/layout/activity_answer.xml | 6 - .../main/res/layout/activity_attention.xml | 41 ++-- .../main/res/layout/activity_blogdetail.xml | 12 +- .../app/src/main/res/layout/activity_chat.xml | 75 +++++-- .../main/res/layout/activity_clock_detail.xml | 23 +- .../res/layout/activity_concerned_problem.xml | 36 +++- .../src/main/res/layout/activity_event.xml | 29 ++- .../main/res/layout/activity_go_answer.xml | 91 +++++--- .../src/main/res/layout/activity_mdctrmd.xml | 38 ++-- .../src/main/res/layout/activity_my_info.xml | 169 ++++++++++++--- .../main/res/layout/activity_my_question.xml | 33 ++- .../main/res/layout/activity_news_detail.xml | 81 +++---- .../res/layout/activity_question_detail.xml | 32 +-- .../src/main/res/layout/activity_register.xml | 7 +- .../src/main/res/layout/activity_safety.xml | 31 ++- .../res/layout/activity_send_question.xml | 6 - .../src/main/res/layout/activity_splash.xml | 18 ++ .../src/main/res/layout/collect_blog_item.xml | 28 ++- .../src/main/res/layout/collect_news_item.xml | 27 ++- .../app/src/main/res/layout/event_item.xml | 79 +++---- .../main/res/layout/fragment_blog_collect.xml | 2 +- .../main/res/layout/fragment_blog_history.xml | 3 +- .../src/main/res/layout/fragment_collect.xml | 21 +- .../src/main/res/layout/fragment_comment.xml | 59 ++++-- .../main/res/layout/fragment_community.xml | 8 +- .../app/src/main/res/layout/fragment_fans.xml | 41 +++- .../src/main/res/layout/fragment_history.xml | 10 +- .../src/main/res/layout/fragment_message.xml | 40 ++-- .../app/src/main/res/layout/fragment_my.xml | 66 +++--- .../main/res/layout/fragment_news_collect.xml | 2 +- .../main/res/layout/fragment_news_history.xml | 2 +- .../app/src/main/res/layout/fragment_nice.xml | 155 +++++++------- .../res/layout/fragment_question_history.xml | 3 +- .../app/src/main/res/layout/info_item.xml | 10 +- .../src/main/res/layout/msg_content_item.xml | 2 + .../src/main/res/layout/my_question_item.xml | 4 +- .../app/src/main/res/layout/question_item.xml | 12 +- 67 files changed, 1353 insertions(+), 752 deletions(-) create mode 100644 Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SplashActivity.java create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/about_logo.png create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/about_logov2.png create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/button_set_clock_time.xml create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/chat_send.xml create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/clock_commit.png create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/down.png create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/find_new_user.png create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/read_already.png create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/read_already_v3.png create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/shape_corner_add_clock.xml create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/shape_round_corner_my.xml create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/splash_background.jpg create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_splash.xml diff --git a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml index b4b7bb2..521df5c 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml +++ b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml @@ -18,89 +18,126 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.LeudaemiaLikeMe"> - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AboutActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AboutActivity.java index ee14577..06962e0 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AboutActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AboutActivity.java @@ -1,14 +1,25 @@ package com.example.leudaemialikeme.Activity; import android.os.Bundle; +import android.view.View; +import android.widget.ImageView; import com.example.leudaemialikeme.R; public class AboutActivity extends BaseActivity { + ImageView about_back; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_about); + about_back=findViewById(R.id.about_back); + about_back.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); } } diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AddEventActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AddEventActivity.java index 3473834..3afd564 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AddEventActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AddEventActivity.java @@ -1,16 +1,14 @@ package com.example.leudaemialikeme.Activity; -import androidx.appcompat.app.AppCompatActivity; - import android.app.Activity; import android.app.DatePickerDialog; import android.app.TimePickerDialog; import android.content.Intent; import android.os.Bundle; import android.view.View; -import android.widget.Button; import android.widget.DatePicker; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.TextView; import android.widget.TimePicker; import android.widget.Toast; @@ -40,7 +38,8 @@ public class AddEventActivity extends BaseActivity { private String show_event_day,show_event_month,show_event_info; private String show_event_place,show_event_doctor_name,show_event_time,show_event_create_time; private ImageView delete,save; - private Button add_date,add_time; + private LinearLayout add_date,add_time; +// private Button add_time; private ImageView back; DateFormat format= DateFormat.getDateTimeInstance(); diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AttentionActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AttentionActivity.java index d384583..090cb9e 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AttentionActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AttentionActivity.java @@ -1,6 +1,8 @@ package com.example.leudaemialikeme.Activity; import android.os.Bundle; +import android.view.View; +import android.widget.ImageView; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -14,6 +16,7 @@ import java.util.List; public class AttentionActivity extends BaseActivity { + private ImageView attention_back; private List attentionList = new ArrayList<>(); @Override @@ -21,6 +24,17 @@ public class AttentionActivity extends BaseActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_attention); getData();//获得数据 + + attention_back=findViewById(R.id.attention_back); + attention_back.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + + + RecyclerView recycleView = (RecyclerView) findViewById(R.id.attentionList);//获得视图 LinearLayoutManager layoutManager; layoutManager = new LinearLayoutManager(this); @@ -34,6 +48,5 @@ public class AttentionActivity extends BaseActivity { attentionList.add(attention1); Attention attention2 = new Attention(R.mipmap.img_my_person,"小白帮","管住嘴，多饮水，常保暖"); attentionList.add(attention2); - } } diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BaseActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BaseActivity.java index c7612f4..d10cd15 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BaseActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BaseActivity.java @@ -31,7 +31,7 @@ public class BaseActivity extends AppCompatActivity { public static Owner owner; //服务器链接 - public static String SERVER_IP = "172.18.138.225"; + public static String SERVER_IP = "172.30.112.86"; // 172.30.118.24 寝：172.18.138.225 // static { diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/MyInfoActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/MyInfoActivity.java index 68ba609..83f72fc 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/MyInfoActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/MyInfoActivity.java @@ -8,6 +8,7 @@ import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.EditText; +import android.widget.ImageView; import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; @@ -33,6 +34,7 @@ public class MyInfoActivity extends BaseActivity { private Button commit; private Spinner spinner_sex; private String toast_content; + private ImageView my_info_back; @Override protected void onCreate(Bundle savedInstanceState) { @@ -89,6 +91,7 @@ public class MyInfoActivity extends BaseActivity { if(!ch_user.getSex().equals(origin_user.getSex())) toast_content =toast_content +"性别修改成功\n"; origin_user=ch_user; + changed_user=ch_user; runOnUiThread(new Runnable() { @Override public void run() { @@ -107,6 +110,14 @@ public class MyInfoActivity extends BaseActivity { } }); + my_info_back.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + + } @@ -119,6 +130,7 @@ public class MyInfoActivity extends BaseActivity { edit_phone=(EditText)findViewById(R.id.my_info_phone); spinner_sex=(Spinner)findViewById(R.id.my_info_sex); commit=(Button)findViewById(R.id.my_info_commit); + my_info_back=(ImageView)findViewById(R.id.my_info_back); } private void initData(){ @@ -151,4 +163,5 @@ public class MyInfoActivity extends BaseActivity { } }); } + } \ No newline at end of file diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SafetyActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SafetyActivity.java index 819450a..f4af644 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SafetyActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SafetyActivity.java @@ -1,14 +1,26 @@ package com.example.leudaemialikeme.Activity; import android.os.Bundle; +import android.view.View; +import android.widget.ImageView; import com.example.leudaemialikeme.R; public class SafetyActivity extends BaseActivity { + private ImageView safety_back; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_safety); + + safety_back=(ImageView)findViewById(R.id.safety_back); + safety_back.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); } } diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendInvitationActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendInvitationActivity.java index 3dc95d0..c09d9ff 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendInvitationActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendInvitationActivity.java @@ -13,7 +13,6 @@ import android.widget.Toast; import com.example.leudaemialikeme.Dao.InvitationDao; import com.example.leudaemialikeme.R; -import com.example.leudaemialikeme.Utils.Data; import com.example.leudaemialikeme.Utils.OkHttpUtil; import java.text.SimpleDateFormat; @@ -68,7 +67,6 @@ public class SendInvitationActivity extends BaseActivity { SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()); String time = sdf.format(timeCurrent); Log.e("输入的time:", time); - Data app = (Data)getApplication(); Map paramMap = new HashMap(); paramMap.put("uid",String.valueOf(BaseActivity.owner.getNetId()));//需要获取登录用户的id paramMap.put("btype",type); @@ -80,6 +78,7 @@ public class SendInvitationActivity extends BaseActivity { paramMap.put("bbrowse",String.valueOf(0)); paramMap.put("flag",String.valueOf(0)); sendInvitationRequest(paramMap); + } } }); @@ -111,6 +110,7 @@ public class SendInvitationActivity extends BaseActivity { if (jsonStr.contains("success")){ Toast.makeText(SendInvitationActivity.this, "提交成功",Toast.LENGTH_SHORT).show(); + finish(); }else{ Toast.makeText(SendInvitationActivity.this, "帖子提交失败,请检查您的网络状况",Toast.LENGTH_SHORT).show(); diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendQuestionActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendQuestionActivity.java index 1e9b0c9..e97837e 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendQuestionActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendQuestionActivity.java @@ -11,7 +11,6 @@ import android.widget.Toast; import com.example.leudaemialikeme.Dao.QuestionDao; import com.example.leudaemialikeme.R; -import com.example.leudaemialikeme.Utils.Data; import com.example.leudaemialikeme.Utils.OkHttpUtil; import java.text.SimpleDateFormat; @@ -66,7 +65,6 @@ public class SendQuestionActivity extends BaseActivity { String time = sdf.format(timeCurrent); // Log.e("输入的time:", time); Map paramMap = new HashMap(); - Data app = (Data)getApplication(); paramMap.put("uid",String.valueOf(BaseActivity.owner.getNetId())); // 需要获取登陆用户的id：需改 @@ -84,7 +82,6 @@ public class SendQuestionActivity extends BaseActivity { paramMap.put("qbrowseNum",String.valueOf(0)); paramMap.put("flag",String.valueOf(0)); sendQuestionRequest(paramMap); - } } }); @@ -120,6 +117,7 @@ public class SendQuestionActivity extends BaseActivity { if (jsonStr.contains("success")){ Toast.makeText(SendQuestionActivity.this, "提交成功",Toast.LENGTH_SHORT).show(); + finish(); }else{ Toast.makeText(SendQuestionActivity.this, "问题提交失败,请检查您的网络状况", Toast.LENGTH_SHORT).show(); diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SplashActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SplashActivity.java new file mode 100644 index 0000000..9b967a5 --- /dev/null +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SplashActivity.java @@ -0,0 +1,29 @@ +package com.example.leudaemialikeme.Activity; + +import android.content.Intent; +import android.os.Bundle; +import android.os.Handler; +import android.util.Log; + +import androidx.appcompat.app.AppCompatActivity; + +import com.example.leudaemialikeme.R; + +public class SplashActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_splash); + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + Log.e("splash","开始跳转"); + Intent mainIntent = new Intent(SplashActivity.this, LoginActivity.class); + startActivity(mainIntent); + Log.e("splash","跳转下一页面"); + finish(); + } + }, 1900); + } +} \ No newline at end of file diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/HistoryPageFragmentAdapter.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/HistoryPageFragmentAdapter.java index 7b80937..005b7bf 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/HistoryPageFragmentAdapter.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/HistoryPageFragmentAdapter.java @@ -20,11 +20,11 @@ public class HistoryPageFragmentAdapter extends FragmentPagerAdapter { @Override public Fragment getItem(int idx) { String collectCategoryTitle = channelList[idx]; - if(collectCategoryTitle.equals(" 资讯 ")) + if(collectCategoryTitle.equals(" 资讯 ")) { return NewsHistoryFragment.newInstance(collectCategoryTitle); } - else if(collectCategoryTitle.equals(" 问题 ")){ + else if(collectCategoryTitle.equals(" 问题 ")){ return QuestionHistoryFragment.newInstance(collectCategoryTitle); }else{ return BlogHistoryFragment.newInstance(collectCategoryTitle); diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CollectFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CollectFragment.java index 9e5d35c..4125357 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CollectFragment.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CollectFragment.java @@ -30,7 +30,7 @@ public class CollectFragment extends Fragment implements ViewPager.OnPageChangeL private ViewPager viewPager; //内导航的碎片的容器 private RadioGroup rgChannelCollect=null; // 内导航由单选按钮组构成 private HorizontalScrollView hvChannelCollect=null; //单选按钮组可滚动动 - private String[] channelList = {" 资讯 "," 帖子 ", + private String[] channelList = {" 帖子 " }; //默认的内导航栏目 private CollectPageFragmentAdapter adapter; //viewPager 的适配器 private TextView Name; diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/HistoryFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/HistoryFragment.java index 28ae30a..5bb3e77 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/HistoryFragment.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/HistoryFragment.java @@ -26,7 +26,7 @@ public class HistoryFragment extends Fragment implements ViewPager.OnPageChangeL private ViewPager viewPager; //内导航的碎片的容器 private RadioGroup rgChannelCollect=null; // 内导航由单选按钮组构成 private HorizontalScrollView hvChannelCollect=null; //单选按钮组可滚动动 - private String[] channelList = {" 资讯 "," 问题 "," 帖子 " + private String[] channelList = {" 资讯 "," 问题 "," 帖子 " }; //默认的内导航栏目 private HistoryPageFragmentAdapter adapter; //viewPager 的适配器 private TextView Name; diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageChannelFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageChannelFragment.java index c69fc42..df08f27 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageChannelFragment.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageChannelFragment.java @@ -66,7 +66,7 @@ public class MessageChannelFragment extends Fragment { } else if (messageCategoryTitle.equals(" 评论 ")) { view = inflater.inflate(R.layout.fragment_comment, container, false); - } else if (messageCategoryTitle.equals(" 赞 ")) { + } else if (messageCategoryTitle.equals(" 收藏 ")) { view = inflater.inflate(R.layout.fragment_nice, container, false); } else if (messageCategoryTitle.equals(" 粉丝 ")) { view = inflater.inflate(R.layout.fragment_fans, container, false); diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageFragment.java index 72ab913..7bfcc95 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageFragment.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageFragment.java @@ -24,7 +24,7 @@ public class MessageFragment extends Fragment implements ViewPager.OnPageChangeL private RadioGroup rgChannel=null; // 内导航由单选按钮组构成 private HorizontalScrollView hvChannel=null; //单选按钮组可滚动动 private String[] channelList = {" 私信 "," 评论 ", - " 赞 "," 粉丝 "}; //默认的内导航栏目 + " 收藏 "," 粉丝 "}; //默认的内导航栏目 private MessagePageFragmentAdapter adapter; //viewPager 的适配器 public MessageFragment() { diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/about_logo.png b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/about_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f80f4cd06bc153327ef67367a6805e135b1aab4a GIT binary patch literal 4878 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 literal 0 HcmV?d00001 diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/about_logov2.png b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/about_logov2.png new file mode 100644 index 0000000000000000000000000000000000000000..799ba2eee8e4c1c1dd924c0747af5f66a5a09b02 GIT binary patch literal 11985 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 a$81oK?amo0 + + + + + \ No newline at end of file diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/chat_send.xml b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/chat_send.xml new file mode 100644 index 0000000..dec73ea --- /dev/null +++ b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/chat_send.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/clock_commit.png b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/clock_commit.png new file mode 100644 index 0000000000000000000000000000000000000000..36251d59a643f4c0fcc29ed268f07f74b3527fb3 GIT binary patch literal 1111 zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST~P>fkn>K#WAE}&fB|*fsbP(+7eY1 z5>?l8i# zqCf-xq&w=BC!WlBVo)_dVTZRwzvsQlbL?-*xxZKDnfRo9(snlq`R&(L_Pf2;*Lf!7 z{yO&Y=C`?D><%lf>o`0=`c9i<;hf2P`tQ|i7#sKf-*)&#sYChPM;7WQUu<;rutmcL$$|9{o7)$@dpq z59&N>U@LTRPLu&^XpZE1T(Gw}_w@Jo&jr}GyUJWp;L8wTH|b!OI>N{cR@iK@z)|MH zgeTK29ta}|U{j}fdGWOPqm1=}Km(E!J^4KSJmV(Ws8{y5C#{`iAvWdZvzh7adD2HV zE;zmWSb6&Td2a9DuN6Mtw9e*6|Kjhz!#a}_XWAvl6bJY({{Ht`M{>iN-5Z`XzULM^ z&M?z%#(CQl$1lFVVO_{G>B+*&2krXePRDg7FF1Yhed&e%#n(5RKayBetnj?zUX1zl z;?Gx0H4AkXK2VWyTc7!w>#;>&-0f!~d%8PP*b3JKEPEgK)lP9R8>upT-V`Oif6Fx{ zJ$_Ld>nu~_rSj;3{3MzDuSXU6_Nh+3r#~sw|Dgc8{iJ{2x6j{vNm1a@1FfBP3g6O{ z1lcz)`7h8>99Hx?FHvUpKXG&W5P_2)e&6PPY|$Gd-uy;Ws4zgudIr#ZFHzS|*$ZpM z*}rlrReFCE;3(WM$H$qr!nc~_wC)yS9k1@2sdVV zw8`H8QG)5FNuHXI61E!gHcEiB?7iaSRr%}K`?X!k;lWW6jf*^H>4y|sys@N4Knugka^>tb&RvK`LD;> z`UOW0*75YX$mASu@HldC+mdIq+AMDLvjV+%J4~X};>JFpWA*sHEiMLXuD5bk;`^4J z24wy(y1PWAu)tbx;+{_CeG}I2fAC}0RC`zPQ?Yi_W%M`Nr2l&LNAYOCAD+Cs?-TpX Wo!_z;d}1bmRC&7kxvXfvMEf#WAE}&f6Pzdv6;Ev<6On zBoyT2HLGvilqr*hf|@=HFyCZ-v$am6u+3&U(<{Dx;=0^G%_IRIRi#DWrQ3uB?Uf!a z{%&odrevq|NKSBn)&5k8ev3NkZQJ|{@7&!q(OssVC;Ikei#wlIh!;w1o00#h;Pl>m zM-p!+g&lb~EqZOw;SDEqI}Yn!za`P0IQf=fd-T4|#(am>iWT^_*QhGh$#opw;AztF zSnhw_%llRJ-dci%*#aFNRzk;5x&%$P&{LXJb)?X6;uXa{KbJ}KEv$q+;~sf9sr>9v zmYn!Rv2TgXrTG?d1qGqI!D*{#n-#>6m5<I1(fm*>2Z;X zSrr77>gEFS*BQAh@dcfb=(O-q4OV%iuoR^KN)^yNuNQ)y78*}ac^q-{40i$Yt&N2W z4O)zW<~e6dc3MaT9R^xGLkK8U^ctvt#X@JGq0_jP1=&qw1%UjwM}YDYejP3{Jxdc+ z9wqqj0<|Vv1Epph?gL82m;tpu+oA+Cb$dQgO6T-tk0XrpYr9-zKAcgW6#c%Oq{IMJ bJmF|Ozy8D@`=7jJ0%`Sh^>bP0l+XkKRzmK` literal 0 HcmV?d00001 diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/find_new_user.png b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/find_new_user.png new file mode 100644 index 0000000000000000000000000000000000000000..26da9e0e1d1be2218b4af282243786a6e12e8ed5 GIT binary patch literal 2684 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 nz(`hEdN3ne9Cvz0l38%RC z4P^#q$xT4s3P zF&JGhPJU8S5-%Sg-!-6u851T YgaGH-+F&+sk1UWfPgg&ebxsLQ04n#7AOHXW literal 0 HcmV?d00001 diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/shape_corner_add_clock.xml b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/shape_corner_add_clock.xml new file mode 100644 index 0000000..f1ca6ac --- /dev/null +++ b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/shape_corner_add_clock.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/shape_round_corner_my.xml b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/shape_round_corner_my.xml new file mode 100644 index 0000000..0229f6a --- /dev/null +++ b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/shape_round_corner_my.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/splash_background.jpg b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/splash_background.jpg new file mode 100644 index 0000000000000000000000000000000000000000..61c31426d38ba4fd81defde21d97c5024c65ad43 GIT binary patch literal 20121 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 J#gfnc{|6=mYmxu} literal 0 HcmV?d00001 diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_about.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_about.xml index 26dcd96..7d88b47 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_about.xml +++ b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_about.xml @@ -10,31 +10,47 @@ - - + android:background="@color/white" + android:orientation="vertical"> - + android:layout_marginTop="15dp" + android:layout_marginBottom="15dp" + android:background="@color/white" + android:orientation="horizontal"> + + + + + + + + + android:layout_marginTop="150dp" + android:orientation="vertical"> - + - + + diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_add_clock.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_add_clock.xml index 8123a84..b8230ae 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_add_clock.xml +++ b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_add_clock.xml @@ -4,110 +4,173 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@drawable/background" android:orientation="vertical" tools:context=".ClockDetail"> - + + + android:layout_marginTop="15dp" + android:layout_marginBottom="15dp" + android:background="@color/white" + android:orientation="horizontal"> + + + + + +