Compare commits
1 Commits
v3.6.3
...
v3.6.3-log
| Author | SHA1 | Date | |
|---|---|---|---|
| 5ce057d40e |
@ -55,7 +55,7 @@
|
||||
<application
|
||||
android:name = "com.halo.assistant.TinkerApp"
|
||||
android:allowBackup = "true"
|
||||
android:icon = "@drawable/logo"
|
||||
android:icon = "@mipmap/logo"
|
||||
android:label = "@string/app_name"
|
||||
android:resizeableActivity = "true"
|
||||
android:theme = "@style/AppCompatTheme.APP"
|
||||
|
||||
@ -29,7 +29,7 @@ public class DownloadNotification {
|
||||
|
||||
public static final String ACTION_INSTALL = "com.gh.gamecenter.INSTALL";
|
||||
public static final String ACTION_DOWNLOAD = "com.gh.gamecenter.DOWNLOAD";
|
||||
public static final int ICON = R.drawable.logo;
|
||||
public static final int ICON = R.mipmap.logo;
|
||||
public static final int NOTIFY_ID = 0x123;
|
||||
public static final int WAIT_NOTIFY_ID = 0x124;
|
||||
private static final String CHANNEL_ID = "Halo_Download";
|
||||
@ -69,7 +69,7 @@ public class DownloadNotification {
|
||||
}
|
||||
|
||||
final Notification notification = new NotificationCompat.Builder(context, CHANNEL_ID)
|
||||
.setSmallIcon(R.drawable.logo)
|
||||
.setSmallIcon(R.mipmap.logo)
|
||||
.setTicker(title)
|
||||
.setContentTitle(text)
|
||||
.setContentText(title)
|
||||
|
||||
@ -437,7 +437,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
|
||||
byte[] receiveData = new byte[1024];
|
||||
byte[] sendData;
|
||||
Utils.log("=====ip::" + ipAddress);
|
||||
if (!"192.168.43.1".equals(ipAddress)) {
|
||||
if (!"logo.168.43.1".equals(ipAddress)) {
|
||||
// 连接失败,可能是连接的热点已经关闭, 关闭动画,开启扫描
|
||||
isStopScan = false;
|
||||
handler.sendEmptyMessage(0);
|
||||
|
||||
@ -147,7 +147,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
|
||||
// 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;
|
||||
|
||||
@ -296,7 +296,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
|
||||
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());
|
||||
}
|
||||
|
||||
@ -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地址
|
||||
|
||||
@ -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());
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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;
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
@ -20,7 +20,7 @@
|
||||
android:layout_height = "62dp"
|
||||
android:layout_alignParentBottom = "true"
|
||||
android:layout_centerHorizontal = "true"
|
||||
android:src = "@drawable/logo" />
|
||||
android:src = "@mipmap/logo" />
|
||||
</RelativeLayout >
|
||||
|
||||
<TextView
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
android:id="@+id/about_gh_icon"
|
||||
android:layout_width = "78dp"
|
||||
android:layout_height = "78dp"
|
||||
android:src = "@drawable/logo" />
|
||||
android:src = "@mipmap/logo" />
|
||||
|
||||
<TextView
|
||||
android:layout_width = "wrap_content"
|
||||
|
||||
BIN
app/src/main/res/mipmap-hdpi/logo.png
Normal file
BIN
app/src/main/res/mipmap-hdpi/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
BIN
app/src/main/res/mipmap-xhdpi/logo.png
Normal file
BIN
app/src/main/res/mipmap-xhdpi/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/logo.png
Normal file
BIN
app/src/main/res/mipmap-xxhdpi/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/logo.png
Normal file
BIN
app/src/main/res/mipmap-xxxhdpi/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 36 KiB |
Reference in New Issue
Block a user