diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a4f42ec09a..97d7e9f564 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,7 +55,7 @@ { // viewHolder.dmIcon.setImageURI(icon); ImageUtils.display(viewHolder.dmIcon, icon); } else { - ImageUtils.display(viewHolder.dmIcon, R.drawable.logo); + ImageUtils.display(viewHolder.dmIcon, R.mipmap.logo); } String downloadTitle; diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java index ff616d72c7..a0820741ec 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -296,7 +296,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { final GameUpdateEntity updateEntity = updateList.get(position - 1); if (updateEntity.getName().contains("光环助手")) { - ImageUtils.display(viewHolder.guIcon, R.drawable.logo); + ImageUtils.display(viewHolder.guIcon, R.mipmap.logo); } else { ImageUtils.display(viewHolder.guIcon, updateEntity.getIcon()); } diff --git a/app/src/main/java/com/gh/gamecenter/kuaichuan/Constant.java b/app/src/main/java/com/gh/gamecenter/kuaichuan/Constant.java index 630799c6a7..3430885be6 100644 --- a/app/src/main/java/com/gh/gamecenter/kuaichuan/Constant.java +++ b/app/src/main/java/com/gh/gamecenter/kuaichuan/Constant.java @@ -17,7 +17,7 @@ public class Constant { /** * ServerSocket 默认IP */ - public static final String DEFAULT_SERVER_IP = "192.168.43.1"; + public static final String DEFAULT_SERVER_IP = "logo.168.43.1"; /** * Wifi连接上时 未分配默认的Ip地址 diff --git a/app/src/main/java/com/gh/gamecenter/kuaichuan/ImageUriHandler.java b/app/src/main/java/com/gh/gamecenter/kuaichuan/ImageUriHandler.java index 0b38aef161..5c3ad73195 100644 --- a/app/src/main/java/com/gh/gamecenter/kuaichuan/ImageUriHandler.java +++ b/app/src/main/java/com/gh/gamecenter/kuaichuan/ImageUriHandler.java @@ -48,7 +48,7 @@ public class ImageUriHandler implements KcUriHandler { e.printStackTrace(); } - Bitmap bitmap = BitmapFactory.decodeResource(mActivity.getResources(), R.drawable.logo); + Bitmap bitmap = BitmapFactory.decodeResource(mActivity.getResources(), R.mipmap.logo); ByteArrayOutputStream baos = new ByteArrayOutputStream(); bitmap.compress(Bitmap.CompressFormat.PNG, 100, baos); InputStream inputimage = new ByteArrayInputStream(baos.toByteArray()); diff --git a/app/src/main/java/com/gh/gamecenter/kuaichuan/KuaichuanNotification.java b/app/src/main/java/com/gh/gamecenter/kuaichuan/KuaichuanNotification.java index 9ca233cd5b..e444a6cb73 100644 --- a/app/src/main/java/com/gh/gamecenter/kuaichuan/KuaichuanNotification.java +++ b/app/src/main/java/com/gh/gamecenter/kuaichuan/KuaichuanNotification.java @@ -30,7 +30,7 @@ public class KuaichuanNotification { String text = apkName; Notification notification = new NotificationCompat.Builder(context) - .setSmallIcon(R.drawable.logo) + .setSmallIcon(R.mipmap.logo) .setTicker(title) .setContentTitle(text) .setContentText(title) diff --git a/app/src/main/java/com/gh/gamecenter/kuaichuan/WifiMgr.java b/app/src/main/java/com/gh/gamecenter/kuaichuan/WifiMgr.java index 0afbaba1d0..42de8efb73 100644 --- a/app/src/main/java/com/gh/gamecenter/kuaichuan/WifiMgr.java +++ b/app/src/main/java/com/gh/gamecenter/kuaichuan/WifiMgr.java @@ -206,7 +206,7 @@ public class WifiMgr { */ public String getIpAddressFromHotspot() { // WifiAP ip address is hardcoded in Android. - /* IP/netmask: 192.168.43.1/255.255.255.0 */ + /* IP/netmask: logo.168.43.1/255.255.255.0 */ String ipAddress; DhcpInfo dhcpInfo = mWifiManager.getDhcpInfo(); int address = dhcpInfo.gateway; diff --git a/app/src/main/res/drawable-xhdpi/logo.png b/app/src/main/res/drawable-xhdpi/logo.png deleted file mode 100644 index 6f6c2f6de4..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/logo.png and /dev/null differ diff --git a/app/src/main/res/layout/app_update_hint_dialog.xml b/app/src/main/res/layout/app_update_hint_dialog.xml index 28068f8f0c..d05885d6c0 100644 --- a/app/src/main/res/layout/app_update_hint_dialog.xml +++ b/app/src/main/res/layout/app_update_hint_dialog.xml @@ -20,7 +20,7 @@ android:layout_height = "62dp" android:layout_alignParentBottom = "true" android:layout_centerHorizontal = "true" - android:src = "@drawable/logo" /> + android:src = "@mipmap/logo" /> + android:src = "@mipmap/logo" />