diff --git a/app/build.gradle b/app/build.gradle
index 5c9ba2cfae..98df87b0e0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -243,7 +243,7 @@ dependencies {
implementation "pub.devrel:easypermissions:${easypermissions}"
- implementation 'com.google.android:flexbox:1.0.0'
+ implementation 'com.google.android:flexbox:1.1.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 934caccace..ca0c1e717c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -386,7 +386,11 @@
android:screenOrientation = "portrait" />
+
+
() {
MtaHelper.onEvent("发现", "免流量传送")
DataCollectionUtils.uploadClick(activity, "免流量传送", "发现")
- startActivity(DownloadManagerActivity.getDownloadMangerIntent(context,
- DownloadManagerActivity.INDEX_SEND,
- "(发现:免流量传送)"))
+ startActivity(FileShareActivity.getIntent(context, "(发现:免流量传送)"))
}
R.id.discover_apk_cleaner -> {
MtaHelper.onEvent("发现", "安装包清理")
diff --git a/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt b/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt
index 176a709391..4f1e77641a 100644
--- a/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt
@@ -1,10 +1,10 @@
package com.gh.gamecenter.download
import android.os.Bundle
-import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.widget.TextView
+import androidx.fragment.app.Fragment
import com.gh.base.fragment.BaseFragment_TabLayout
import com.gh.common.util.DataUtils
import com.gh.download.DownloadManager
@@ -24,32 +24,24 @@ import org.greenrobot.eventbus.ThreadMode
class DownloadFragment : BaseFragment_TabLayout() {
companion object {
- val INDEX_DOWNLOAD = 0
- @JvmField
- val INDEX_UPDATE = 1
- val INDEX_KC = 2
+ const val INDEX_DOWNLOAD = 0
+ const val INDEX_UPDATE = 1
}
lateinit var mDownloadNumber: TextView
lateinit var mUpdateNumber: TextView
- override fun initFragmentList(fragments: MutableList) {
+ override fun initFragmentList(fragments: MutableList) {
fragments.add(GameDownloadFragment())
fragments.add(GameUpdateFragment())
- fragments.add(FileSendFragment())
}
override fun initTabTitleList(tabTitleList: MutableList) {
tabTitleList.add(getString(R.string.download_game))
tabTitleList.add(getString(R.string.download_tab_update))
- tabTitleList.add(getString(R.string.download_send_traffic_free))
}
override fun provideTabView(position: Int, tabTitle: String): View? {
- if (position == INDEX_KC) {
- return super.provideTabView(position, tabTitle)
- }
-
val view = LayoutInflater.from(context).inflate(R.layout.tab_item_download_number, null)
(view.findViewById(R.id.tab_download_title) as TextView).text = tabTitle
if (INDEX_DOWNLOAD == position) {
@@ -76,7 +68,7 @@ class DownloadFragment : BaseFragment_TabLayout() {
mUpdateNumber.visibility = View.VISIBLE
mUpdateNumber.text = updateSize.toString()
} else {
- mUpdateNumber.visibility = View.GONE
+ mUpdateNumber.visibility = View.INVISIBLE
}
val downloadSize = DownloadManager.getInstance(context).all.size
@@ -84,7 +76,7 @@ class DownloadFragment : BaseFragment_TabLayout() {
mDownloadNumber.visibility = View.VISIBLE
mDownloadNumber.text = downloadSize.toString()
} else {
- mDownloadNumber.visibility = View.GONE
+ mDownloadNumber.visibility = View.INVISIBLE
}
}
@@ -112,9 +104,7 @@ class DownloadFragment : BaseFragment_TabLayout() {
if ("download" == changed.type) {
if (changed.visibility == View.VISIBLE) {
mDownloadNumber.visibility = View.VISIBLE
- } else if (changed.visibility == View.GONE) {
- mDownloadNumber.visibility = View.GONE
- } else if (changed.visibility == View.INVISIBLE) {
+ } else {
mDownloadNumber.visibility = View.INVISIBLE
}
mDownloadNumber.text = changed.size.toString()
@@ -122,7 +112,7 @@ class DownloadFragment : BaseFragment_TabLayout() {
if (changed.size == -1) {
val number = Integer.valueOf(mUpdateNumber.text.toString())
if (number == 1) {
- mUpdateNumber.visibility = View.GONE
+ mUpdateNumber.visibility = View.INVISIBLE
} else {
mUpdateNumber.text = (number - 1).toString()
}
@@ -130,14 +120,12 @@ class DownloadFragment : BaseFragment_TabLayout() {
if (changed.size != 0) {
if (changed.visibility == View.VISIBLE) {
mUpdateNumber.visibility = View.VISIBLE
- } else if (changed.visibility == View.GONE) {
- mUpdateNumber.visibility = View.GONE
- } else if (changed.visibility == View.INVISIBLE) {
+ } else {
mUpdateNumber.visibility = View.INVISIBLE
}
mUpdateNumber.text = changed.size.toString()
} else {
- mUpdateNumber.visibility = View.GONE
+ mUpdateNumber.visibility = View.INVISIBLE
}
}
}
diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt
index 003095823a..be49c9cec7 100644
--- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt
@@ -203,7 +203,7 @@ class GameFragmentAdapter(context: Context, model: GameViewModel, var blockName:
val linkEntity = LinkEntity()
linkEntity.link = link
linkEntity.type = entity?.type
- linkEntity.text = name
+// linkEntity.text = name
DirectUtils.directToLinkPage(mContext, linkEntity, "(游戏-专题:$name-大图)", "首页游戏")
}
}
diff --git a/app/src/main/java/com/gh/gamecenter/kuaichuan/view/FileShareActivity.java b/app/src/main/java/com/gh/gamecenter/kuaichuan/view/FileShareActivity.java
new file mode 100644
index 0000000000..31ea3d3718
--- /dev/null
+++ b/app/src/main/java/com/gh/gamecenter/kuaichuan/view/FileShareActivity.java
@@ -0,0 +1,19 @@
+package com.gh.gamecenter.kuaichuan.view;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.gh.common.util.EntranceUtils;
+import com.gh.gamecenter.NormalActivity;
+
+import androidx.annotation.NonNull;
+
+public class FileShareActivity extends NormalActivity {
+ @NonNull
+ public static Intent getIntent(Context context, String entrance) {
+ Bundle args = new Bundle();
+ args.putString(EntranceUtils.KEY_ENTRANCE, entrance);
+ return getTargetIntent(context, FileShareActivity.class, FileShareFragment.class, args);
+ }
+}
diff --git a/app/src/main/java/com/gh/gamecenter/download/FileSendFragment.java b/app/src/main/java/com/gh/gamecenter/kuaichuan/view/FileShareFragment.java
similarity index 86%
rename from app/src/main/java/com/gh/gamecenter/download/FileSendFragment.java
rename to app/src/main/java/com/gh/gamecenter/kuaichuan/view/FileShareFragment.java
index 552a7512eb..d00b86eed6 100644
--- a/app/src/main/java/com/gh/gamecenter/download/FileSendFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/kuaichuan/view/FileShareFragment.java
@@ -1,13 +1,13 @@
-package com.gh.gamecenter.download;
+package com.gh.gamecenter.kuaichuan.view;
import android.Manifest;
import android.content.Intent;
+import android.os.Bundle;
import android.os.Handler;
import android.text.Html;
import android.view.View;
import android.widget.TextView;
-import com.gh.base.fragment.BaseFragment;
import com.gh.common.util.DialogUtils;
import com.gh.common.util.MtaHelper;
import com.gh.gamecenter.CleanApkActivity;
@@ -15,11 +15,14 @@ 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;
+
+import androidx.annotation.Nullable;
/**
* Created by khy on 2017/1/20.
*/
-public class FileSendFragment extends BaseFragment {
+public class FileShareFragment extends NormalFragment {
private String[] permissions = {Manifest.permission.ACCESS_WIFI_STATE};
@@ -27,13 +30,18 @@ public class FileSendFragment extends BaseFragment {
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
-
// 分享成绩单
if (requestCode == KC_REQUEST) {
DialogUtils.showKuaiChuanResult(getActivity(), new Handler(), requestCode, "shareKc.jpg");
}
}
+ @Override
+ public void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setNavigationTitle(R.string.download_send_traffic_free);
+ }
+
@Override
protected int getLayoutId() {
return R.layout.fragment_file_send;
diff --git a/app/src/main/res/drawable/actionbar_search_bg.xml b/app/src/main/res/drawable/actionbar_search_bg.xml
index 326eb523bd..22f407e085 100644
--- a/app/src/main/res/drawable/actionbar_search_bg.xml
+++ b/app/src/main/res/drawable/actionbar_search_bg.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/app/src/main/res/layout/game_viewpager_item.xml b/app/src/main/res/layout/game_viewpager_item.xml
index d908767568..bfb0ea25ae 100644
--- a/app/src/main/res/layout/game_viewpager_item.xml
+++ b/app/src/main/res/layout/game_viewpager_item.xml
@@ -119,6 +119,7 @@
android:layout_width = "wrap_content"
android:layout_height = "wrap_content"
android:layout_marginTop = "5dp"
+ android:maxLines = "1"
android:text = "@{list.size > 0?(Config.isShowPlugin()? list.get(0).name:list.get(0).nameNormal):`推荐入口`}"
android:textColor = "@color/text_3a3a3a"
android:textSize = "12sp" />
@@ -142,6 +143,7 @@
android:layout_width = "wrap_content"
android:layout_height = "wrap_content"
android:layout_marginTop = "5dp"
+ android:maxLines = "1"
android:text = "@{list.size > 1?(Config.isShowPlugin()? list.get(1).name:list.get(1).nameNormal):`推荐入口`}"
android:textColor = "@color/text_3a3a3a"
android:textSize = "12sp" />
@@ -165,6 +167,7 @@
android:layout_width = "wrap_content"
android:layout_height = "wrap_content"
android:layout_marginTop = "5dp"
+ android:maxLines = "1"
android:text = "@{list.size > 2?(Config.isShowPlugin()? list.get(2).name:list.get(2).nameNormal):`推荐入口`}"
android:textColor = "@color/text_3a3a3a"
android:textSize = "12sp" />
@@ -188,6 +191,7 @@
android:layout_width = "wrap_content"
android:layout_height = "wrap_content"
android:layout_marginTop = "5dp"
+ android:maxLines = "1"
android:text = "@{list.size > 3?(Config.isShowPlugin()? list.get(3).name:list.get(3).nameNormal):`推荐入口`}"
android:textColor = "@color/text_3a3a3a"
android:textSize = "12sp" />
@@ -212,6 +216,7 @@
android:layout_width = "wrap_content"
android:layout_height = "wrap_content"
android:layout_marginTop = "5dp"
+ android:maxLines = "1"
android:textColor = "@color/text_3a3a3a"
android:textSize = "12sp" />
diff --git a/app/src/main/res/layout/tab_item_download_number.xml b/app/src/main/res/layout/tab_item_download_number.xml
index 676bafb4bf..3954ec82bf 100644
--- a/app/src/main/res/layout/tab_item_download_number.xml
+++ b/app/src/main/res/layout/tab_item_download_number.xml
@@ -5,9 +5,10 @@
android:gravity = "center" >