home and chat personal_activity update frame ongbo2_20191228

app/build.gradle

@@ -90,4 +90,6 @@ 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'
+
 }

app/src/main/java/com/example/PersonalCenter/EssayGalleryAdapter.java

@@ -0,0 +1,55 @@
+package com.example.PersonalCenter;
+
+import android.app.Activity;
+import android.graphics.Point;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
+import com.example.cmknowledgegraph.MainActivity;
+import com.example.cmknowledgegraph.R;
+
+import java.util.List;
+
+public class EssayGalleryAdapter extends RecyclerView.Adapter<EssayGalleryAdapter.ViewHolder>{
+    private List<Image> data;
+
+    public EssayGalleryAdapter(List<Image> data) {
+        this.data = data;
+    }
+
+    @Override
+    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+        View v = inflater.inflate(R.layout.item_shop_card, parent, false);
+        return new ViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(ViewHolder holder, int position) {
+        Glide.with(holder.itemView.getContext())
+                .load(data.get(position).getImage())
+                .into(holder.image);
+    }
+
+    @Override
+    public int getItemCount() {
+        return data.size();
+    }
+
+    class ViewHolder extends RecyclerView.ViewHolder {
+
+        private ImageView image;
+
+        public ViewHolder(View itemView) {
+            super(itemView);
+            image = (ImageView) itemView.findViewById(R.id.image);
+        }
+    }
+}

app/src/main/java/com/example/PersonalCenter/Image.java

@@ -0,0 +1,31 @@
+package com.example.PersonalCenter;
+
+public class Image {
+    private final int id;
+    private final String name;
+    private final String price;
+    private final int image;
+
+    public Image(int id, String name, String price, int image) {
+        this.id = id;
+        this.name = name;
+        this.price = price;
+        this.image = image;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public int getImage() {
+        return image;
+    }
+}

app/src/main/java/com/example/PersonalCenter/PersonContent.java

@@ -1,16 +1,19 @@
 package com.example.PersonalCenter;
 
+import android.animation.ArgbEvaluator;
 import android.app.Person;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.Outline;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewOutlineProvider;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
@@ -23,6 +26,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+import androidx.cardview.widget.CardView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -40,33 +44,45 @@ import com.hanks.htextview.rainbow.RainbowTextView;
 import com.mxn.soul.flowingdrawer_core.ElasticDrawer;
 import com.mxn.soul.flowingdrawer_core.FlowingDrawer;
 import com.skyfishjy.library.RippleBackground;
+import com.yarolegovich.discretescrollview.DSVOrientation;
+import com.yarolegovich.discretescrollview.DiscreteScrollView;
+import com.yarolegovich.discretescrollview.InfiniteScrollAdapter;
+import com.yarolegovich.discretescrollview.transform.ScaleTransformer;
+
+import java.util.List;
+
+import de.hdodenhof.circleimageview.CircleImageView;
 
 
 public class PersonContent extends Fragment  {
 
 
     protected int res;
-    private ViewPager viewPager;
+     private FlowingDrawer mDrawer;
-    private RecyclerView rvFeed;
-    private FlowingDrawer mDrawer;
-    @Override
-    public void onAttach(@NonNull Context context) {
-        super.onAttach(context);
-        MainActivity mainActivity = (MainActivity) context;
-    }
-
     AppCompatActivity appCompatActivity;
-
     public AppCompatActivity getAppCompatActivity() {
         return appCompatActivity;
     }
 
+//    与滚动文章有关的变量
+private List<Image> data;
+    private essayGallary essayGallary;
+
+    private TextView currentItemName;
+    private TextView currentItemPrice;
+    private ImageView rateItemButton;
+    private DiscreteScrollView itemPicker;
+    private InfiniteScrollAdapter infiniteAdapter;
+//    与滚动文章有关的变量
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        MainActivity mainActivity = (MainActivity) context;
+    }
     public void setAppCompatActivity(AppCompatActivity appCompatActivity) {
         this.appCompatActivity = appCompatActivity;
     }
-
-
-
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
@@ -85,34 +101,91 @@ public class PersonContent extends Fragment  {
        //设置侧滑菜单
         setupMenu();
     }
+
+
     protected void setuptoolbar(){
         //分别设置背景和头像
         //背景
 //        ImageView blurimageView = (ImageView) appCompatActivity.findViewById(R.id.iv_blur);
-
+//背景波纹图
-        RippleBackground linearimageView = (RippleBackground) appCompatActivity.findViewById(R.id.linearcontent);
+//        RippleBackground linearimageView = (RippleBackground) appCompatActivity.findViewById(R.id.linearcontent);
-        linearimageView.startRippleAnimation();
+//        linearimageView.startRippleAnimation();
 
         //头像
         ImageView avatarImageView = (ImageView) appCompatActivity.findViewById(R.id.iv_avatar);
-         Animation anim = AnimationUtils.loadAnimation(appCompatActivity,R.anim.anim_rotate);
+        Glide.with(getAppCompatActivity()).load(R.drawable.draw7).into(avatarImageView);
-        anim.setDuration(14000);
+        ViewOutlineProvider vop =  new ViewOutlineProvider() {
-        avatarImageView.startAnimation(anim);
+            @Override
-        ImageView drugImageView = (ImageView) appCompatActivity.findViewById(R.id.drug_essays);
+            public void getOutline(View view, Outline outline) {
+                //修改outline
+                outline.setOval(0,0,view.getWidth(),view.getHeight());
+            }};
+        avatarImageView.setOutlineProvider(vop);
+        //二维码
+        ImageView QRcodeImageView = (ImageView) appCompatActivity.findViewById(R.id.QRCode);
+        Glide.with(getAppCompatActivity()).load(R.drawable.qrcodeimage).into(QRcodeImageView);
+//         Animation anim = AnimationUtils.loadAnimation(appCompatActivity,R.anim.anim_rotate);
+//        anim.setDuration(14000);
+//        avatarImageView.startAnimation(anim);
+//        ImageView drugImageView = (ImageView) appCompatActivity.findViewById(R.id.drug_essays);
         //drugessays(像动态一样)
-        Animation animessays = AnimationUtils.loadAnimation(appCompatActivity,R.anim.anim_drugessays);
+//        Animation animessays = AnimationUtils.loadAnimation(appCompatActivity,R.anim.anim_drugessays);
-        animessays.setDuration(12000);
+//        animessays.setDuration(12000);
-        drugImageView.startAnimation(animessays);
+//        drugImageView.startAnimation(animessays);
-        Glide.with(appCompatActivity).load(R.drawable.draw6).into(avatarImageView);
+//        Glide.with(appCompatActivity).load(R.drawable.draw6).into(avatarImageView);
-
         //用户名
-        final TextView rainbowTextView = (TextView) appCompatActivity.findViewById(R.id.user_name_person);
+        final TextView rainbowTextView = (TextView) appCompatActivity.findViewById(R.id.person_username);
         rainbowTextView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
 
             }
         });
