diff --git a/app/src/main/java/com/gh/common/util/DeviceUtils.java b/app/src/main/java/com/gh/common/util/DeviceUtils.java index bee4cc7a0b..b01b0176cf 100644 --- a/app/src/main/java/com/gh/common/util/DeviceUtils.java +++ b/app/src/main/java/com/gh/common/util/DeviceUtils.java @@ -3,7 +3,6 @@ package com.gh.common.util; import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.net.wifi.WifiManager; import android.os.Build; import android.provider.Settings; import android.telephony.TelephonyManager; @@ -15,6 +14,10 @@ import com.tencent.stat.StatConfig; import org.json.JSONException; import org.json.JSONObject; +import java.io.FileReader; +import java.io.InputStreamReader; +import java.io.LineNumberReader; +import java.io.Reader; import java.net.Inet4Address; import java.net.InetAddress; import java.net.NetworkInterface; @@ -34,7 +37,7 @@ public class DeviceUtils { JSONObject object = new JSONObject(); object.put("os", "Android"); object.put("imei", Util_System_Phone_State.getDeviceId(context)); - object.put("mac", ((WifiManager) context.getSystemService(Context.WIFI_SERVICE)).getConnectionInfo().getMacAddress()); + object.put("mac", getMac()); object.put("model", MODEL); object.put("manufacturer", MANUFACTURER); object.put("android_id", Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID)); @@ -51,7 +54,7 @@ public class DeviceUtils { try { object.put("IMEI", Util_System_Phone_State.getDeviceId(context)); object.put("ANDROID_ID", Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID)); - object.put("MAC", ((WifiManager) context.getSystemService(Context.WIFI_SERVICE)).getConnectionInfo().getMacAddress()); + object.put("MAC", getMac()); object.put("MTA_ID", StatConfig.getMid(context)); object.put("MANUFACTURER", MANUFACTURER); object.put("MODEL", MODEL); @@ -64,6 +67,57 @@ public class DeviceUtils { return object; } + private static String getMac() { + String str = ""; + String macSerial = ""; + try { + Process pp = Runtime.getRuntime().exec( + "cat /sys/class/net/wlan0/address "); + InputStreamReader ir = new InputStreamReader(pp.getInputStream()); + LineNumberReader input = new LineNumberReader(ir); + + for (; null != str;) { + str = input.readLine(); + if (str != null) { + macSerial = str.trim();// 去空格 + break; + } + } + } catch (Exception ex) { + ex.printStackTrace(); + } + if (macSerial == null || "".equals(macSerial)) { + try { + return loadFileAsString("/sys/class/net/eth0/address") + .toUpperCase().substring(0, 17); + } catch (Exception e) { + e.printStackTrace(); + + } + + } + return macSerial; + } + + private static String loadFileAsString(String fileName) throws Exception { + FileReader reader = new FileReader(fileName); + String text = loadReaderAsString(reader); + reader.close(); + return text; + } + + private static String loadReaderAsString(Reader reader) throws Exception { + StringBuilder builder = new StringBuilder(); + char[] buffer = new char[4096]; + int readLength = reader.read(buffer); + while (readLength >= 0) { + builder.append(buffer, 0, readLength); + readLength = reader.read(buffer); + } + return builder.toString(); + } + + private static String getIPAddress(Context context) { NetworkInfo info = ((ConnectivityManager) context .getSystemService(Context.CONNECTIVITY_SERVICE)).getActiveNetworkInfo(); diff --git a/app/src/main/java/com/gh/common/util/LibaoUtils.java b/app/src/main/java/com/gh/common/util/LibaoUtils.java index 5cd8179592..b9cacadb0b 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -529,7 +529,6 @@ public class LibaoUtils { @Override public void postFailed(Throwable error) { - Utils.log("-----" + error.toString()); if (error instanceof HttpException) { HttpException exception = (HttpException) error; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailKaiFuViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailKaiFuViewHolder.java index 3428e8d3c4..4e46cec71b 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailKaiFuViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailKaiFuViewHolder.java @@ -39,6 +39,8 @@ public class GameDetailKaiFuViewHolder extends BaseRecyclerViewHolder { public ScrollView detailSv; @BindView(R.id.gamedetail_kaifu_des) public TextView kaifuDes; + @BindView(R.id.gamedetail_calender_hint) + public RelativeLayout calenderHint; public GameDetailKaiFuViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java index 13252eb84b..c061a37515 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java @@ -1,8 +1,10 @@ package com.gh.gamecenter.gamedetail; import android.content.Context; +import android.content.SharedPreferences; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; +import android.preference.PreferenceManager; import android.support.v4.content.ContextCompat; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView.ViewHolder; @@ -63,6 +65,8 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter { private GameDetailKaiFuViewHolder viewHolder; + private SharedPreferences sp; + GameDetailKaiFuAdapter(Context context, List serverInfo, GameDetailKaiFuViewHolder viewHolder, String gameName) { super(context); @@ -70,6 +74,8 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter { this.viewHolder = viewHolder; this.gameName = gameName; + sp = PreferenceManager.getDefaultSharedPreferences(mContext); + isNextMonth = false; isExistCurServer = false; @@ -428,7 +434,7 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter { } long l = entity.getServer().get(0).getTime() * 1000; - SimpleDateFormat format = new SimpleDateFormat("M月d日", Locale.CHINA); + final SimpleDateFormat format = new SimpleDateFormat("M月d日", Locale.CHINA); SimpleDateFormat curformat = new SimpleDateFormat("yyyy年M月d日", Locale.CHINA); SimpleDateFormat formatTime = new SimpleDateFormat("HH:mm", Locale.CHINA); viewHolder.kaifuDetailRl.setVisibility(View.VISIBLE); @@ -452,6 +458,20 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter { viewHolder.detailList.addView(textView); } + + if (entity.getServer().size() > 3 && sp.getBoolean("showCalenderHint", true)) { + viewHolder.calenderHint.setVisibility(View.VISIBLE); + } + + viewHolder.calenderHint.setOnTouchListener(new View.OnTouchListener() { + @Override + public boolean onTouch(View view, MotionEvent motionEvent) { + viewHolder.calenderHint.setVisibility(View.GONE); + sp.edit().putBoolean("showCalenderHint", false).apply(); + return false; + } + }); + suggestTime = curformat.format(l); } diff --git a/app/src/main/res/drawable-hdpi/ic_share.png b/app/src/main/res/drawable-hdpi/ic_share.png deleted file mode 100644 index 010cfe984b..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_share.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/detail_collection_select.png b/app/src/main/res/drawable-xhdpi/detail_collection_select.png deleted file mode 100644 index b1c1c59957..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/detail_collection_select.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/detail_collection_unselect.png b/app/src/main/res/drawable-xhdpi/detail_collection_unselect.png deleted file mode 100644 index 9dcf7fcc0c..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/detail_collection_unselect.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_bar_back.png b/app/src/main/res/drawable-xhdpi/ic_bar_back.png deleted file mode 100644 index 0c1b878502..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_bar_back.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_concern.png b/app/src/main/res/drawable-xhdpi/ic_concern.png deleted file mode 100644 index 48300a59d8..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_concern.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/detail_collection_select.png b/app/src/main/res/drawable-xxhdpi/detail_collection_select.png new file mode 100644 index 0000000000..391086a4ec Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/detail_collection_select.png differ diff --git a/app/src/main/res/drawable-xxhdpi/detail_collection_unselect.png b/app/src/main/res/drawable-xxhdpi/detail_collection_unselect.png new file mode 100644 index 0000000000..1d856aa02d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/detail_collection_unselect.png differ diff --git a/app/src/main/res/drawable-xxhdpi/gamedetail_calendar_hint.png b/app/src/main/res/drawable-xxhdpi/gamedetail_calendar_hint.png new file mode 100644 index 0000000000..8845b817b1 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/gamedetail_calendar_hint.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_bar_back.png b/app/src/main/res/drawable-xxhdpi/ic_bar_back.png new file mode 100644 index 0000000000..fc2bb0af2c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_bar_back.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_concern.png b/app/src/main/res/drawable-xxhdpi/ic_concern.png new file mode 100644 index 0000000000..73c1614041 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_concern.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_share.png b/app/src/main/res/drawable-xxhdpi/ic_share.png new file mode 100644 index 0000000000..de457447b4 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_share.png differ diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index e949f52f0d..f685ef8886 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -9,6 +9,6 @@ android:id = "@+id/search_result" android:layout_width = "match_parent" android:layout_height = "0dp" - android:layout_weight = "1" > + android:layout_weight = "1" /> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_font_size.xml b/app/src/main/res/layout/dialog_font_size.xml index 4cb8b2341c..b3d6c8b731 100644 --- a/app/src/main/res/layout/dialog_font_size.xml +++ b/app/src/main/res/layout/dialog_font_size.xml @@ -25,7 +25,7 @@ + + + + + +