Commit 90865214 authored by fallenstardust's avatar fallenstardust

3.7.9 LOG-O

parents d04482b6 580a86be
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
特别感谢: 菜菜,尸体,废话多,大毛,龙道香姐,晓L,幻兽L 的支持与努力. 特别感谢: 菜菜,尸体,废话多,大毛,龙道香姐,晓L,幻兽L 的支持与努力.
</pre> </pre>
<ul> <ul>
<li style="color:#ffff00">3.7.10</li> <li style="color:#ffff00">3.7.9</li>
</ul> </ul>
<pre> <pre>
更新: 更新:
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
2.新卡1103+T1102+VJ; 2.新卡1103+T1102+VJ;
变更: 变更:
1.加深提示文字底色以便在浅色背景下更容易被看清; 1.加深提示文字底色以便在浅色背景下更容易被看清;
2.查看大图支持二指缩放;
</pre> </pre>
<h3 style="color:#ff0000">注意</h3> <h3 style="color:#ff0000">注意</h3>
<pre> <pre>
......
...@@ -8,8 +8,8 @@ android { ...@@ -8,8 +8,8 @@ android {
applicationId "cn.garymb.ygomobile" applicationId "cn.garymb.ygomobile"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode 370701018 versionCode 370901119
versionName "3.7.8" versionName "3.7.9"
flavorDimensions "versionCode" flavorDimensions "versionCode"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
ndk { ndk {
......
...@@ -11,6 +11,8 @@ import android.view.Gravity; ...@@ -11,6 +11,8 @@ import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.view.animation.AnimationUtils; import android.view.animation.AnimationUtils;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
...@@ -295,12 +297,14 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder { ...@@ -295,12 +297,14 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
} else { } else {
cardcode.setText(String.format("%08d", cardInfo.Alias)); cardcode.setText(String.format("%08d", cardInfo.Alias));
} }
//按是否存在于收藏夹切换显示图标 //按是否存在于收藏夹切换显示图标
if (ConfigManager.mLines.contains(cardInfo.Code)) { if (ConfigManager.mLines.contains(cardInfo.Code)) {
mImageFav.setBackgroundResource(R.drawable.ic_fav); mImageFav.setBackgroundResource(R.drawable.ic_fav);
} else { } else {
mImageFav.setBackgroundResource(R.drawable.ic_control_point); mImageFav.setBackgroundResource(R.drawable.ic_control_point);
} }
type.setText(CardUtils.getAllTypeString(cardInfo, mStringManager).replace("/", "|")); type.setText(CardUtils.getAllTypeString(cardInfo, mStringManager).replace("/", "|"));
attrView.setText(mStringManager.getAttributeString(cardInfo.Attribute)); attrView.setText(mStringManager.getAttributeString(cardInfo.Attribute));
otView.setText(mStringManager.getOtString(cardInfo.Ot, "" + cardInfo.Ot)); otView.setText(mStringManager.getOtString(cardInfo.Ot, "" + cardInfo.Ot));
...@@ -324,6 +328,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder { ...@@ -324,6 +328,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
setname.setVisibility(View.VISIBLE); setname.setVisibility(View.VISIBLE);
lb_setcode.setVisibility(View.VISIBLE); lb_setcode.setVisibility(View.VISIBLE);
} }
if (cardInfo.isType(CardType.Monster)) { if (cardInfo.isType(CardType.Monster)) {
atkdefView.setVisibility(View.VISIBLE); atkdefView.setVisibility(View.VISIBLE);
monsterlayout.setVisibility(View.VISIBLE); monsterlayout.setVisibility(View.VISIBLE);
...@@ -370,7 +375,14 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder { ...@@ -370,7 +375,14 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
AppsSettings appsSettings = AppsSettings.get(); AppsSettings appsSettings = AppsSettings.get();
File file = new File(appsSettings.getCardImagePath(code)); File file = new File(appsSettings.getCardImagePath(code));
View view = dialog.initDialog(context, R.layout.dialog_photo); View view = dialog.initDialog(context, R.layout.dialog_photo);
dialog.setDialogWidth(ViewGroup.LayoutParams.MATCH_PARENT); dialog.setDialogWidth(ViewGroup.LayoutParams.MATCH_PARENT);
Window dialogWindow = dialog.getDialog().getWindow();
WindowManager.LayoutParams lp = dialogWindow.getAttributes();
lp.width = WindowManager.LayoutParams.MATCH_PARENT;
lp.height = WindowManager.LayoutParams.MATCH_PARENT;
dialogWindow.setAttributes(lp);
photoView = view.findViewById(R.id.photoView); photoView = view.findViewById(R.id.photoView);
ll_bar = view.findViewById(R.id.ll_bar); ll_bar = view.findViewById(R.id.ll_bar);
pb_loading = view.findViewById(R.id.pb_loading); pb_loading = view.findViewById(R.id.pb_loading);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment