This commit is contained in:
2020-08-14 16:49:32 +08:00
parent 562a4f8df0
commit 95debe68f4
50 changed files with 1396 additions and 100 deletions

View File

@@ -2,11 +2,11 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent">
</android.support.v4.view.ViewPager>
</androidx.viewpager.widget.ViewPager>
</RelativeLayout>

View File

@@ -8,7 +8,7 @@
<include
layout="@layout/title_layout"/>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rcy_inbound_history"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -16,6 +16,6 @@
android:layout_marginLeft="@dimen/dimen_21dp"
android:layout_marginRight="@dimen/dimen_21dp">
</android.support.v7.widget.RecyclerView>
</androidx.recyclerview.widget.RecyclerView>
</LinearLayout>

View File

@@ -48,7 +48,7 @@
</LinearLayout>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rcy_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -56,6 +56,6 @@
android:layout_marginLeft="@dimen/dimen_8"
android:layout_marginRight="@dimen/dimen_8">
</android.support.v7.widget.RecyclerView>
</androidx.recyclerview.widget.RecyclerView>
</LinearLayout>

View File

@@ -8,7 +8,7 @@
<include
layout="@layout/title_layout"/>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rcy_outbound_history"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -16,6 +16,6 @@
android:layout_marginLeft="@dimen/dimen_21dp"
android:layout_marginRight="@dimen/dimen_21dp">
</android.support.v7.widget.RecyclerView>
</androidx.recyclerview.widget.RecyclerView>
</LinearLayout>

View File

@@ -0,0 +1,26 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/srl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/marking_fragment_recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</LinearLayout>

View File

@@ -0,0 +1,121 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ffffff"
android:orientation="vertical">
<androidx.drawerlayout.widget.DrawerLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/titlebar"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@color/colorWhite">
<Button
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentLeft="true"
android:layout_centerInParent="true"
android:layout_marginLeft="20dp"
android:background="@mipmap/icon_back"
android:textColor="#000000"
android:visibility="invisible" />
<TextView
android:id="@+id/enter_shop_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="追踪客户"
android:textColor="@color/colorWhite"
android:textSize="18sp" />
<RelativeLayout
android:id="@+id/enter_shop_shai"
android:layout_width="160dp"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:visibility="gone"
android:gravity="center">
<TextView
android:id="@+id/enter_shop_shaixuan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="全部客户"
android:textColor="@color/colorWhite"
android:textSize="18sp" />
<ImageView
android:layout_width="8dp"
android:layout_height="6dp"
android:layout_centerVertical="true"
android:layout_marginLeft="6dp"
android:layout_toRightOf="@+id/enter_shop_shaixuan"
/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/bt_sousuo_ditu"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="8dp"
android:gravity="center">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
/>
</RelativeLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:orientation="vertical">
<com.google.android.material.tabs.TabLayout
android:id="@+id/main_tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWhite"
app:tabGravity="fill"
app:tabIndicatorFullWidth="false"
app:tabIndicatorHeight="4dp"
app:tabIndicatorColor="@color/colortheme"
app:tabMode="fixed"
app:tabSelectedTextColor="@color/black"
app:tabTextColor="@color/black" />
</LinearLayout>
</RelativeLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/main_vp"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>
</androidx.drawerlayout.widget.DrawerLayout>
</LinearLayout>

View File

@@ -3,13 +3,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.example.administrator.seven.main.Fragment.MyFragment">
tools:context="com.example.administrator.seven.main.my.MyFragment">
<android.support.v4.widget.SwipeRefreshLayout
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/SwipeRefreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/layout_my_content"/>
</android.support.v4.widget.SwipeRefreshLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</LinearLayout>

View File

@@ -0,0 +1,109 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
app:cardCornerRadius="6dp">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<Button
android:id="@+id/btn_customer_exist_state_lost"
android:layout_width="wrap_content"
android:layout_height="26dp"
android:layout_alignParentRight="true"
android:text="跟踪历史" />
<RelativeLayout
android:id="@+id/rl_user_about_information"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/btn_customer_exist_state_lost"
android:paddingBottom="10dp">
<LinearLayout
android:id="@+id/rl_user_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal">
<ImageView
android:id="@+id/iv_user_head_view_yiliushi"
android:layout_width="86dp"
android:layout_height="86dp"
android:src="@mipmap/ic_launcher" />
<TextView
android:id="@+id/tv_user_name_yiliushi"
android:layout_width="86dp"
android:layout_height="wrap_content"
android:text="--" />
<TextView
android:id="@+id/tv_user_tel_yiliushi"
android:layout_width="86dp"
android:layout_height="wrap_content"
android:text="--" />
</LinearLayout>
<TextView
android:id="@+id/tv_enter_add_befor_yiliushi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/view"
android:layout_toRightOf="@+id/rl_user_info"
android:layout_marginTop="5dp"
android:text="上次进店:--" />
<TextView
android:id="@+id/tv_employee"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_enter_add_befor_yiliushi"
android:layout_toRightOf="@+id/rl_user_info"
android:text="店员:未知" />
<TextView
android:id="@+id/tv_enter_store_time_yiliushi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_employee"
android:layout_toRightOf="@+id/rl_user_info"
android:text="时间:--" />
<View
android:id="@+id/view1"
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_below="@+id/tv_enter_store_time_yiliushi"
android:layout_toRightOf="@+id/rl_user_info"
/>
<TextView
android:id="@+id/tv_customer_lost_reason"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/view1"
android:layout_toRightOf="@+id/rl_user_info"
android:text="流失原因:--" />
</RelativeLayout>
</RelativeLayout>
</androidx.cardview.widget.CardView>

View File

@@ -52,20 +52,20 @@
</RelativeLayout>
<android.support.v4.widget.SwipeRefreshLayout
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/srl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/marking_fragment_recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#F5F5F5" />
</android.support.v4.widget.SwipeRefreshLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>