From b48a274707cc91c10e70ed5d2be5350c6928e979 Mon Sep 17 00:00:00 2001
From: kehaoyuan <kehaoyuan@ghzhushou.com>
Date: Mon, 17 Jun 2019 17:21:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BF=AB=E4=BC=A0=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                  | 10 +++++-----
 .../main/java/com/gh/common/util/DialogUtils.java |  7 ++++---
 .../java/com/gh/gamecenter/InstallActivity.java   |  1 +
 .../gh/gamecenter/adapter/FileSenderAdapter.java  |  2 +-
 .../adapter/InstallFragmentAdapter.java           |  2 +-
 .../gamecenter/adapter/KcSelectGameAdapter.java   |  2 +-
 .../com/gh/gamecenter/kuaichuan/FileReceiver.java |  2 +-
 .../view}/ChooseReceiverActivity.java             |  8 +++++---
 .../view}/FileReceiverActivity.java               | 12 +++++++-----
 .../{ => kuaichuan/view}/FileSenderActivity.java  | 13 +++++++------
 .../kuaichuan/view/FileShareFragment.java         |  2 --
 .../view}/KcSelectGameActivity.java               | 15 ++++++++-------
 .../view}/ReceiverWaitingActivity.java            |  5 +++--
 13 files changed, 44 insertions(+), 37 deletions(-)
 rename app/src/main/java/com/gh/gamecenter/{ => kuaichuan/view}/ChooseReceiverActivity.java (99%)
 rename app/src/main/java/com/gh/gamecenter/{ => kuaichuan/view}/FileReceiverActivity.java (99%)
 rename app/src/main/java/com/gh/gamecenter/{ => kuaichuan/view}/FileSenderActivity.java (99%)
 rename app/src/main/java/com/gh/gamecenter/{ => kuaichuan/view}/KcSelectGameActivity.java (98%)
 rename app/src/main/java/com/gh/gamecenter/{ => kuaichuan/view}/ReceiverWaitingActivity.java (99%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ca0c1e717c..b6cb498c6c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -143,19 +143,19 @@
             android:name = "com.gh.gamecenter.CleanApkActivity"
             android:screenOrientation = "portrait" />
         <activity
-            android:name = "com.gh.gamecenter.KcSelectGameActivity"
+            android:name = "com.gh.gamecenter.kuaichuan.view.KcSelectGameActivity"
             android:screenOrientation = "portrait" />
         <activity
-            android:name = "com.gh.gamecenter.ChooseReceiverActivity"
+            android:name = "com.gh.gamecenter.kuaichuan.view.ChooseReceiverActivity"
             android:screenOrientation = "portrait" />
         <activity
-            android:name = "com.gh.gamecenter.ReceiverWaitingActivity"
+            android:name = "com.gh.gamecenter.kuaichuan.view.ReceiverWaitingActivity"
             android:screenOrientation = "portrait" />
         <activity
-            android:name = "com.gh.gamecenter.FileSenderActivity"
+            android:name = "com.gh.gamecenter.kuaichuan.view.FileSenderActivity"
             android:screenOrientation = "portrait" />
         <activity
-            android:name = "com.gh.gamecenter.FileReceiverActivity"
+            android:name = "com.gh.gamecenter.kuaichuan.view.FileReceiverActivity"
             android:screenOrientation = "portrait" />
         <activity
             android:name = "com.gh.gamecenter.SelectUserIconActivity"
diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java
index e33f479dd7..46a41e07ce 100644
--- a/app/src/main/java/com/gh/common/util/DialogUtils.java
+++ b/app/src/main/java/com/gh/common/util/DialogUtils.java
@@ -9,8 +9,6 @@ import android.content.pm.PackageInfo;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.os.Handler;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.app.AlertDialog;
 import android.text.Html;
 import android.text.Spanned;
 import android.text.TextPaint;
@@ -27,9 +25,9 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.gh.gamecenter.AboutActivity;
-import com.gh.gamecenter.KcSelectGameActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.kuaichuan.WifiMgr;
+import com.gh.gamecenter.kuaichuan.view.KcSelectGameActivity;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
 
@@ -41,6 +39,9 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.content.ContextCompat;
+
 public class DialogUtils {
 
     private static boolean isShow = false;
diff --git a/app/src/main/java/com/gh/gamecenter/InstallActivity.java b/app/src/main/java/com/gh/gamecenter/InstallActivity.java
index 1b8d2f508f..6a1511c3e4 100644
--- a/app/src/main/java/com/gh/gamecenter/InstallActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/InstallActivity.java
@@ -22,6 +22,7 @@ import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.eventbus.EBDownloadStatus;
 import com.gh.gamecenter.eventbus.EBReuse;
 import com.gh.gamecenter.eventbus.EBSkip;
+import com.gh.gamecenter.kuaichuan.view.ChooseReceiverActivity;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.gh.gamecenter.packagehelper.PackageViewModel;
 import com.lightgame.download.DataWatcher;
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/FileSenderAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/FileSenderAdapter.java
index ebbff3c769..a8482c88d1 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/FileSenderAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/FileSenderAdapter.java
@@ -9,7 +9,7 @@ import com.lightgame.adapter.BaseRecyclerAdapter;
 import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.SpeedUtils;
 import com.lightgame.utils.Utils;
-import com.gh.gamecenter.FileSenderActivity;
+import com.gh.gamecenter.kuaichuan.view.FileSenderActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.KcSelectGameViewHolder;
 import com.gh.gamecenter.kuaichuan.FileInfo;
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java
index cf25890930..a425e75b60 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java
@@ -29,7 +29,7 @@ import com.gh.common.view.SwipeLayout;
 import com.gh.download.DownloadManager;
 import com.gh.gamecenter.GameDetailActivity;
 import com.gh.gamecenter.InstallActivity;
-import com.gh.gamecenter.KcSelectGameActivity;
+import com.gh.gamecenter.kuaichuan.view.KcSelectGameActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.FooterViewHolder;
 import com.gh.gamecenter.adapter.viewholder.GameNormalSwipeViewHolder;
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java
index 1b244bf076..df571dfaae 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java
@@ -21,7 +21,7 @@ import android.widget.TextView;
 import com.gh.common.constant.ItemViewType;
 import com.gh.common.util.BitmapUtils;
 import com.gh.common.util.DisplayUtils;
-import com.gh.gamecenter.KcSelectGameActivity;
+import com.gh.gamecenter.kuaichuan.view.KcSelectGameActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.FooterViewHolder;
 import com.gh.gamecenter.adapter.viewholder.KcSelectGameViewHolder;
diff --git a/app/src/main/java/com/gh/gamecenter/kuaichuan/FileReceiver.java b/app/src/main/java/com/gh/gamecenter/kuaichuan/FileReceiver.java
index d0c399aa4f..f972c0f256 100644
--- a/app/src/main/java/com/gh/gamecenter/kuaichuan/FileReceiver.java
+++ b/app/src/main/java/com/gh/gamecenter/kuaichuan/FileReceiver.java
@@ -9,7 +9,7 @@ import android.text.TextUtils;
 import com.lightgame.download.FileUtils;
 import com.gh.common.util.StringUtils;
 import com.lightgame.utils.Utils;
-import com.gh.gamecenter.FileReceiverActivity;
+import com.gh.gamecenter.kuaichuan.view.FileReceiverActivity;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/kuaichuan/view/ChooseReceiverActivity.java
similarity index 99%
rename from app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java
rename to app/src/main/java/com/gh/gamecenter/kuaichuan/view/ChooseReceiverActivity.java
index dfdfe7fd9f..86c30d2438 100644
--- a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/kuaichuan/view/ChooseReceiverActivity.java
@@ -1,4 +1,4 @@
-package com.gh.gamecenter;
+package com.gh.gamecenter.kuaichuan.view;
 
 import android.Manifest;
 import android.animation.Animator;
@@ -11,7 +11,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.preference.PreferenceManager;
-import androidx.annotation.NonNull;
 import android.text.Html;
 import android.view.MenuItem;
 import android.view.View;
@@ -31,6 +30,8 @@ import com.gh.common.util.DialogUtils;
 import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.UserIconUtils;
 import com.gh.common.view.RadarView;
+import com.gh.gamecenter.R;
+import com.gh.gamecenter.ShareGhActivity;
 import com.gh.gamecenter.kuaichuan.BaseTransfer;
 import com.gh.gamecenter.kuaichuan.Constant;
 import com.gh.gamecenter.kuaichuan.FileInfo;
@@ -51,11 +52,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.NonNull;
 import butterknife.BindView;
 import butterknife.OnClick;
 import pub.devrel.easypermissions.EasyPermissions;
 
-import static com.gh.gamecenter.KcSelectGameActivity.SEND_OVER_REQUEST;
+import static com.gh.gamecenter.kuaichuan.view.KcSelectGameActivity.SEND_OVER_REQUEST;
 
 /**
  * Created by khy on 2017/1/20.
diff --git a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/kuaichuan/view/FileReceiverActivity.java
similarity index 99%
rename from app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java
rename to app/src/main/java/com/gh/gamecenter/kuaichuan/view/FileReceiverActivity.java
index ba4164d9a7..1f318c545a 100644
--- a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/kuaichuan/view/FileReceiverActivity.java
@@ -1,4 +1,4 @@
-package com.gh.gamecenter;
+package com.gh.gamecenter.kuaichuan.view;
 
 import android.Manifest;
 import android.content.SharedPreferences;
@@ -9,10 +9,6 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.Parcelable;
 import android.preference.PreferenceManager;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.LinearLayout;
@@ -26,6 +22,8 @@ import com.gh.common.util.PackageUtils;
 import com.gh.common.util.StringUtils;
 import com.gh.common.util.UserIconUtils;
 import com.gh.common.view.VerticalItemDecoration;
+import com.gh.gamecenter.CleanApkActivity;
+import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.FileReceiverAdapter;
 import com.gh.gamecenter.adapter.FileReceiverAdapter.OnReceiverCancelListener;
 import com.gh.gamecenter.eventbus.EBDownloadChanged;
@@ -63,6 +61,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.OnClick;
 
diff --git a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java b/app/src/main/java/com/gh/gamecenter/kuaichuan/view/FileSenderActivity.java
similarity index 99%
rename from app/src/main/java/com/gh/gamecenter/FileSenderActivity.java
rename to app/src/main/java/com/gh/gamecenter/kuaichuan/view/FileSenderActivity.java
index 6a41930ea5..2791f7429b 100644
--- a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/kuaichuan/view/FileSenderActivity.java
@@ -1,4 +1,4 @@
-package com.gh.gamecenter;
+package com.gh.gamecenter.kuaichuan.view;
 
 import android.Manifest;
 import android.content.Context;
@@ -7,11 +7,6 @@ import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import androidx.annotation.NonNull;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -22,6 +17,7 @@ import com.gh.base.BaseActivity;
 import com.gh.common.util.DialogUtils;
 import com.gh.common.util.UserIconUtils;
 import com.gh.common.view.VerticalItemDecoration;
+import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.FileSenderAdapter;
 import com.gh.gamecenter.kuaichuan.Constant;
 import com.gh.gamecenter.kuaichuan.FileInfo;
@@ -44,6 +40,11 @@ import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.OnClick;
 
diff --git a/app/src/main/java/com/gh/gamecenter/kuaichuan/view/FileShareFragment.java b/app/src/main/java/com/gh/gamecenter/kuaichuan/view/FileShareFragment.java
index d00b86eed6..4d5be7ee8f 100644
--- a/app/src/main/java/com/gh/gamecenter/kuaichuan/view/FileShareFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/kuaichuan/view/FileShareFragment.java
@@ -11,9 +11,7 @@ import android.widget.TextView;
 import com.gh.common.util.DialogUtils;
 import com.gh.common.util.MtaHelper;
 import com.gh.gamecenter.CleanApkActivity;
-import com.gh.gamecenter.KcSelectGameActivity;
 import com.gh.gamecenter.R;
-import com.gh.gamecenter.ReceiverWaitingActivity;
 import com.gh.gamecenter.ShareGhActivity;
 import com.gh.gamecenter.normal.NormalFragment;
 
diff --git a/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java b/app/src/main/java/com/gh/gamecenter/kuaichuan/view/KcSelectGameActivity.java
similarity index 98%
rename from app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java
rename to app/src/main/java/com/gh/gamecenter/kuaichuan/view/KcSelectGameActivity.java
index 5913cb54d5..912e08027e 100644
--- a/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/kuaichuan/view/KcSelectGameActivity.java
@@ -1,11 +1,8 @@
-package com.gh.gamecenter;
+package com.gh.gamecenter.kuaichuan.view;
 
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
@@ -14,21 +11,25 @@ import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.halo.assistant.HaloApp;
 import com.gh.base.BaseActivity;
 import com.gh.common.util.DisplayUtils;
-import com.lightgame.utils.Utils;
 import com.gh.common.view.VerticalItemDecoration;
+import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.KcSelectGameAdapter;
 import com.gh.gamecenter.kuaichuan.FileInfo;
+import com.halo.assistant.HaloApp;
+import com.lightgame.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 
-import static com.gh.gamecenter.FileSenderActivity.KC_REPEAT_RESULT;
+import static com.gh.gamecenter.kuaichuan.view.FileSenderActivity.KC_REPEAT_RESULT;
 
 /**
  * Created by khy on 2017/1/20.
diff --git a/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java b/app/src/main/java/com/gh/gamecenter/kuaichuan/view/ReceiverWaitingActivity.java
similarity index 99%
rename from app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java
rename to app/src/main/java/com/gh/gamecenter/kuaichuan/view/ReceiverWaitingActivity.java
index e83979080b..8a7d7603fd 100644
--- a/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/kuaichuan/view/ReceiverWaitingActivity.java
@@ -1,4 +1,4 @@
-package com.gh.gamecenter;
+package com.gh.gamecenter.kuaichuan.view;
 
 import android.app.Activity;
 import android.content.Context;
@@ -10,7 +10,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.preference.PreferenceManager;
-import androidx.annotation.NonNull;
 import android.text.Html;
 import android.text.TextUtils;
 import android.view.MenuItem;
@@ -23,6 +22,7 @@ import com.gh.common.util.DialogUtils;
 import com.gh.common.util.RandomUtils;
 import com.gh.common.util.UserIconUtils;
 import com.gh.common.view.RadarLayout;
+import com.gh.gamecenter.R;
 import com.gh.gamecenter.kuaichuan.BaseTransfer;
 import com.gh.gamecenter.kuaichuan.Constant;
 import com.gh.gamecenter.kuaichuan.FileInfo;
@@ -43,6 +43,7 @@ import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
 import butterknife.BindView;
 
 /**