修改页面

谷俊
1 parent 4003f582
Showing 11 changed files with 54 additions and 29 deletions
app/src/main/java/com/cnlive/gundam/main/ui/fragment/ConfigFragment.java
app/src/main/java/com/cnlive/gundam/main/ui/fragment/HomeFragment.java
app/src/main/java/com/cnlive/gundam/main/ui/fragment/LiveFragment.java
app/src/main/java/com/cnlive/gundam/main/ui/fragment/UGCListFragment.java
app/src/main/java/com/cnlive/gundam/video/view/BaseVideoView.java
app/src/main/res/drawable-xxhdpi/toolbar_bg.9.png
app/src/main/res/layout/fragment_active_list.xml
app/src/main/res/layout/fragment_live.xml
app/src/main/res/layout/layout_actionbar.xml
app/src/main/res/layout/layout_actionbar_back.xml
app/src/main/res/layout/user_fragment.xml
@@ -8,6 +8,7 @@ import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.cnlive.gundam.R;
@@ -47,6 +48,8 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
     }
     private void initUI() {
+        TextView titleText = binding.getRoot().findViewById(R.id.toolbarTitle);
+        if (titleText != null) titleText.setText("我 的");
         binding.configHeader.setOnClickListener(this);
         binding.message.setOnClickListener(this);
     }
@@ -9,6 +9,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 import android.widget.Toast;
 import com.cnlive.gundam.BR;
@@ -60,6 +61,8 @@ public class HomeFragment extends Fragment implements SwipeRefreshLayout.OnRefre
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        TextView titleText = binding.getRoot().findViewById(R.id.toolbarTitle);
+        if (titleText != null) titleText.setText("点播列表");
         loadData();
     }
@@ -8,6 +8,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 import com.cnlive.gundam.BR;
 import com.cnlive.gundam.R;
@@ -42,6 +43,8 @@ public class LiveFragment extends Fragment implements DataBindingAdapter.OnAdapt
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         initData();
+        TextView titleText = binding.getRoot().findViewById(R.id.toolbarTitle);
+        if (titleText != null) titleText.setText("直播列表");
         binding.setListAdapter(adapter = new DataBindingAdapter(getActivity(), R.layout.layout_item_video_list, BR.program));
         binding.setLayoutManager(new LinearLayoutManager(getActivity()));
         adapter.updateItems(programs);
@@ -9,6 +9,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 import android.widget.Toast;
 import com.cnlive.gundam.BR;
@@ -60,6 +61,8 @@ public class UGCListFragment extends Fragment implements SwipeRefreshLayout.OnRe
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        TextView titleText = binding.getRoot().findViewById(R.id.toolbarTitle);
+        if (titleText != null) titleText.setText("ugc列表");
         loadData();
     }
@@ -49,7 +49,7 @@ public abstract class BaseVideoView extends RelativeLayout implements
     protected static boolean isLive;
     //记录当前视频是否能播
     protected boolean canPlay = true;
-    //记录当前视频状态是否结束
+    //记录当前视频状态是否结束,结束后就不再播
     protected boolean isStatusEnd = false;
     //本地缓存数据工具类
     private SharedPreferencesHelper sharedPreferencesHelper;
@@ -328,11 +328,13 @@ public abstract class BaseVideoView extends RelativeLayout implements
                     break;
                 case IVideoStatus.MEDIA_STATUS_END:
                     //直播结束
-                    canPlay = false;
-                    isPlay = false;
-                    isStatusEnd = true;
-                    binding.videoView.release();
-                    binding.infoView.show(PlayerInfoView.SHOW_UGC_LIVE_STATUS, getContext().getString(R.string.player_status_end));
+                    if (!isStatusEnd) {
+                        canPlay = false;
+                        isPlay = false;
+                        isStatusEnd = true;
+                        binding.videoView.release();
+                        binding.infoView.show(PlayerInfoView.SHOW_UGC_LIVE_STATUS, getContext().getString(R.string.player_status_end));
+                    }
                     break;
             }
@@ -19,7 +19,12 @@
         android:layout_height="match_parent"
         android:fitsSystemWindows="true">
+        <include
+            android:id="@+id/toolbarLayout"
+            layout="@layout/layout_actionbar"/>
+
         <android.support.v4.widget.SwipeRefreshLayout
+            android:layout_below="@+id/toolbarLayout"
             android:id="@+id/contentView"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -21,7 +21,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
+        <include
+            android:id="@+id/toolbarLayout"
+            layout="@layout/layout_actionbar"/>
+
         <android.support.v7.widget.RecyclerView
+            android:layout_below="@+id/toolbarLayout"
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+<?xml version="1.0" encoding="utf-8"?>
+
+<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/toolbar"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    android:theme="@style/ThemeOverlay.AppCompat.Light"
+    android:background="@drawable/toolbar_bg"
+    tools:visibility="visible">
+
+
+    <TextView
+        android:id="@+id/toolbarTitle"
+        style="@style/ActionbarTitleStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:lines="1"
+        tools:text="here is title"/>
+
+</android.support.v7.widget.Toolbar>
 \ No newline at end of file
@@ -8,7 +8,7 @@
     android:layout_height="?attr/actionBarSize"
     android:theme="@style/ThemeOverlay.AppCompat.Light"
     app:contentInsetEnd="?attr/actionBarSize"
-    android:background="@android:color/white"
+    android:background="@drawable/toolbar_bg"
     android:visibility="gone"
     tools:visibility="visible">
@@ -9,28 +9,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="48dp">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:singleLine="true"
-                android:text="我的"
-                android:textColor="@color/config_black_color"
-                android:textSize="22sp" />
-
-
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:layout_marginBottom="@dimen/_20px"
-            android:background="@color/gray_line_color" />
-
+        <include layout="@layout/layout_actionbar"/>
         <RelativeLayout
             android:id="@+id/config_header"