+        //菜单图片按钮
+        ImageView menuImageview = (ImageView) appCompatActivity.findViewById(R.id.set_image);
+        menuImageview.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mDrawer.toggleMenu();
+            }
+        });
+/*
+*
+* *******
+* //        设置滚动的文章按钮，文章画廊
+* ****
+* */
+
+        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();
+        itemPicker = (DiscreteScrollView) appCompatActivity.findViewById(R.id.item_picker);
+        itemPicker.setOrientation(DSVOrientation.HORIZONTAL);
+        itemPicker.addOnItemChangedListener(new DiscreteScrollView.OnItemChangedListener<EssayGalleryAdapter.ViewHolder>() {
+            @Override
+            public void onCurrentItemChanged(@Nullable EssayGalleryAdapter.ViewHolder viewHolder, int i) {
+                int positionInDataSet = infiniteAdapter.getRealPosition(i);
+                onItemChanged(data.get(positionInDataSet));
+            }
+        });
+        infiniteAdapter = InfiniteScrollAdapter.wrap(new EssayGalleryAdapter(data));
+        itemPicker.setAdapter(infiniteAdapter);
+        itemPicker.setItemTransitionTimeMillis(150);
+        itemPicker.setItemTransformer(new ScaleTransformer.Builder()
+                .setMinScale(0.8f)
+                .build());
+        onItemChanged(data.get(0));
+
+        /*
+        *
+        *
+        *
+        *
+        * */
+
+
         avatarOnclickListener avatarOnclickListener = new avatarOnclickListener(getAppCompatActivity(),this);
         avatarOnclickListener.setFlowingDrawerl(mDrawer);
         avatarImageView.setOnClickListener(avatarOnclickListener);
