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 f4c51eb4a5..386bacb999 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -4,6 +4,7 @@ import android.app.Activity; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; +import android.content.Intent; import android.content.SharedPreferences; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; @@ -34,6 +35,13 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.core.content.ContextCompat; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; + import com.facebook.drawee.generic.GenericDraweeHierarchy; import com.facebook.drawee.view.SimpleDraweeView; import com.gh.common.AppExecutor; @@ -73,13 +81,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; -import androidx.constraintlayout.widget.ConstraintLayout; -import androidx.core.content.ContextCompat; -import androidx.databinding.DataBindingUtil; -import androidx.recyclerview.widget.RecyclerView; - public class DialogUtils { public static Dialog showWaitDialog(Context context, String msg) { diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 126e353e66..159afbed88 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -18,6 +18,9 @@ import android.text.TextUtils; import android.util.Log; import android.view.KeyEvent; +import androidx.annotation.NonNull; +import androidx.lifecycle.ViewModelProviders; + import com.gh.base.AppUncaughtHandler; import com.gh.base.BaseActivity; import com.gh.base.fragment.BaseFragment_ViewPager; @@ -81,6 +84,7 @@ import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.suggest.SuggestSelectFragment; import com.gh.gamecenter.suggest.SuggestType; import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import com.halo.assistant.HaloApp; import com.halo.assistant.fragment.SettingsFragment; import com.lightgame.download.DownloadEntity; @@ -109,8 +113,6 @@ import java.util.TimerTask; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import androidx.annotation.NonNull; -import androidx.lifecycle.ViewModelProviders; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; import okhttp3.MediaType; diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt index b7b0dadbf6..c9f50a1f7a 100644 --- a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt @@ -10,10 +10,7 @@ import android.view.inputmethod.EditorInfo import androidx.core.widget.doAfterTextChanged import androidx.core.widget.doOnTextChanged import com.gh.base.BaseActivity -import com.gh.common.util.DataCollectionUtils -import com.gh.common.util.EntranceUtils -import com.gh.common.util.TextHelper -import com.gh.common.util.goneIf +import com.gh.common.util.* import com.gh.gamecenter.DisplayType.* import com.gh.gamecenter.db.SearchHistoryDao import com.gh.gamecenter.eventbus.EBSearch diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 2255d84002..9e731edf75 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -27,9 +27,6 @@ #d1e5f7 - @android:color/transparent - @color/white - @color/theme #06D0A8 diff --git a/dependencies.gradle b/dependencies.gradle index 879727a341..c0262a31e4 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -6,8 +6,8 @@ ext { targetSdkVersion = 26 - // application info - versionCode = 220 + // application info (每个大版本之间的 versionCode 增加 20) + versionCode = 230 versionName = "4.4.0" applicationId = "com.gh.gamecenter"