工程整理

朱显松
1 parent 025af0a4
Showing 13 changed files with 40 additions and 80 deletions
app/libs/libcnliveutil.jar
app/src/main/java/com/cnlive/gundam/user/util/InputUtil.java
app/src/main/java/com/cnlive/gundam/user/util/ToastUtil.java
app/src/main/java/com/cnlive/gundam/video/adpter/GiftAdapter.java
app/src/main/java/com/cnlive/gundam/video/fragment/chat/ChatRoomFragment.java
app/src/main/res/drawable-hdpi/tab_bar_bg.9.png
app/src/main/res/drawable-mdpi/tab_bar_bg.9.png
app/src/main/res/drawable-xhdpi/tab_bar_bg.9.png
app/src/main/res/drawable-xxhdpi/tab_bar_bg.9.png
app/src/main/res/drawable-xxxhdpi/tab_bar_bg.9.png
app/src/main/res/drawable-xxhdpi/toolbar_bg.9.png → app/src/main/res/drawable/toolbar_bg.9.png
app/src/main/res/layout/fragment_chat.xml
app/src/main/res/layout/fragment_gift_receycel.xml
@@ -75,7 +75,7 @@ public class InputUtil {
                     }
                     if(sendCommentCallBack!=null){
                         if (TextUtils.isEmpty(mMsgEditText.getText())) {
-                            ToastUtil.showToast(mContext, "不能发送空消息呦~");
+                            ToastUtil.show(mContext, "不能发送空消息呦~");
                         } else {
                             sendCommentCallBack.sendComment(mMsgEditText.getText().toString());
                             mMsgEditText.setText("");
@@ -130,7 +130,7 @@ public class InputUtil {
         //发送聊天室消息
         if(mSendCallback!=null){
             if (TextUtils.isEmpty(mMsgEditText.getText())) {
-                ToastUtil.showToast(mContext, "不能发送空消息呦~");
+                ToastUtil.show(mContext, "不能发送空消息呦~");
             } else {
                 mSendCallback.sendMessage(mGson.toJson(new CNMessageModle("chatRoom",new MessageInfo("","","","",mMsgEditText.getText().toString()))));
                 mMsgEditText.setText("");
@@ -11,15 +11,12 @@ import android.widget.Toast;
 import com.cnlive.gundam.R;
-
 /**
  * Created by xiansong on 2016/12/12.
  */
 public class ToastUtil {
-    private static Toast toast;
-
-    private static long back_pressed;
+    private static long showTime;
     private static String show_msg = "";
     private static Toast current_toast;
     private static final int TOAST_LAYOUT_ID = R.layout.test_layout_toast;
@@ -29,45 +26,29 @@ public class ToastUtil {
     }
     public static Toast show(Context context, String msg) {
-//        if (!ShockwaveApplication.appOnline)
-//            return;
-        hide();
         if (null == context || TextUtils.isEmpty(msg))
             return null;
-        if (back_pressed + 2000 < System.currentTimeMillis() || !show_msg.equals(msg)) {
+        if (showTime + 2000 < System.currentTimeMillis() || !show_msg.equals(msg)) {
             hideToast();
-            show_msg = msg;
-            toast = new Toast(context);
+
             View view = LayoutInflater.from(context).inflate(TOAST_LAYOUT_ID, null, false);
+
             ImageView imageView = view.findViewById(R.id.image);
-            TextView textView = view.findViewById(R.id.text);
             imageView.setVisibility(View.GONE);
+            TextView textView = view.findViewById(R.id.text);
             textView.setText(msg);
+
+            Toast toast = new Toast(context);
             toast.setDuration(Toast.LENGTH_SHORT);
             toast.setView(view);
             toast.show();
-            current_toast = toast;
-        }
-        back_pressed = System.currentTimeMillis();
-        return toast;
-    }
-
-    public static boolean checkNetwork(Context context) {
-        if (context == null) return false;
-        if (NetworkUtil.isConnectInternet(context.getApplicationContext())) {
-            return true;
-        } else {
-            show(context.getApplicationContext(), context.getString(R.string.net_connect_toast));
-            return false;
-        }
-    }
-    public static void showToast(Context context, String text) {
-        show(context,text);
+            show_msg = msg;
+            current_toast = toast;
+            showTime = System.currentTimeMillis();
+            return toast;
+        } else return null;
     }
-    public static void hide() {
-        if (toast != null) toast.cancel();
-    }
 }
@@ -32,15 +32,14 @@ public class GiftAdapter extends RecyclerView.Adapter&lt;GiftAdapter.RVHolder&gt; {
     private List<GiftModle> mDataList;
     private int mLayoutId;      // 条目布局文件ID
     private int mVariableId;    // DataBinding变量ID
-    private  String roomId;
-    public GiftAdapter(String roomId,Context context, List<GiftModle> list, int layoutId, int variableId) {
+    private String roomId;
+
+    public GiftAdapter(String roomId, Context context, List<GiftModle> list, int layoutId, int variableId) {
         this.mContext = context;
         this.mDataList = list;
         this.mLayoutId = layoutId;
-        mVariableId = variableId;
-        this.roomId=roomId;
-
-
+        this.mVariableId = variableId;
+        this.roomId = roomId;
     }
@@ -58,9 +57,9 @@ public class GiftAdapter extends RecyclerView.Adapter&lt;GiftAdapter.RVHolder&gt; {
         holder.binding.getRoot().findViewById(R.id.ll_item).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                CNMessageModle cnMessageModle = new CNMessageModle("giftType",new MessageInfo("0",mDataList.get(position).getGiftMessage(),"1","0",mDataList.get(position).getGiftMessage()));
-                Gson gson2=new Gson();
-                String obj2=gson2.toJson(cnMessageModle);
+                CNMessageModle cnMessageModle = new CNMessageModle("giftType", new MessageInfo("0", mDataList.get(position).getGiftMessage(), "1", "0", mDataList.get(position).getGiftMessage()));
+                Gson gson2 = new Gson();
+                String obj2 = gson2.toJson(cnMessageModle);
                 ChatUtil.sendMessage(IChat.CHATROOM, roomId, obj2, new IChat.OnSendMessageListener() {
                     @Override
                     public void onAttached(CNMessage message) {
@@ -6,7 +6,6 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.OrientationHelper;
 import android.support.v7.widget.SwitchCompat;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -81,8 +80,6 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
         initDate();
         initGift();
         initChat();
-
-
     }
@@ -171,8 +168,7 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
                 fragmentChatBinding.rlGift.setVisibility(i);
             }
         });
-        GridLayoutManager gridLayoutManager = new GridLayoutManager(getContext(), 2);
-        gridLayoutManager.setOrientation(OrientationHelper.HORIZONTAL);
+        GridLayoutManager gridLayoutManager = new GridLayoutManager(getContext(), 6);
         fragmentChatBinding.recyclerGift.setLayoutManager(gridLayoutManager);
         fragmentChatBinding.setGiftAdapter(new GiftAdapter(roomId, getActivity(), giftArray, R.layout.fragment_gift_receycel, BR.dataBean));
     }
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    >
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <data>
         <variable
             name="messageAdapter"
             type="com.cnlive.gundam.video.adpter.CommonAdapter" />
-        
+
         <variable
             name="giftAdapter"
             type="com.cnlive.gundam.video.adpter.GiftAdapter" />
@@ -25,14 +24,14 @@
             android:id="@+id/list_message"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_above="@+id/edit_layout"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:divider="@null"
             android:scrollbars="none"
             android:stackFromBottom="true"
             android:transcriptMode="alwaysScroll"
-            app:Adapter="@{messageAdapter}"
-            android:layout_above="@+id/edit_layout"/>
+            app:Adapter="@{messageAdapter}" />
         <RelativeLayout
@@ -87,8 +86,7 @@
                 android:id="@+id/recycler_gift"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:adapter="@{giftAdapter}"
-                />
+                app:adapter="@{giftAdapter}" />
         </RelativeLayout>
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-   >
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
     <data>
@@ -10,40 +9,27 @@
             type="com.cnlive.gundam.video.model.GiftModle" />
     </data>
-    <LinearLayout
+    <RelativeLayout
         android:id="@+id/ll_item"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="5dp"
-
-        android:orientation="vertical">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
         <ImageView
             android:id="@+id/avaimg"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:src="@{dataBean.imgSource}"
-            />
+            android:layout_centerHorizontal="true"/>
-        <RelativeLayout
+        <TextView
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@android:color/white"
-                android:layout_centerInParent="true"
-                android:text="@{dataBean.giftMessage}"/>
-
-        </RelativeLayout>
-
-
-
-
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_below="@+id/avaimg"
+            android:text="@{dataBean.giftMessage}"
+            android:textColor="@android:color/white" />
-    </LinearLayout>
+    </RelativeLayout>
 </layout>
 \ No newline at end of file