diff --git a/app/src/main/java/com/gh/base/AppUncaHandler.java b/app/src/main/java/com/gh/base/AppUncaHandler.java index b33807d668..1a29885ebb 100644 --- a/app/src/main/java/com/gh/base/AppUncaHandler.java +++ b/app/src/main/java/com/gh/base/AppUncaHandler.java @@ -9,7 +9,6 @@ import android.util.Log; import android.widget.Toast; import com.gh.common.util.FileUtils; -import com.gh.common.util.Utils; import com.gh.gamecenter.SplashScreenActivity; import com.gh.gamecenter.manager.DataCollectionManager; import com.tencent.stat.StatService; diff --git a/app/src/main/java/com/gh/common/util/ConcernUtils.java b/app/src/main/java/com/gh/common/util/ConcernUtils.java index ec6c070c67..17ebe0fd29 100644 --- a/app/src/main/java/com/gh/common/util/ConcernUtils.java +++ b/app/src/main/java/com/gh/common/util/ConcernUtils.java @@ -8,7 +8,6 @@ import com.android.volley.Response; import com.android.volley.VolleyError; import com.gh.base.AppController; import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; -import com.gh.gamecenter.volley.extended.JsonExtendedRequest; import com.gh.gamecenter.volley.extended.StringExtendedRequest; import org.json.JSONArray; diff --git a/app/src/main/java/com/gh/common/util/NewsUtils.java b/app/src/main/java/com/gh/common/util/NewsUtils.java index 89f21764a1..2fc1301273 100644 --- a/app/src/main/java/com/gh/common/util/NewsUtils.java +++ b/app/src/main/java/com/gh/common/util/NewsUtils.java @@ -4,16 +4,12 @@ import android.content.Context; import android.content.Intent; import com.android.volley.Request; -import com.android.volley.Response; -import com.android.volley.VolleyError; import com.gh.base.AppController; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; -import org.json.JSONObject; - public class NewsUtils { /** diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 48c2fcd9e8..c0bb060ce8 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -8,7 +8,6 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; -import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.Handler; @@ -30,7 +29,6 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; -import com.android.volley.AuthFailureError; import com.android.volley.Request.Method; import com.android.volley.Response; import com.android.volley.VolleyError; diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.java b/app/src/main/java/com/gh/gamecenter/SearchActivity.java index 0bd9216d63..69b7087dbc 100644 --- a/app/src/main/java/com/gh/gamecenter/SearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.java @@ -58,7 +58,7 @@ public class SearchActivity extends BaseFragmentActivity { private int currentTab; - private boolean isHistorySearch; + private boolean isSearchDetail; private Handler handler = new Handler(){ @Override @@ -107,6 +107,7 @@ public class SearchActivity extends BaseFragmentActivity { if (TextUtils.isEmpty(searchKey)) { currentTab = 0; } else { + isSearchDetail = true; searchInput.setText(searchKey); searchInput.setSelection(searchInput.getText().length()); } @@ -134,8 +135,7 @@ public class SearchActivity extends BaseFragmentActivity { searchInput = (EditText) findViewById(R.id.etSearch); searchInput.setOnEditorActionListener(new OnEditorActionListener() { @Override - public boolean onEditorAction(TextView v, int actionId, - KeyEvent event) { + public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { if (actionId == EditorInfo.IME_ACTION_SEARCH) { InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow(v.getWindowToken(), 0); @@ -143,6 +143,7 @@ public class SearchActivity extends BaseFragmentActivity { if (newSearchKey.length() < 1) { if (!TextUtils.isEmpty(hint)) { newSearchKey = searchInput.getHint().toString(); + isSearchDetail = true; searchInput.setText(hint); searchInput.setSelection(searchInput.getText().length()); } @@ -165,6 +166,7 @@ public class SearchActivity extends BaseFragmentActivity { searchBack = (RelativeLayout) findViewById(R.id.btnGoBack); if (isFromHome && !TextUtils.isEmpty(hint)) { + isSearchDetail = true; searchInput.setText(hint); searchInput.setSelection(searchInput.getText().length()); } else if (!TextUtils.isEmpty(hint)) { @@ -182,6 +184,7 @@ public class SearchActivity extends BaseFragmentActivity { if (newSearchKey.length() < 1) { if (!TextUtils.isEmpty(hint)) { newSearchKey = searchInput.getHint().toString(); + isSearchDetail = true; searchInput.setText(hint); searchInput.setSelection(searchInput.getText().length()); } @@ -191,7 +194,7 @@ public class SearchActivity extends BaseFragmentActivity { if (!TextUtils.isEmpty(searchKey)) { setResultPresentModel(2); dao.add(searchKey); - isHistorySearch = false; + isSearchDetail = false; } else { toast("请输入搜索内容"); } @@ -231,7 +234,7 @@ public class SearchActivity extends BaseFragmentActivity { searchKey = newSearchKey; if (searchKey.length() < 1) { setResultPresentModel(0); - } else if (!isHistorySearch){ + } else if (!isSearchDetail){ handler.sendEmptyMessageDelayed(1, 300); } } @@ -339,7 +342,7 @@ public class SearchActivity extends BaseFragmentActivity { } public void onEvent(EBSearch search) { - isHistorySearch = true; + isSearchDetail = true; String str = search.getKey(); searchInput.setText(str); searchInput.setFocusable(true); @@ -350,6 +353,17 @@ public class SearchActivity extends BaseFragmentActivity { } } + @Override + public void finish() { + super.finish(); + DataUtils.onEvent(this, "搜索页面", searchKey); + + Map map = new HashMap<>(); + map.put("key", searchKey); + map.put("from", "搜索页面"); + DataCollectionManager.onEvent(this, "search", map); + } + @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java b/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java index b191597e53..9b2157a19f 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java @@ -5,7 +5,6 @@ import android.content.SharedPreferences; import com.android.volley.Request; import com.android.volley.Response; -import com.android.volley.VolleyError; import com.gh.base.AppController; import com.gh.common.constant.Config; import com.gh.common.util.Utils; diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java index 7ec06a355b..54a936cc48 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java @@ -52,6 +52,8 @@ public class SearchGameDetailFragmentAdapter extends RecyclerView.Adapter gameList; + private String key; + public SearchGameDetailFragmentAdapter(Context context, RecyclerView search_detail, LinearLayout search_loading, @@ -67,6 +69,7 @@ public class SearchGameDetailFragmentAdapter extends RecyclerView.Adapter(); + this.key = key; if (!TextUtils.isEmpty(key)) { search_loading.setVisibility(View.VISIBLE); search_detail.setVisibility(View.GONE); @@ -156,16 +159,24 @@ public class SearchGameDetailFragmentAdapter extends RecyclerView.Adapter map = new HashMap<>(); + map.put("key", key); + map.put("from", "搜索页面"); + map.put("click", gameEntity.getName()); + DataCollectionManager.onEvent(context, "search", map); + Map kv = new HashMap<>(); kv.put("入口", "搜索"); DataUtils.onEvent(context, "游戏详情", gameEntity.getName(), kv); - Map map = new HashMap<>(); - map.put("location", "搜索"); - map.put("game", gameEntity.getName()); - map.put("game_id", gameEntity.getId()); - map.put("page", "搜索"); - DataCollectionManager.onEvent(context, "click-item", map); + Map map2 = new HashMap<>(); + map2.put("location", "搜索"); + map2.put("game", gameEntity.getName()); + map2.put("game_id", gameEntity.getId()); + map2.put("page", "搜索"); + DataCollectionManager.onEvent(context, "click-item", map2); AppController.put("GameEntity", gameEntity); Intent intent = new Intent(context, GameDetailActivity.class); @@ -184,6 +195,15 @@ public class SearchGameDetailFragmentAdapter extends RecyclerView.Adapter map = new HashMap<>(); + map.put("key", key); + map.put("from", "搜索页面"); + map.put("click", gameEntity.getName()); + DataCollectionManager.onEvent(context, "search", map); + DownloadDialog.getInstance(context) .showPopupWindow(v, gameEntity, "搜索", "搜索:" + gameEntity.getName()); } diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java index 33d2699c3a..8ac08397f1 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java @@ -150,6 +150,7 @@ public class SearchGameListFragmentAdapter extends RecyclerView.Adapter map = new HashMap<>(); map.put("key", key); map.put("from", "搜索页面"); + map.put("click", gameEntity.getName()); DataCollectionManager.onEvent(context, "search", map); Map kv = new HashMap<>(); @@ -180,6 +181,15 @@ public class SearchGameListFragmentAdapter extends RecyclerView.Adapter map = new HashMap<>(); + map.put("key", key); + map.put("from", "搜索页面"); + map.put("click", gameEntity.getName()); + DataCollectionManager.onEvent(context, "search", map); + DownloadDialog.getInstance(context) .showPopupWindow(v, gameEntity, "搜索", "搜索:" + gameEntity.getName()); } @@ -211,6 +221,7 @@ public class SearchGameListFragmentAdapter extends RecyclerView.Adapter map = new HashMap<>(); map.put("key", key); map.put("from", "搜索页面"); + map.put("click", gameEntity.getName()); DataCollectionManager.onEvent(context, "search", map); Map map2 = new HashMap<>(); diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java index 27dcffb4d5..2f987b6590 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java @@ -8,7 +8,6 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; -import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.view.CardLinearLayout; @@ -16,12 +15,9 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.ReuseViewHolder; import com.gh.gamecenter.db.SearchHistoryDao; import com.gh.gamecenter.eventbus.EBSearch; -import com.gh.gamecenter.manager.DataCollectionManager; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import de.greenrobot.event.EventBus; @@ -104,16 +100,8 @@ public class SearchHistoryFragmentAdapter extends RecyclerView.Adapter map = new HashMap<>(); - map.put("key", str); - map.put("from", "搜索页面"); - DataCollectionManager.onEvent(context, "search", map); - - EventBus.getDefault().post(new EBSearch(str, true)); + String key = viewHolder.search_history_name.getText().toString(); + EventBus.getDefault().post(new EBSearch(key, true)); dao.add(viewHolder.search_history_name.getText().toString()); } });