@@ -125,6 +198,7 @@ public class PersonContent extends Fragment  {
         MenuListFragment mMenuFragment = (MenuListFragment) fm.findFragmentById(R.id.id_container_menu);
 
         if (mMenuFragment == null) {
+            Log.i("is","------------it null");
             mMenuFragment = new MenuListFragment();
             mMenuFragment.setAppCompatActivity(getAppCompatActivity());
             fm.beginTransaction().add(R.id.id_container_menu, mMenuFragment).commit();
@@ -133,6 +207,12 @@ public class PersonContent extends Fragment  {
 
 
     }
-    //
+    //有关文章滚动画廊的方法
+    private void onItemChanged(Image item) {
+        currentItemName.setText(item.getName());
+        currentItemPrice.setText(item.getPrice());
+//        changeRateButtonState(item);
+    }
+
 
 }

app/src/main/java/com/example/PersonalCenter/essayGallary.java

@@ -0,0 +1,43 @@
+package com.example.PersonalCenter;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import com.example.cmknowledgegraph.R;
+
+import java.util.Arrays;
+import java.util.List;
+/*
+* 文章画廊类
+* */
+public class essayGallary {
+    private static final String STORAGE = "shop";
+
+    public static essayGallary get() {
+        return new essayGallary();
+    }
+
+//    private SharedPreferences storage;
+//
+//    private Shop() {
+//        storage = getInstance().getSharedPreferences(STORAGE, Context.MODE_PRIVATE);
+//    }
+
+    public List<Image> getData() {
+        return Arrays.asList(
+                new Image(1, "文章1", "概要1", R.drawable.draw6),
+                new Image(2, "文章2", "概要2", R.drawable.draw6),
+                new Image(3, "文章3", "概要3", R.drawable.draw6),
+                new Image(4, "文章4", "概要4", R.drawable.draw6),
+                new Image(5, "文章5", "概要5", R.drawable.draw6),
+                new Image(6, "文章6", "概要6", R.drawable.draw6));
+    }
+
+//    public boolean isRated(int itemId) {
+//        return storage.getBoolean(String.valueOf(itemId), false);
+//    }
+//
+//    public void setRated(int itemId, boolean isRated) {
+//        storage.edit().putBoolean(String.valueOf(itemId), isRated).apply();
+//    }
+}

app/src/main/java/com/example/cmknowledgegraph/MainActivity.java

@@ -13,6 +13,7 @@ import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
@@ -25,12 +26,23 @@ public class MainActivity extends AppCompatActivity  {
     private TextView mTextMessage;
     private FragmentTransaction transaction;
     private FragmentManager fragmentManager;
+    public AppCompatActivity appCompatActivity;
+//    private static ContextCompat contextCompat;
     BottomNavigationView navView;
 
-    public final AppCompatActivity getAppCompatActivity(){
+    public AppCompatActivity getAppCompatActivity(){
         return this;
     }
-
+    public void setAppCompatActivity(AppCompatActivity appCompatActivity){
+        this.appCompatActivity = appCompatActivity;
+    }
+//
+//    public static ContextCompat getComtextCompat() {
+//        return contextCompat;
+//    }
+//    private void setContextCompat(ContextCompat contextCompat){
+//        this.contextCompat=contextCompat;
+//    }
     private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener
             = new BottomNavigationView.OnNavigationItemSelectedListener() {
 
@@ -98,7 +110,8 @@ protected void onCreate(Bundle savedInstanceState) {
         navView = findViewById(R.id.nav_view);
         mTextMessage = findViewById(R.id.message);
         navView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
-
+//        setAppCompatActivity(this);
+//        setContextCompat(contextCompat);
 
         }
 

app/src/main/java/com/example/cmknowledgegraph/PersonalityCenterActivity.java

@@ -16,6 +16,7 @@ public class PersonalityCenterActivity extends AppCompatActivity {
         Log.i("PersonalityCenterActivity","个人中心");
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_personality_center);
+
     }
 
 

app/src/main/res/layout/activity_personality_center.xml

@@ -37,74 +37,230 @@
 <!--                android:scaleType="fitXY"-->
 <!--                app:layout_anchorGravity="center"-->
 <!--                android:background="@drawable/draw12"/>-->
-            <com.skyfishjy.library.RippleBackground
+
-                android:id="@+id/linearcontent"
+<!--            <com.skyfishjy.library.RippleBackground-->
+<!--                android:id="@+id/linearcontent"-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="260dp"-->
+<!--                app:rb_color="#808080"-->
+<!--                app:rb_duration="6000"-->
+<!--                app:rb_radius="60dp"-->
+<!--                app:rb_rippleAmount="6"-->
+<!--                app:rb_type="strokeRipple"-->
+<!--                android:background="@drawable/draw12"-->
+<!--                app:rb_scale="6">-->
+
+<!--                //旋转头像-->
+<!--                <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"-->
+<!--                    android:id="@+id/iv_avatar"-->
+<!--                    android:layout_width="120dp"-->
+<!--                    android:layout_height="120dp"-->
+<!--                    android:layout_centerInParent="true"-->
+<!--                    app:civ_border_color="#d0d0d0"-->
+
+<!--                    app:civ_border_width="1dp" />-->
+<!--                //用户名-->
+
+<!--                <TextView-->
+<!--                    android:id="@+id/user_name_person"-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_alignTop="@+id/iv_avatar"-->
+<!--                    android:layout_centerHorizontal="true"-->
+<!--                    android:layout_marginTop="-30dp"-->
+<!--                    android:text="未登录"-->
+<!--                    android:textSize="20sp" />-->
+
+<!--                <de.hdodenhof.circleimageview.CircleImageView-->
+<!--                android:layout_width="65dp"-->
+<!--                android:layout_height="65dp"-->
+<!--                android:src="@drawable/draw15"-->
+<!--                android:id="@+id/drug_essays"-->
+<!--                    android:layout_alignLeft="@+id/iv_avatar"-->
+<!--                    android:layout_marginLeft="210dp"-->
+<!--                    android:layout_alignTop="@+id/iv_avatar"-->
+<!--                    android:layout_marginTop="20dp"-->
+
+<!--                />-->
+
+
+
+<!--            </com.skyfishjy.library.RippleBackground>-->
+<!--            弹窗菜单按钮-->
+            <ImageView
+                android:id="@+id/set_image"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:src="@drawable/mirror_light_ctrl_gray"
+                android:layout_marginTop="20dp"/>
+            <ImageView
+                android:id="@+id/voiceprint"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="5dp"
+                android:src="@drawable/voiceprint"
+                android:layout_marginTop="20dp"/>
+            <androidx.cardview.widget.CardView
+                android:id="@+id/personal_head_card"
                 android:layout_width="match_parent"
-                android:layout_height="260dp"
+                android:layout_height="180dp"
-                app:rb_color="#808080"
+                app:cardElevation="15dp"
-                app:rb_duration="6000"
+                app:cardCornerRadius="10dp"
-                app:rb_radius="60dp"
+                android:layout_below="@id/set_image"
-                app:rb_rippleAmount="6"
-                app:rb_type="strokeRipple"
-                android:background="@drawable/draw12"
-                app:rb_scale="6">
-
-                //头像
-                <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
-                    android:id="@+id/iv_avatar"
-                    android:layout_width="120dp"
-                    android:layout_height="120dp"
-                    android:layout_centerInParent="true"
-                    app:civ_border_color="#d0d0d0"
-
-                    app:civ_border_width="1dp" />
-                //用户名
-
-                <TextView
-                    android:id="@+id/user_name_person"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignTop="@+id/iv_avatar"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="-30dp"
-                    android:text="未登录"
-                    android:textSize="20sp" />
-
-                <de.hdodenhof.circleimageview.CircleImageView
-                android:layout_width="65dp"
-                android:layout_height="65dp"
-                android:src="@drawable/draw15"
-                android:id="@+id/drug_essays"
-                    android:layout_alignLeft="@+id/iv_avatar"
-                    android:layout_marginLeft="210dp"
-                    android:layout_alignTop="@+id/iv_avatar"
-                    android:layout_marginTop="20dp"
 
-                />
+                >
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    >
+<!--                    这里这是用户名-->
+                    <TextView
+                        android:id="@+id/person_username"
+                        android:layout_width="wrap_content"
+                        android:layout_height="50dp"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginTop="5dp"
+                        android:text="不拘一格"
+                        android:textColor="#000000"
+                        android:textSize="30dp"/>
+<!--                    这是性别-->
+
+<!--                    这是地区-->
+                    <ImageView
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_below="@+id/person_username"
+                        android:layout_marginTop="3dp"
+                        android:background="@drawable/ic_global_menu_nearby"/>
+
+                    <TextView
+                        android:id="@+id/person_region"
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:text="湖南省长沙市"
+                        android:layout_marginLeft="23dp"
+                        android:textColor="#c0c0c0"
+                        android:textSize="15dp"
+                        android:layout_below="@+id/person_username"
+                        android:layout_marginTop="5dp"/>
+<!--                    这里设置个性签名的图片-->
+                    <ImageView
+                        android:id="@+id/person_gexingqianming_image"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:background="@drawable/draw13"
+                        android:layout_below="@+id/person_region"
+                        android:layout_marginTop="-4dp"/>
+<!--                    这里设置个性签名,暂时不能超过15个字符-->
+                    <TextView
+                        android:id="@+id/person_gexingqianming"
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:layout_marginLeft="28dp"
+                        android:layout_marginTop="-3dp"
+                        android:layout_below="@+id/person_region"
+                        android:textSize="15dp"
+                        android:textColor="#c0c0c0"
+
+                        android:text="成军于三湘在四海中闯荡"/>
+<!--                    圆形头像-->
+                    <de.hdodenhof.circleimageview.CircleImageView
+                        android:id="@+id/iv_avatar"
+                        android:layout_width="100dp"
+                        android:layout_height="100dp"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginRight="5dp"
+                        android:layout_alignParentTop="true"
+                        android:layout_marginTop="10dp"
+                        app:civ_border_color="#e0e0e0"
+                        app:civ_border_width="4dp"
+                        android:elevation="74dp"
+                        />
+<!--                    接下来是收藏，drug ，粉丝-->
+                    <TextView
+                        android:id="@+id/Collection_num"
+                        android:layout_width="wrap_content"
+                        android:layout_height="35dp"
+                        android:layout_alignTop="@id/iv_avatar"
+                        android:layout_marginTop="101dp"
+                        android:layout_marginLeft="20dp"
+                        android:text="212"
+                        android:textSize="24dp"
+                        android:textColor="#000000"
+                        />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:layout_alignTop="@id/Collection_num"
+                        android:layout_marginTop="36dp"
+                        android:layout_marginLeft="20dp"
+                        android:textColor="#d0d0d0"
+                        android:text="收藏"
+                        android:textSize="16dp"/>
+                    <TextView
+                        android:id="@+id/drug_num"
+                        android:layout_width="wrap_content"
+                        android:layout_height="35dp"
+                        android:layout_alignTop="@+id/iv_avatar"
+                        android:layout_marginTop="101dp"
+                        android:layout_marginLeft="90dp"
+                        android:text="222"
+                        android:textSize="24dp"
+                        android:textColor="#000000"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:layout_alignTop="@+id/drug_num"
+                        android:layout_marginTop="36dp"
+
+                        android:layout_marginLeft="90dp"
+                        android:text="drug"
+                        android:textColor="#d0d0d0"
+                        android:textSize="16dp"/>
+                    <TextView
+                        android:id="@+id/fans_num"
+                        android:layout_width="wrap_content"
+                        android:layout_height="35dp"
+                        android:layout_alignTop="@+id/iv_avatar"
+                        android:layout_marginTop="101dp"
+                        android:layout_marginLeft="170dp"
+                        android:text="14"
+                        android:textSize="24dp"
+                        android:textColor="#000000"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:layout_alignTop="@id/fans_num"
+                        android:layout_marginTop="36dp"
+                        android:layout_marginLeft="170dp"
+                        android:text="粉丝"
+                        android:textColor="#d0d0d0"
+                        android:textSize="16dp"/>
+
+<!--                    二维码图片按钮-->
+                    <de.hdodenhof.circleimageview.CircleImageView
+                        android:id="@+id/QRCode"
+                        android:layout_width="120dp"
+                        android:layout_height="120dp"
+                        android:layout_alignParentBottom="true"
+                        android:layout_marginBottom="-60dp"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginRight="-60dp"
+                        android:elevation="10dp"
 
+                        />
 
 
-            </com.skyfishjy.library.RippleBackground>
 
-            <ImageView
+                </RelativeLayout>
-                android:id="@+id/person_gexingqianming"
+
-                android:layout_width="50dp"
+
-                android:layout_height="50dp"
+
-                android:layout_alignBottom="@+id/linearcontent"
+            </androidx.cardview.widget.CardView>
-                android:layout_marginBottom="40dp"
+
-                android:layout_marginLeft="15dp"
+
-                android:src="@drawable/draw13"/>
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/gexingqianming"
-                android:layout_alignLeft="@+id/person_gexingqianming"
-                android:layout_marginLeft="60dp"
-                android:layout_alignBottom="@+id/linearcontent"
-                android:textSize="14dp"
-                android:layout_marginBottom="46dp"
-                android:text="改写写什么呢？？？"/>
 
                                 设置几个选项
             <androidx.cardview.widget.CardView
@@ -114,11 +270,11 @@
                 app:cardBackgroundColor="@color/white"
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
-                android:layout_marginTop="-40dp"
+                android:layout_marginTop="6dp"
                 app:cardCornerRadius="10dp"
                 app:cardElevation="20dp"
                 app:cardMaxElevation="20dp"
-                android:layout_below="@+id/linearcontent">
+                android:layout_below="@+id/personal_head_card">
 
                 <RelativeLayout
                     android:id="@+id/person_cardview_relativeLayout"
@@ -134,8 +290,8 @@
                         android:layout_marginLeft="30dp">
                         <de.hdodenhof.circleimageview.CircleImageView
                             android:id="@+id/diet_hobby"
-                            android:layout_width="50dp"
+                            android:layout_width="36dp"
-                            android:layout_height="50dp"
+                            android:layout_height="36dp"
 
                             android:src="@drawable/mushroom"
                             app:civ_border_width="0dp" />
@@ -144,6 +300,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="饮食爱好"
+                            android:textSize="12dp"
                             android:layout_gravity="center_horizontal"
                             ></TextView>
 
@@ -153,14 +310,16 @@
                         android:id="@+id/person_cardview_relalinearLayout2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_alignLeft="@+id/person_cardview_relalinearLayout1"
+                        android:layout_marginLeft="90dp"
                         android:orientation="vertical"
                         android:layout_marginTop="10dp"
                         android:layout_centerHorizontal="true"
                         >
                         <de.hdodenhof.circleimageview.CircleImageView
                             android:id="@+id/person_calender"
-                            android:layout_width="50dp"
+                            android:layout_width="35dp"
-                            android:layout_height="50dp"
+                            android:layout_height="35dp"
 
                             android:src="@drawable/origamicoloredpencil06"
                             app:civ_border_width="0dp"
@@ -171,45 +330,47 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="日历"
+                            android:textSize="12dp"
                             android:layout_gravity="center_horizontal"/>
 
                     </LinearLayout>
 
-                    <LinearLayout
+<!--                    <LinearLayout-->
-                        android:id="@+id/person_cardview_relalinearLayout3"
+<!--                        android:id="@+id/person_cardview_relalinearLayout3"-->
-                        android:layout_width="wrap_content"
+<!--                        android:layout_width="wrap_content"-->
-                        android:layout_height="wrap_content"
+<!--                        android:layout_height="wrap_content"-->
-                        android:orientation="vertical"
+<!--                        android:orientation="vertical"-->
-                        android:layout_marginTop="10dp"
+<!--                        android:layout_marginTop="10dp"-->
-                        android:layout_alignParentRight="true"
+<!--                        android:layout_alignParentRight="true"-->
-                        android:layout_marginRight="30dp">
+<!--                        android:layout_marginRight="30dp">-->
-                        <de.hdodenhof.circleimageview.CircleImageView
+<!--                        <de.hdodenhof.circleimageview.CircleImageView-->
-                            android:id="@+id/person_article"
+<!--                            android:id="@+id/person_article"-->
-                            android:layout_width="50dp"
+<!--                            android:layout_width="50dp"-->
-                            android:layout_height="50dp"
+<!--                            android:layout_height="50dp"-->
-
+
-                            android:src="@drawable/tuya_pc_icon_09"
+<!--                            android:src="@drawable/tuya_pc_icon_09"-->
-                            app:civ_border_width="0dp"/>
+<!--                            app:civ_border_width="0dp"/>-->
-                        <TextView
+<!--                        <TextView-->
-                            android:id="@+id/person_calender_text"
+<!--                            android:id="@+id/person_calender_text1"-->
-                            android:layout_width="wrap_content"
+<!--                            android:layout_width="wrap_content"-->
-                            android:layout_height="wrap_content"
+<!--                            android:layout_height="wrap_content"-->
-                            android:text="我的文章"
+<!--                            android:text="我的文章"-->
-                            android:layout_gravity="center_horizontal"/>
+<!--                            android:layout_gravity="center_horizontal"/>-->
-
+
-                    </LinearLayout>
+<!--                    </LinearLayout>-->
                     <LinearLayout
                         android:id="@+id/person_cardview_relalinearLayout4"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_alignLeft="@+id/person_cardview_relalinearLayout2"
+                        android:layout_marginLeft="90dp"
+                        android:layout_marginTop="10dp"
                         android:orientation="vertical"
-                        android:layout_below="@+id/person_cardview_relalinearLayout1"
+                     >
-                        android:layout_marginTop="5dp"
-                        android:layout_marginLeft="30dp">
                         <de.hdodenhof.circleimageview.CircleImageView
                             android:id="@+id/person_Healthrecommendation"
-                            android:layout_width="50dp"
+                            android:layout_width="35dp"
-                            android:layout_height="50dp"
+                            android:layout_height="35dp"
 
                             android:src="@drawable/origamicoloredpencil02"
                             app:civ_border_width="0dp"/>
@@ -218,6 +379,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="养生推荐"
+                            android:textSize="12dp"
                             android:layout_gravity="center_horizontal"/>
 
                     </LinearLayout>
@@ -226,13 +388,14 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:layout_below="@+id/person_cardview_relalinearLayout2"
+                        android:layout_alignLeft="@+id/person_cardview_relalinearLayout4"
-                        android:layout_marginTop="5dp"
+                        android:layout_marginLeft="90dp"
+                        android:layout_marginTop="10dp"
                         android:layout_centerHorizontal="true">
                         <de.hdodenhof.circleimageview.CircleImageView
                             android:id="@+id/person_messagenotification"
-                            android:layout_width="50dp"
+                            android:layout_width="35dp"
-                            android:layout_height="50dp"
+                            android:layout_height="35dp"
 
                             android:src="@drawable/tuya_pc_icon_19"
                             app:civ_border_width="0dp"/>
@@ -241,6 +404,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="消息通知"
+                            android:textSize="12dp"
                             android:layout_gravity="center_horizontal"/>
 
                     </LinearLayout>
@@ -251,6 +415,88 @@
             </androidx.cardview.widget.CardView>
 
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="30dp"
+                android:layout_below="@+id/person_cardview"
+                android:layout_marginTop="4dp"
+                android:text="我的文章"
+                />
+            <ImageView
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_below="@id/person_cardview"
+                android:layout_marginTop="5dp"
+                android:layout_marginLeft="54dp"
+                android:src="@drawable/next"/>
+            <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="200dp"
+                android:layout_below="@+id/person_cardview"
+                android:layout_marginTop="37dp">
+
+
+
+                <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                    xmlns:app="http://schemas.android.com/apk/res-auto"
+                    xmlns:tools="http://schemas.android.com/tools"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@android:color/white"
+                    android:orientation="vertical"
+                    >
+
+
+
+<!--                    <Space-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="0dp"-->
+<!--                        android:layout_weight="10" />-->
+
+                    <TextView
+                        android:id="@+id/item_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:fontFamily="sans-serif-light"
+                        android:textColor="@android:color/black"
+                        android:textSize="16sp"
+                        android:textStyle="bold"
+                        tools:text="Stoneware + Porcelain Plate" />
+
+                    <Space
+                        android:layout_width="wrap_content"
+                        android:layout_height="4dp" />
+
+                    <TextView
+                        android:id="@+id/item_price"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:textColor="@color/shopAccent"
+                        android:textStyle="bold"
+                        tools:text="$24.00 USD" />
+
+                    <Space
+                        android:layout_width="wrap_content"
+                        android:layout_height="16dp" />
+
+                    <com.yarolegovich.discretescrollview.DiscreteScrollView
+                        android:id="@+id/item_picker"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                    <Space
+                        android:layout_width="wrap_content"
+                        android:layout_height="24dp" />
+
+
+
+
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
+
+
 
         </RelativeLayout>
 

app/src/main/res/layout/item_shop_card.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="180dp"
+    android:layout_height="120dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_margin="4dp"
+    android:layout_gravity="center"
+    app:cardCornerRadius="7dp"
+    app:cardElevation="10dp">
+
+    <ImageView
+        android:id="@+id/image"
+        android:scaleType="centerCrop"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</androidx.cardview.widget.CardView>

app/src/main/res/values/colors.xml

@@ -49,4 +49,68 @@
 
 <!--    personcal设置-->
     <color name="nav_personal_backcard"></color>
+
+<!--    滚动文章-->
+    <color name="galleryCurrentItemOverlay">@android:color/transparent</color>
+    <color name="galleryItemOverlay">#cc000000</color>
+    <color name="galleryEdgeEffect">#b4ffffff</color>
+    <color name="galleryAccent">#FFC107</color>
+
+    <color name="weatherAccent">#84ceca</color>
+
+    <color name="gradientPeriodicClouds_c1">#3453d1</color>
+    <color name="gradientPeriodicClouds_c2">#6d69ff</color>
+    <color name="gradientPeriodicClouds_c3">#cd47c6</color>
+
+    <array name="gradientPeriodicClouds">
+        <item>@color/gradientPeriodicClouds_c1</item>
+        <item>@color/gradientPeriodicClouds_c2</item>
+        <item>@color/gradientPeriodicClouds_c3</item>
+    </array>
+
+    <color name="gradientCloudy_c1">#62bff5</color>
+    <color name="gradientCloudy_c2">#61b3e5</color>
+    <color name="gradientCloudy_c3">#5d8fb2</color>
+
+    <array name="gradientCloudy">
+        <item>@color/gradientCloudy_c1</item>
+        <item>@color/gradientCloudy_c2</item>
+        <item>@color/gradientCloudy_c3</item>
+    </array>
+
+    <color name="gradientMostlyCloudy_c1">#51bbf5</color>
+    <color name="gradientMostlyCloudy_c2">#71c3ee</color>
+    <color name="gradientMostlyCloudy_c3">#f3e5d2</color>
+
+    <array name="gradientMostlyCloudy">
+        <item>@color/gradientMostlyCloudy_c1</item>
+        <item>@color/gradientMostlyCloudy_c2</item>
+        <item>@color/gradientMostlyCloudy_c3</item>
+    </array>
+
+    <color name="gradientPartlyCloudy_c1">#5b64be</color>
+    <color name="gradientPartlyCloudy_c2">#6084df</color>
+    <color name="gradientPartlyCloudy_c3">#64a2ff</color>
+
+    <array name="gradientPartlyCloudy">
+        <item>@color/gradientPartlyCloudy_c1</item>
+        <item>@color/gradientPartlyCloudy_c2</item>
+        <item>@color/gradientPartlyCloudy_c3</item>
+    </array>
+
+    <color name="gradientClear_c1">#6d4fbe</color>
+    <color name="gradientClear_c2">#6c56be</color>
+    <color name="gradientClear_c3">#a189f1</color>
+
+    <array name="gradientClear">
+        <item>@color/gradientClear_c1</item>
+        <item>@color/gradientClear_c2</item>
+        <item>@color/gradientClear_c3</item>
+    </array>
+<!--    滚动文章-->
+
+    <color name="shopAccent">#84ceca</color>
+    <color name="shopSecondary">#727272</color>
+    <color name="shopRatedStar">#ffeb5a</color>
+    <color name="shopFabRipple">#51b2ac</color>
 </resources>

app/src/main/res/values/styles.xml

@@ -42,4 +42,10 @@
         <item name="spinBars">true</item>
         <item name="color">@color/drawerArrowColor</item>
     </style>
+
+<!--    文章画廊-->
+    <style name="ClickableImageView">
+        <item name="android:clickable">true</item>
+        <item name="android:background">?android:selectableItemBackground</item>
+    </style>
 </resources>