From 8e7fcfb746af3294baff56affc3d040a486220a3 Mon Sep 17 00:00:00 2001
From: khy <18814188563@163.com>
Date: Thu, 2 Mar 2017 14:36:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E7=A4=BC=E5=8C=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=BD=AF=E9=94=AE=E7=9B=98=E5=AF=BC=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?=E9=97=AA=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/gh/gamecenter/FileReceiverActivity.java  | 4 +++-
 .../main/java/com/gh/gamecenter/FileSenderActivity.java    | 2 +-
 .../java/com/gh/gamecenter/ReceiverWaitingActivity.java    | 2 +-
 .../com/gh/gamecenter/adapter/FileReceiverAdapter.java     | 2 --
 .../main/java/com/gh/gamecenter/libao/Libao1Fragment.java  | 7 +++++++
 .../com/gh/gamecenter/personal/InstallFragmentAdapter.java | 5 ++---
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java
index 9987f5ee35..47612bf20d 100644
--- a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java
@@ -149,6 +149,8 @@ public class FileReceiverActivity extends BaseActivity implements FileReceiverAd
             if (mCurFileInfo == null) {
                 return -100;
             }
+            Utils.log("===============" + fileInfo.getFileTag() + "====" + mCurFileInfo.getFileTag());
+            Utils.log("===============" + fileInfo.getName() + "====" + mCurFileInfo.getName());
             if (fileInfo.getFileTag().equals(mCurFileInfo.getFileTag())) {
                return i;
             }
@@ -390,7 +392,7 @@ public class FileReceiverActivity extends BaseActivity implements FileReceiverAd
 
                         @Override
                         public void onProgress(long progress, long total) { // 获取传输进度
-                            Utils.log("快传文件接收中..." + progress + "==" + total);
+//                            Utils.log("快传文件接收中..." + progress + "==" + total);
                             Message message = new Message();
                             message.what = FileInfo.FLAG_DEFAULT;
                             message.obj = progress;
diff --git a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java b/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java
index f7c02306de..f336527d80 100644
--- a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java
@@ -283,7 +283,7 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte
 
                 @Override
                 public void onProgress(long progress, long total) {
-                    Utils.log("快传文件发送中..." + progress + "==" + total + "==" + fileInfo.getName());
+//                    Utils.log("快传文件发送中..." + progress + "==" + total + "==" + fileInfo.getName());
                     fileInfo.setProgress(progress);
                     Message message = new Message();
                     message.what = FileInfo.FLAG_DEFAULT;
diff --git a/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java b/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java
index 9c5cbebc24..d7f1de0d2b 100644
--- a/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java
@@ -204,7 +204,7 @@ public class ReceiverWaitingActivity extends BaseActivity {
                     public void onClick(View v) {
                         colsePage();
                         //关闭热点
-                        HotspotManager.disableAp(ReceiverWaitingActivity.this);
+                        HotspotManager.initUserAp(ReceiverWaitingActivity.this);
 
                         if (isOpenWifi) {
                             WifiMgr.getInstance(ReceiverWaitingActivity.this).openWifi();
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/FileReceiverAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/FileReceiverAdapter.java
index a106fc6a6e..ca21a08109 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/FileReceiverAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/FileReceiverAdapter.java
@@ -13,7 +13,6 @@ import com.gh.base.AppController;
 import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.PackageUtils;
 import com.gh.common.util.SpeedUtils;
-import com.gh.common.util.Utils;
 import com.gh.gamecenter.FileReceiverActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.KcSelectGameViewHolder;
@@ -75,7 +74,6 @@ public class FileReceiverAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             } else {
                 viewHolder.gameThumb.setImageResource(R.drawable.ocupy);
             }
-            Utils.log("=====传送状态：：" + fileInfo.getResult());
 
             viewHolder.downloadSpeed.setText("等待中");
             viewHolder.downloadSpeed.setTextColor(mContext.getResources().getColor(R.color.content));
diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java
index 9f9fccd9a4..e000f59d70 100644
--- a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java
+++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java
@@ -94,6 +94,13 @@ public class Libao1Fragment extends BaseFragment implements SwipeRefreshLayout.O
 
                 if (mIsSearch) return;
 
+                if (mLayoutManager.findFirstVisibleItemPosition() == 0) {
+                    swipeLayout.setDragEdge(SwipeLayout.DragEdge.Left);
+                } else {
+                    if (swipeLayout.getDragEdge() != SwipeLayout.DragEdge.Bottom)
+                    swipeLayout.setDragEdge(SwipeLayout.DragEdge.Bottom);
+                }
+
                 if ( mLayoutManager.findLastCompletelyVisibleItemPosition() + 1 != adapter.getItemCount()) {
                     swipeLayout.setSwipeEnabled(false);
                 } else {
diff --git a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java
index 2fe9a2dea6..9b51d8e9fd 100644
--- a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java
@@ -27,7 +27,6 @@ import com.gh.common.util.GameViewUtils;
 import com.gh.common.util.PackageUtils;
 import com.gh.common.util.PlatformUtils;
 import com.gh.common.util.TrafficUtils;
-import com.gh.common.util.Utils;
 import com.gh.common.view.SwipeLayout;
 import com.gh.download.DownloadManager;
 import com.gh.gamecenter.ChooseReceiverActivity;
@@ -506,7 +505,7 @@ class InstallFragmentAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
             @Override
             public void onUpdate(SwipeLayout layout, int leftOffset, int topOffset) {
-                if (leftOffset > maxWidth/3.0 && leftOffset < maxWidth/2.5) {
+                if (leftOffset > maxWidth/2.7 && leftOffset < maxWidth/2.5) {
 //                    holder.swipeText.setPadding(0, 0, DisplayUtils.dip2px(context, 30), 0);
                     holder.swipeText.setVisibility(View.GONE);
                     holder.swipeShareText.setVisibility(View.VISIBLE);
@@ -514,7 +513,7 @@ class InstallFragmentAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                     holder.swipeText.setVisibility(View.GONE);
                     holder.swipeShareText.setVisibility(View.VISIBLE);
                     holder.swipeShareText.setText("放手发给好友\n免流量安装");
-                } else if (leftOffset < maxWidth/3.0 ) {
+                } else if (leftOffset < maxWidth/2.7) {
 //                    holder.swipeText.setPadding(0, 0, DisplayUtils.dip2px(context, 15), 0);
                     holder.swipeText.setVisibility(View.VISIBLE);
                     holder.swipeShareText.setVisibility(View.GONE);