diff --git a/app/build.gradle b/app/build.gradle index 7b7a163..533e3f7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -90,6 +90,9 @@ dependencies { implementation 'com.loopeer.library:cardstack:1.0.2' implementation 'com.ramotion.foldingcell:folding-cell:1.2.3' +// 画廊 implementation 'com.yarolegovich:discrete-scrollview:1.4.9' +//屏幕适配方案 + implementation 'com.android.support:percent:28.3.0' } diff --git a/app/src/main/java/com/example/HomeContent/SlideFragment.java b/app/src/main/java/com/example/HomeContent/SlideFragment.java index 620c859..1519148 100644 --- a/app/src/main/java/com/example/HomeContent/SlideFragment.java +++ b/app/src/main/java/com/example/HomeContent/SlideFragment.java @@ -78,10 +78,7 @@ public class SlideFragment extends Fragment { private void initView(View rootView) { listData = new ArrayList(); - //最上面的滚动动画 - //初始化header -// ScrollingImageView scrollingImageView = (ScrollingImageView) rootView.findViewById(R.id.scrolling_background); -// scrollingImageView.start(); + //表情那一块最热门推送top6 xRecyclerView_home = (XRecyclerView) rootView.findViewById(R.id.home_XRecyclerView); diff --git a/app/src/main/java/com/example/PersonalCenter/PersonContent.java b/app/src/main/java/com/example/PersonalCenter/PersonContent.java index f9867cf..64b5de7 100644 --- a/app/src/main/java/com/example/PersonalCenter/PersonContent.java +++ b/app/src/main/java/com/example/PersonalCenter/PersonContent.java @@ -68,8 +68,8 @@ public class PersonContent extends Fragment { private List data; private essayGallary essayGallary; - private TextView currentItemName; - private TextView currentItemPrice; +// private TextView currentItemName; +// private TextView currentItemPrice; private ImageView rateItemButton; private DiscreteScrollView itemPicker; private InfiniteScrollAdapter infiniteAdapter; @@ -156,8 +156,8 @@ private List data; * **** * */ - currentItemName = (TextView) appCompatActivity.findViewById(R.id.item_name); - currentItemPrice = (TextView) appCompatActivity.findViewById(R.id.item_price); +// currentItemName = (TextView) appCompatActivity.findViewById(R.id.item_name); +// currentItemPrice = (TextView) appCompatActivity.findViewById(R.id.item_price); // rateItemButton = (ImageView) appCompatActivity.findViewById(R.id.item_btn_rate); essayGallary = essayGallary.get(); data = essayGallary.getData(); @@ -209,8 +209,8 @@ private List data; } //有关文章滚动画廊的方法 private void onItemChanged(Image item) { - currentItemName.setText(item.getName()); - currentItemPrice.setText(item.getPrice()); +// currentItemName.setText(item.getName()); +// currentItemPrice.setText(item.getPrice()); // changeRateButtonState(item); } diff --git a/app/src/main/res/drawable/fangyao.png b/app/src/main/res/drawable/fangyao.png new file mode 100644 index 0000000..7e7d413 Binary files /dev/null and b/app/src/main/res/drawable/fangyao.png differ diff --git a/app/src/main/res/drawable/health_num.png b/app/src/main/res/drawable/health_num.png new file mode 100644 index 0000000..7f9e614 Binary files /dev/null and b/app/src/main/res/drawable/health_num.png differ diff --git a/app/src/main/res/drawable/jianbianse10.jpg b/app/src/main/res/drawable/jianbianse10.jpg new file mode 100644 index 0000000..28b5830 Binary files /dev/null and b/app/src/main/res/drawable/jianbianse10.jpg differ diff --git a/app/src/main/res/drawable/jianbianse20.jpg b/app/src/main/res/drawable/jianbianse20.jpg new file mode 100644 index 0000000..f8680c8 Binary files /dev/null and b/app/src/main/res/drawable/jianbianse20.jpg differ diff --git a/app/src/main/res/drawable/mingyijianyan.png b/app/src/main/res/drawable/mingyijianyan.png new file mode 100644 index 0000000..d158554 Binary files /dev/null and b/app/src/main/res/drawable/mingyijianyan.png differ diff --git a/app/src/main/res/drawable/person_collection.png b/app/src/main/res/drawable/person_collection.png new file mode 100644 index 0000000..90c1cf9 Binary files /dev/null and b/app/src/main/res/drawable/person_collection.png differ diff --git a/app/src/main/res/drawable/person_money.png b/app/src/main/res/drawable/person_money.png new file mode 100644 index 0000000..efcb7f3 Binary files /dev/null and b/app/src/main/res/drawable/person_money.png differ diff --git a/app/src/main/res/drawable/sheet_28.png b/app/src/main/res/drawable/sheet_28.png new file mode 100644 index 0000000..a5668db Binary files /dev/null and b/app/src/main/res/drawable/sheet_28.png differ diff --git a/app/src/main/res/drawable/singinmeeting.png b/app/src/main/res/drawable/singinmeeting.png new file mode 100644 index 0000000..96db55d Binary files /dev/null and b/app/src/main/res/drawable/singinmeeting.png differ diff --git a/app/src/main/res/drawable/timer.png b/app/src/main/res/drawable/timer.png new file mode 100644 index 0000000..77501c2 Binary files /dev/null and b/app/src/main/res/drawable/timer.png differ diff --git a/app/src/main/res/drawable/wenxian.png b/app/src/main/res/drawable/wenxian.png new file mode 100644 index 0000000..b4210b6 Binary files /dev/null and b/app/src/main/res/drawable/wenxian.png differ diff --git a/app/src/main/res/drawable/xunzheng.png b/app/src/main/res/drawable/xunzheng.png new file mode 100644 index 0000000..db4eeb4 Binary files /dev/null and b/app/src/main/res/drawable/xunzheng.png differ diff --git a/app/src/main/res/drawable/yangsheng.png b/app/src/main/res/drawable/yangsheng.png new file mode 100644 index 0000000..01214f3 Binary files /dev/null and b/app/src/main/res/drawable/yangsheng.png differ diff --git a/app/src/main/res/drawable/zhenduan.png b/app/src/main/res/drawable/zhenduan.png new file mode 100644 index 0000000..e243d02 Binary files /dev/null and b/app/src/main/res/drawable/zhenduan.png differ diff --git a/app/src/main/res/drawable/zhengliao.png b/app/src/main/res/drawable/zhengliao.png new file mode 100644 index 0000000..091b7e9 Binary files /dev/null and b/app/src/main/res/drawable/zhengliao.png differ diff --git a/app/src/main/res/drawable/zhinan.png b/app/src/main/res/drawable/zhinan.png new file mode 100644 index 0000000..9722804 Binary files /dev/null and b/app/src/main/res/drawable/zhinan.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index f76041f..90fadb7 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -23,7 +23,7 @@ + android:background="@drawable/jianbianse2"> - + + + + + + - android:src="@drawable/girl"/> + + + + + + + + + + + + - - + + + + + + + - + + + + + + + - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_below="@id/person_username"> - - - - - - + + + + + + + + - - + + + android:layout_width="match_parent" + android:layout_height="match_parent"> + android:textSize="12dp" + android:text="0"/> + android:textSize="16dp" + android:text="关注" + android:layout_marginTop="20dp"/> + + + android:layout_width="match_parent" + android:layout_height="match_parent"> + android:textSize="12dp" + android:text="0"/> + android:textSize="16dp" + android:text="动态" + android:layout_marginTop="20dp"/> + + + android:layout_width="match_parent" + android:layout_height="match_parent"> + android:textSize="12dp" + android:text="0"/> + android:textSize="16dp" + android:text="论坛" + android:layout_marginTop="20dp"/> - - - + - - + @@ -304,26 +420,22 @@ android:layout_width="400dp" android:layout_height="wrap_content" app:cardBackgroundColor="@color/white" - android:layout_marginLeft="10dp" - android:layout_marginRight="10dp" android:layout_marginTop="6dp" - app:cardCornerRadius="10dp" - app:cardElevation="20dp" - app:cardMaxElevation="20dp" + android:layout_centerHorizontal="true" android:layout_below="@+id/personal_head_card"> + > @@ -397,7 +509,7 @@ + + + + + - - - + android:layout_marginTop="10dp"> + + + + + + @@ -462,42 +606,39 @@ - + + + + + + + + + + - + + + - + + + + + + + + - + + + - @@ -505,6 +646,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index edd0b48..a5618ab 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -19,115 +19,221 @@ app:startColor="@color/colorStart" app:title="@string/str_news_feed" app:titleTextColor="@android:color/white" /> - - - - + + + + + android:layout_centerHorizontal="true" + android:elevation="10dp" + app:cardCornerRadius="8dp" + app:cardElevation="8dp"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - -