Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -1,18 +1,77 @@
 package com.kfzs.duanduan.fragment;
 
 import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.sheep.jiuyan.samllsheep.R;
 
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import butterknife.Unbinder;
+
 /**
+ * 个人中心
  * Created by ljy on 2018/5/8.
  */
 
 public class FgtPersonalCenter extends BaseCompatFragment {
+    @BindView(R.id.icon_img_iv)
+    ImageView iconImgIv;
+    @BindView(R.id.name_tv)
+    TextView nameTv;
+    @BindView(R.id.sheep_num_tv)
+    TextView sheepNumTv;
+    Unbinder unbinder;
+
     @Override
     protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.personalcenter_act_layout);
+        setContentView(R.layout.fgt_personalcenter_layout);
+
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        // TODO: inflate a fragment view
+        View rootView = super.onCreateView(inflater, container, savedInstanceState);
+        unbinder = ButterKnife.bind(this, rootView);
+        return rootView;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
 
+    @OnClick({R.id.icon_img_iv, R.id.personalcenter_price_layout, R.id.account_detail_layout, R.id.account_safe_layout, R.id.account_task_layout, R.id.proxy_service_layout, R.id.abourt_us_layout, R.id.feedbook_layout, R.id.recommend_friend_layout, R.id.tv_submit})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.icon_img_iv:
+                break;
+            case R.id.personalcenter_price_layout:
+                break;
+            case R.id.account_detail_layout:
+                break;
+            case R.id.account_safe_layout:
+                break;
+            case R.id.account_task_layout:
+                break;
+            case R.id.proxy_service_layout:
+                break;
+            case R.id.abourt_us_layout:
+                break;
+            case R.id.feedbook_layout:
+                break;
+            case R.id.recommend_friend_layout:
+                break;
+            case R.id.tv_submit:
+                break;
+        }
     }
 }

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

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/view_size_130">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/view_size_100"
+        android:background="@mipmap/home_blue_bg"
+        android:layout_marginBottom="@dimen/content_padding_40">
+        <ImageView
+            android:id="@+id/icon_img_iv"
+            android:layout_width="@dimen/view_size_60"
+            android:layout_height="@dimen/view_size_60"
+            android:src="@drawable/icon"
+            android:layout_centerVertical="true"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_toRightOf="@+id/icon_img_iv"
+            android:layout_centerVertical="true">
+            <TextView
+                android:id="@+id/name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/content_padding_small"
+                android:layout_marginLeft="@dimen/content_padding_10"
+                android:layout_marginTop="@dimen/content_padding_small"
+                android:text="aaaa"
+                android:textColor="@color/txt_white"
+                android:textSize="@dimen/text_size_12"/>
+
+            <TextView
+                android:id="@+id/sheep_num_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/name_tv"
+                android:layout_marginBottom="@dimen/content_padding_small"
+                android:layout_marginLeft="@dimen/content_padding_10"
+                android:text="绵羊号："
+                android:textColor="@color/txt_white"
+                android:textSize="@dimen/text_size_10"/>
+        </LinearLayout>
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/personalcenter_price_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+        android:layout_marginRight="@dimen/content_padding_15"
+        android:layout_marginLeft="@dimen/content_padding_15"
+        android:layout_gravity="bottom"
+        android:padding="@dimen/content_padding_15">
+
+        <ImageView
+            android:id="@+id/personalcenter_item_price_iv"
+            android:layout_width="@dimen/content_padding_20"
+            android:layout_height="@dimen/content_padding_20"
+            android:src="@mipmap/x_ic_account_secuity"
+            android:layout_marginRight="12dp"
+            android:layout_centerVertical="true"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="帐号安全"
+            android:lines="1"
+            android:textColor="@color/black"
+            android:textSize="14dp"
+            android:layout_centerVertical="true" />
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="帐号安全"
+            android:lines="1"
+            android:textColor="@color/txt_black_818181"
+            android:textSize="14dp"
+            android:layout_centerVertical="true"
+            android:gravity="right"/>
+    </LinearLayout>
+</FrameLayout>

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

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+    android:layout_margin="@dimen/content_padding_15">
+    <RelativeLayout
+        android:id="@+id/account_detail_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="15dp"
+        android:gravity="center">
+        <ImageView
+            android:id="@+id/account_detail_item_icon_iv"
+            android:layout_width="@dimen/content_padding_20"
+            android:layout_height="@dimen/content_padding_20"
+            android:src="@mipmap/x_ic_account_secuity"
+            android:layout_marginRight="12dp"
+            android:layout_centerVertical="true"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="个人资料"
+            android:lines="1"
+            android:textColor="@color/black"
+            android:textSize="14dp"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@+id/account_detail_item_icon_iv" />
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/x_ic_next"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="12dp"
+            android:layout_centerVertical="true"/>
+
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/white_bg_line"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/white_bg_line"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        />
+
+    <RelativeLayout
+        android:id="@+id/account_safe_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="15dp"
+
+        android:layout_alignParentStart="true">
+        <ImageView
+            android:id="@+id/account_safe_item_icon_iv"
+            android:layout_width="@dimen/content_padding_20"
+            android:layout_height="@dimen/content_padding_20"
+            android:src="@mipmap/personalc_ic_account_safe"
+            android:layout_marginRight="12dp"
+            android:layout_centerVertical="true"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="账号安全"
+            android:lines="1"
+            android:textColor="@color/black"
+            android:textSize="14dp"
+            android:layout_alignBottom="@+id/account_safe_item_icon_iv"
+            android:layout_toEndOf="@+id/account_safe_item_icon_iv"
+            android:layout_centerVertical="true"/>
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/x_ic_next"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="12dp"
+            android:layout_centerVertical="true"/>
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/account_task_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="15dp"
+
+        android:layout_alignParentStart="true">
+        <ImageView
+            android:id="@+id/tast_item_icon_iv"
+            android:layout_width="@dimen/content_padding_20"
+            android:layout_height="@dimen/content_padding_20"
+            android:src="@mipmap/x_ic_task_history"
+            android:layout_marginRight="12dp"
+            android:layout_centerVertical="true"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="任务记录"
+            android:lines="1"
+            android:textColor="@color/black"
+            android:textSize="14dp"
+            android:layout_alignBottom="@+id/tast_item_icon_iv"
+            android:layout_toEndOf="@+id/tast_item_icon_iv"
+            android:layout_centerVertical="true"/>
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/x_ic_next"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="12dp"
+            android:layout_centerVertical="true"/>
+
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/white_bg_line"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        />
+
+    <RelativeLayout
+        android:id="@+id/proxy_service_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="15dp"
+        >
+        <ImageView
+            android:id="@+id/proxy_service_item_icon_iv"
+            android:layout_width="@dimen/content_padding_20"
+            android:layout_height="@dimen/content_padding_20"
+            android:src="@mipmap/personalc_ic_proxy_service"
+            android:layout_marginRight="12dp"
+            android:layout_centerVertical="true"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="代理服务"
+            android:lines="1"
+            android:textColor="@color/black"
+            android:textSize="14dp"
+            android:layout_centerVertical="true"
+            android:layout_alignBottom="@+id/proxy_service_item_icon_iv"
+            android:layout_toEndOf="@+id/proxy_service_item_icon_iv" />
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/x_ic_next"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="12dp"
+            android:layout_centerVertical="true"/>
+
+    </RelativeLayout>
+</LinearLayout>

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

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+    android:layout_margin="@dimen/content_padding_15">
+    <RelativeLayout
+        android:id="@+id/abourt_us_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="15dp"
+        android:gravity="center">
+        <ImageView
+            android:id="@+id/abourt_us_item_icon_iv"
+            android:layout_width="@dimen/content_padding_20"
+            android:layout_height="@dimen/content_padding_20"
+            android:src="@mipmap/personalc_ic_about_us"
+            android:layout_marginRight="12dp"
+            android:layout_centerVertical="true"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="关于我们"
+            android:lines="1"
+            android:textColor="@color/black"
+            android:textSize="14dp"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@+id/abourt_us_item_icon_iv" />
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/x_ic_next"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="12dp"
+            android:layout_centerVertical="true"/>
+
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/white_bg_line"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        />
+
+    <RelativeLayout
+        android:id="@+id/feedbook_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="15dp"
+
+        android:layout_alignParentStart="true">
+        <ImageView
+            android:id="@+id/feedbook_item_icon_iv"
+            android:layout_width="@dimen/content_padding_20"
+            android:layout_height="@dimen/content_padding_20"
+            android:src="@mipmap/personalc_ic_feedback"
+            android:layout_marginRight="12dp"
+            android:layout_centerVertical="true"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="意见反馈"
+            android:lines="1"
+            android:textColor="@color/black"
+            android:textSize="14dp"
+            android:layout_alignBottom="@+id/feedbook_item_icon_iv"
+            android:layout_toEndOf="@+id/feedbook_item_icon_iv"
+            android:layout_centerVertical="true"/>
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/x_ic_next"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="12dp"
+            android:layout_centerVertical="true"/>
+
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/white_bg_line"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        />
+
+    <RelativeLayout
+        android:id="@+id/recommend_friend_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="15dp"
+        >
+        <ImageView
+            android:id="@+id/recommend_friend_item_icon_iv"
+            android:layout_width="@dimen/content_padding_20"
+            android:layout_height="@dimen/content_padding_20"
+            android:src="@mipmap/personalc_ic_recommend_friend"
+            android:layout_marginRight="12dp"
+            android:layout_centerVertical="true"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="推荐给好友"
+            android:lines="1"
+            android:textColor="@color/black"
+            android:textSize="14dp"
+            android:layout_centerVertical="true"
+            android:layout_alignBottom="@+id/recommend_friend_item_icon_iv"
+            android:layout_toEndOf="@+id/recommend_friend_item_icon_iv" />
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/x_ic_next"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="12dp"
+            android:layout_centerVertical="true"/>
+
+    </RelativeLayout>
+</LinearLayout>

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

@@ -1,53 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_gray"
-    android:orientation="vertical">
+    android:scrollbars="none">
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-       <RelativeLayout
-           android:layout_width="match_parent"
-           android:layout_height="@dimen/view_size_100"
-           android:background="@mipmap/home_blue_bg">
-           <ImageView
-               android:id="@+id/icon_img_iv"
-               android:layout_width="@dimen/view_size_60"
-               android:layout_height="@dimen/view_size_60"
-               android:src="@drawable/icon"
-               android:layout_centerVertical="true"/>
-
-           <TextView
-               android:id="@+id/name_tv"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:layout_marginBottom="@dimen/content_padding_small"
-               android:layout_marginLeft="@dimen/content_padding_10"
-               android:layout_marginTop="@dimen/content_padding_small"
-               android:text="aaaa"
-               android:textColor="@color/txt_white"
-               android:textSize="@dimen/text_size_12"
-               android:layout_toRightOf="@+id/icon_img_iv"
-               android:layout_alignBaseline="@+id/icon_img_iv"
-               android:layout_centerVertical="true"/>
-
-           <TextView
-               android:id="@+id/sheep_num_tv"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:layout_below="@+id/name_tv"
-               android:layout_marginBottom="@dimen/content_padding_small"
-               android:layout_marginLeft="@dimen/content_padding_10"
-               android:text="绵羊号："
-               android:textColor="@color/txt_white"
-               android:textSize="@dimen/text_size_10"
-               android:layout_toRightOf="@+id/icon_img_iv"
-               android:layout_centerVertical="true"/>
-       </RelativeLayout>
-    </RelativeLayout>
-
-
-</LinearLayout>
+        android:layout_height="match_parent"
+        android:background="@color/bg_gray"
+        android:orientation="vertical">
+
+        <include layout="@layout/fgt_personacenter_item_top" />
+
+        <include layout="@layout/fgt_personalcenter_item_center_one" />
+
+        <include layout="@layout/fgt_personalcenter_item_center_two" />
+
+
+        <TextView
+            android:id="@+id/tv_submit"
+            style="@style/style_button_margin15"
+            android:text="退出登录" />
+
+    </LinearLayout>
+
+
+</ScrollView>

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

@@ -70,6 +70,7 @@
     <dimen name="view_size_80">80dp</dimen>
     <dimen name="view_size_90">90dp</dimen>
     <dimen name="view_size_100">100dp</dimen>
+    <dimen name="view_size_130">130dp</dimen>
     <dimen name="view_size_150">150dp</dimen>
 
 

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

@@ -22,6 +22,15 @@
         <item name="android:layout_margin">@dimen/content_padding_10</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>
+    <style name="style_button_margin15" parent="button">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">40dp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:background">@drawable/selector_button_full_main</item>
+        <item name="android:textColor">@color/btn_color_main</item>
+        <item name="android:layout_margin">@dimen/content_padding_15</item>
+        <item name="android:textSize">@dimen/text_size_15</item>
+    </style>
     <style name="style_button_small" parent="button">
         <item name="android:layout_width">70dp</item>
         <item name="android:layout_height">30dp</item>