Skip to content

Y
YGOMobile-Cn-Ko-En
Commit a0b790cf authored by fallenstardust's avatar fallenstardust
Browse files
Options

arrange code

parent 2af4f155
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 231 deletions
mobile/build.gradle
View file @ a0b790cf
......@@ -8,8 +8,8 @@ android {
applicationId "cn.garymb.ygomobile"
minSdkVersion 21
targetSdkVersion 28
versionCode 360001219
versionName "3.6.0"
versionCode 360101230
versionName "3.6.1"
flavorDimensions "versionCode"
vectorDrawables.useSupportLibrary = true
ndk {
......
mobile/src/main/java/cn/garymb/ygomobile/Constants.java
View file @ a0b790cf
......@@ -142,7 +142,7 @@ public interface Constants {
int DECK_SIDE_MAX = 15;
int DECK_EXTRA_COUNT = (DECK_SIDE_MAX / DECK_WIDTH_COUNT * DECK_WIDTH_COUNT < DECK_SIDE_MAX) ? DECK_WIDTH_COUNT * 2 : DECK_WIDTH_COUNT;
int DECK_SIDE_COUNT = DECK_EXTRA_COUNT;
String ALIPAY_URL = "HTTPS://QR.ALIPAY.COM/FKX06491UAXJMGIDTYVC0C";
//String ALIPAY_URL = "HTTPS://QR.ALIPAY.COM/FKX06491UAXJMGIDTYVC0C";
String PAYPAL_URL = "https://www.paypal.me/YGOmobile3";
String URL_HELP = "http://note.youdao.com/noteshare?id=8ae2dc824b7dc04a95a4665a938e2251";
String URL_MASTERRULE_CN = "https://ocg-rule.readthedocs.io/zh_CN/master/";
......
mobile/src/main/java/cn/garymb/ygomobile/ui/activities/AboutActivity.java deleted 100644 → 0
View file @ 2af4f155
package cn.garymb.ygomobile.ui.activities;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.Toolbar;
import cn.garymb.ygomobile.lite.R;
import cn.garymb.ygomobile.ui.preference.fragments.AboutFragment;
public class AboutActivity extends BaseActivity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_settings);
Toolbar toolbar = $(R.id.toolbar);
setSupportActionBar(toolbar);
enableBackHome();
getFragmentManager().beginTransaction().replace(R.id.fragment, new AboutFragment()).commit();
}
}
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
View file @ a0b790cf
......@@ -73,21 +73,39 @@ import cn.garymb.ygomobile.ui.plus.VUiKit;
import cn.garymb.ygomobile.ui.preference.SettingsActivity;
import cn.garymb.ygomobile.ui.widget.Shimmer;
import cn.garymb.ygomobile.ui.widget.ShimmerTextView;
import cn.garymb.ygomobile.utils.AlipayPayUtils;
import cn.garymb.ygomobile.utils.ComponentUtils;
import cn.garymb.ygomobile.utils.FileLogUtil;
import cn.garymb.ygomobile.utils.PayUtils;
import cn.garymb.ygomobile.utils.ScreenUtil;
import static cn.garymb.ygomobile.Constants.ASSET_SERVER_LIST;
import static cn.garymb.ygomobile.ui.mycard.mcchat.util.Util.startDuelService;
public abstract class HomeActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener {
//卡查关键字
public static final String[] cardSearchKey = new String[]{"?", "？"};
//加房关键字
public static final String[] passwordPrefix = {
"M,", "m,", "T,", "PR,", "pr,", "AI,", "ai,", "LF2,", "lf2,", "M#", "m#", "T#", "t#",
"PR#", "pr#", "NS#", "ns#", "S#", "s#", "AI#", "ai#", "LF2#", "lf2#", "R#", "r#"
};
//卡组复制
public static final String[] DeckTextKey = new String[]{"#main"};
/***
* 剪贴板监听复制内容
*/
private final static String DECK_URL_PREFIX = Constants.SCHEME_APP + "://" + Constants.URI_HOST;
//卡查内容
public static String cardSearchMessage = "";
public static String DeckText = "";
public static String oldmsg = "";
protected SwipeMenuRecyclerView mServerList;
long exitLasttime = 0;
ShimmerTextView tv;
Shimmer shimmer;
private ServerListAdapter mServerListAdapter;
private ServerListManager mServerListManager;
private ClipboardManager cm;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
......@@ -150,7 +168,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
@Override
protected void onStart() {
super.onStart();
if (AppsSettings.get().isServiceDuelAssistant() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
if (AppsSettings.get().isServiceDuelAssistant() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
Handler handler = new Handler();
handler.postDelayed(new Runnable() {
@Override
......@@ -245,18 +263,11 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
dialog.setTitle(R.string.logo_text);
dialog.show();
View viewDialog = dialog.getContentView();
Button btnalipay = viewDialog.findViewById(R.id.button_alipay);
Button btnwechat = viewDialog.findViewById(R.id.button_wechat);
Button btnTrpay = viewDialog.findViewById(R.id.button_trpay);
Button btnpaypal = viewDialog.findViewById(R.id.button_paypal);
btnalipay.setOnClickListener((v) -> {
AlipayPayUtils.openAlipayPayPage(getContext(), Constants.ALIPAY_URL);
dialog.dismiss();
// Intent intent = new Intent(this, AboutActivity.class);
// startActivity(intent);
});
btnwechat.setOnClickListener((v) -> {
AlipayPayUtils.inputMoney(HomeActivity.this);
btnTrpay.setOnClickListener((v) -> {
PayUtils.inputMoney(HomeActivity.this);
dialog.dismiss();
});
btnpaypal.setOnClickListener((v) -> {
......@@ -527,26 +538,6 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
}
}
/***
* 剪贴板监听复制内容
*/
private final static String DECK_URL_PREFIX = Constants.SCHEME_APP + "://" + Constants.URI_HOST;
//卡查关键字
public static final String[] cardSearchKey = new String[]{"?", "？"};
//加房关键字
public static final String[] passwordPrefix = {
"M,", "m,", "T,", "PR,", "pr,", "AI,", "ai,", "LF2,", "lf2,", "M#", "m#", "T#", "t#",
"PR#", "pr#", "NS#", "ns#", "S#", "s#", "AI#", "ai#", "LF2#", "lf2#", "R#", "r#"
};
//卡查内容
public static String cardSearchMessage = "";
//卡组复制
public static final String[] DeckTextKey = new String[]{"#main"};
public static String DeckText = "";
public static String oldmsg = "";
private ClipboardManager cm;
public void getClipboard() {
cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clipData = cm.getPrimaryClip();
......
mobile/src/main/java/cn/garymb/ygomobile/ui/plus/DialogPlus.java
View file @ a0b790cf
......@@ -67,7 +67,6 @@ public class DialogPlus extends Dialog {
mButtonLayout = $(R.id.layout_button);
mTitleLayout = $(R.id.layout_title);
mProgressBar = $(R.id.pb1);
mProgressBar2 = $(R.id.pb2);
setOnCloseLinster((dlg) -> {
dlg.dismiss();
});
......
mobile/src/main/java/cn/garymb/ygomobile/ui/preference/fragments/AboutFragment.java deleted 100644 → 0
View file @ 2af4f155
package cn.garymb.ygomobile.ui.preference.fragments;
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.preference.Preference;
import cn.garymb.ygomobile.Constants;
import cn.garymb.ygomobile.lite.R;
import cn.garymb.ygomobile.ui.preference.PreferenceFragmentPlus;
import cn.garymb.ygomobile.utils.AlipayPayUtils;
import cn.garymb.ygomobile.utils.SystemUtils;
public class AboutFragment extends PreferenceFragmentPlus {
@Override
protected SharedPreferences getSharedPreferences() {
return null;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(false);
addPreferencesFromResource(R.xml.preference_about);
PackageInfo packageInfo = null;
try {
packageInfo = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0);
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
}
bind("pref_key_about_version", (packageInfo == null) ? "?" : packageInfo.versionName);
bind("pref_key_open_alipay");
bind("pref_key_about_version");
String text = SystemUtils.getVersionName(getActivity())
+ " (" + SystemUtils.getVersion(getActivity()) + ")";
findPreference("pref_key_about_version").setSummary(text);
}
@Override
public boolean onPreferenceClick(Preference preference) {
String key = preference.getKey();
if ("pref_key_open_alipay".equals(key)) {
AlipayPayUtils.openAlipayPayPage(getContext(), Constants.ALIPAY_URL);
}
return false;
}
}
mobile/src/main/java/cn/garymb/ygomobile/utils/AlipayPayUtils.java → mobile/src/main/java/cn/garymb/ygomobile/utils/PayUtils.java
View file @ a0b790cf
......@@ -2,8 +2,6 @@ package cn.garymb.ygomobile.utils;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.telephony.TelephonyManager;
import android.text.InputType;
import android.view.Gravity;
......@@ -13,44 +11,51 @@ import com.base.bj.paysdk.domain.TrPayResult;
import com.base.bj.paysdk.listener.PayResultListener;
import com.base.bj.paysdk.utils.TrPay;
import java.net.URLEncoder;
import java.io.File;
import java.io.FileInputStream;
import java.util.UUID;
import cn.garymb.ygomobile.Constants;
import cn.garymb.ygomobile.bean.ServerInfo;
import cn.garymb.ygomobile.bean.ServerList;
import cn.garymb.ygomobile.ui.adapters.ServerListAdapter;
import cn.garymb.ygomobile.ui.home.ServerListManager;
import cn.garymb.ygomobile.ui.plus.DialogPlus;
import cn.garymb.ygomobile.ui.plus.VUiKit;
import static cn.garymb.ygomobile.Constants.ALIPAY_URL;
import static cn.garymb.ygomobile.Constants.ASSET_SERVER_LIST;
public class AlipayPayUtils {
public class PayUtils {
/***
*支付宝
*/
public static boolean openAlipayPayPage(Context context, String qrcode) {
try {
qrcode = URLEncoder.encode(ALIPAY_URL, "utf-8");
} catch (Exception e) {
}
try {
final String alipayqr = "alipayqr://platformapi/startapp?saId=10000007&clientVersion=3.7.0.0718&qrcode=" + qrcode;
openUri(context, alipayqr + "%3F_s%3Dweb-other&_t=" + System.currentTimeMillis());
return true;
} catch (Exception e) {
e.printStackTrace();
}
return false;
}
*支付宝（弃用
private static void openUri(Context context, String s) {
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(s));
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intent);
}
public static boolean openAlipayPayPage(Context context, String qrcode) {
try {
qrcode = URLEncoder.encode(ALIPAY_URL, "utf-8");
} catch (Exception e) {
}
try {
final String alipayqr = "alipayqr://platformapi/startapp?saId=10000007&clientVersion=3.7.0.0718&qrcode=" + qrcode;
openUri(context, alipayqr + "%3F_s%3Dweb-other&_t=" + System.currentTimeMillis());
return true;
} catch (Exception e) {
e.printStackTrace();
}
return false;
}
private static void openUri(Context context, String s) {
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(s));
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intent);
}*/
/***
*微信支付（图灵trpay）
* 图灵trpay
*/
public static void inputMoney(Activity activity) {
DialogPlus dialog = new DialogPlus(activity);
dialog.setTitle("输入微信捐赠金额(元)");
dialog.setTitle("输入捐赠金额(元)");
EditText editText = new EditText(activity);
editText.setGravity(Gravity.TOP | Gravity.LEFT);
editText.setInputType(InputType.TYPE_CLASS_NUMBER);
......@@ -66,7 +71,7 @@ public class AlipayPayUtils {
long money = Long.parseLong(message);
if (money != 0) {
money = money * 100;
WeChatPay(activity, money);
callPay(activity, money);
dlg.dismiss();
}
}
......@@ -74,10 +79,10 @@ public class AlipayPayUtils {
}
public static void WeChatPay(Activity activity, Long money) {
public static void callPay(Activity activity, Long money) {
String id = UUID.randomUUID() + "";
String notifyurl = "192.168.1.1";
TrPay.getInstance(activity).callWxPay("感谢您对YGOMobile的支持", id, money, "", notifyurl, AlipayPayUtils.getIMEI(activity), new PayResultListener() {
TrPay.getInstance(activity).callPay("感谢您对YGOMobile的支持", id, money, "", notifyurl, PayUtils.getID(activity), new PayResultListener() {
public void onPayFinish(Context context, String outtradeno, int resultCode, String resultString, int payType, Long amount, String tradename) {
if (resultCode == TrPayResult.RESULT_CODE_SUCC.getId()) {
} else if (resultCode == TrPayResult.RESULT_CODE_FAIL.getId()) {
......@@ -86,10 +91,9 @@ public class AlipayPayUtils {
});
}
public static String getIMEI(Context context) {
public static String getID(Context context) {
TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
String imei = telephonyManager.getDeviceId();
return imei;
}
}
mobile/src/main/res/drawable/background_lp_progress_bar.xml deleted 100644 → 0
View file @ 2af4f155
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<!--item
android:id="@android:id/background"
android:drawable="@color/colorPrimary">
</item-->
<!-- 设置进度条颜色 -->
<item android:id="@android:id/progress">
<clip android:drawable="@drawable/veil2"></clip>
</item>
</layer-list>
\ No newline at end of file
mobile/src/main/res/layout/activity_home.xml
View file @ a0b790cf
......@@ -27,36 +27,23 @@
android:weightSum="1">
<LinearLayout
android:layout_width="75dp"
android:layout_width="286dp"
android:layout_height="match_parent"
android:layout_gravity="bottom"
android:gravity="left"
android:orientation="vertical">
<com.nightonke.boommenu.BoomMenuButton
android:id="@+id/bmb"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@drawable/buttonfunction"
app:bmb_buttonEnum="textOutsideCircle"
app:bmb_buttonPlaceEnum="buttonPlace_sc_9_1"
app:bmb_dimColor="#80000000"
app:bmb_normalColor="@android:color/transparent"
app:bmb_piecePlaceEnum="piecePlace_dot_9_1">
<ImageView
android:id="@+id/cube"
android:layout_width="40dp"
android:layout_height="41dp"
android:layout_gravity="center"
app:srcCompat="@drawable/cube" />
</com.nightonke.boommenu.BoomMenuButton>
<cn.garymb.ygomobile.ui.widget.ShimmerTextView
android:id="@+id/shimmer_tv"
android:layout_width="150dp"
android:layout_height="60dp"
<TextView
android:layout_width="75dp"
android:layout_height="20dp"
android:gravity="bottom|center_horizontal"
android:text="@string/Function_Menu"
android:textSize="10sp" />
android:background="@drawable/blue"
android:gravity="center"
android:text="@string/return_to_duel"
android:textColor="@color/item_title"
android:textSize="20sp"
android:visibility="visible" />
</LinearLayout>
<LinearLayout
......@@ -82,25 +69,37 @@
android:text="@string/mycard"
android:textSize="10sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_width="75dp"
android:layout_height="match_parent"
android:layout_gravity="bottom"
android:gravity="right"
android:orientation="horizontal">
android:orientation="vertical">
<cn.garymb.ygomobile.ui.widget.ShimmerTextView
android:id="@+id/shimmer_tv"
android:layout_width="150dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:background="@drawable/blue"
android:gravity="center"
android:text="@string/return_to_duel"
android:textColor="@color/item_title"
android:textSize="20sp"
android:visibility="gone" />
<com.nightonke.boommenu.BoomMenuButton
android:id="@+id/bmb"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@drawable/buttonfunction"
app:bmb_buttonEnum="textOutsideCircle"
app:bmb_buttonPlaceEnum="buttonPlace_sc_9_1"
app:bmb_dimColor="#80000000"
app:bmb_normalColor="@android:color/transparent"
app:bmb_piecePlaceEnum="piecePlace_dot_9_1">
<ImageView
android:id="@+id/cube"
android:layout_width="40dp"
android:layout_height="41dp"
android:layout_gravity="center"
app:srcCompat="@drawable/cube" />
</com.nightonke.boommenu.BoomMenuButton>
<TextView
android:layout_width="75dp"
android:layout_height="20dp"
android:gravity="bottom|center_horizontal"
android:text="@string/Function_Menu"
android:textSize="10sp" />
</LinearLayout>
</LinearLayout>
</FrameLayout>
\ No newline at end of file
mobile/src/main/res/layout/dialog_alipay_or_wechat.xml
View file @ a0b790cf
......@@ -5,27 +5,28 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="100dp"
android:gravity="center_horizontal"
android:orientation="horizontal">
<Button
android:id="@+id/button_alipay"
android:layout_width="50dp"
android:layout_height="50dp"
android:background="@drawable/alipay" />
<LinearLayout
android:layout_width="60dp"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="@dimen/label_width_middle"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/gold" />
<Button
android:id="@+id/button_paypal"
android:layout_width="60dp"
android:layout_height="60dp"
android:background="@drawable/paypal" />
<Button
android:id="@+id/button_wechat"
android:layout_width="50dp"
android:layout_height="50dp"
android:background="@drawable/wechat" />
<TextView
android:layout_width="60dp"
android:layout_height="20dp"
android:gravity="bottom|center_horizontal"
android:text="Paypal"
android:textSize="25px" />
</LinearLayout>
<TextView
android:layout_width="@dimen/label_width_middle"
......@@ -33,18 +34,31 @@
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/gold" />
<Button
android:id="@+id/button_paypal"
android:layout_width="50dp"
android:layout_height="50dp"
android:background="@drawable/paypal" />
<LinearLayout
android:layout_width="60dp"
android:layout_height="match_parent"
android:orientation="vertical">
<Button
android:id="@+id/button_trpay"
android:layout_width="60dp"
android:layout_height="60dp"
android:background="@drawable/trpay" />
<TextView
android:layout_width="60dp"
android:layout_height="20dp"
android:gravity="bottom|center_horizontal"
android:text="支付宝/微信"
android:textSize="25px" />
</LinearLayout>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:paddingTop="20dp"
android:paddingTop="10dp"
android:text="@string/donatefor"
android:textSize="25px" />
</LinearLayout>
\ No newline at end of file
mobile/src/main/res/layout/dialog_plus_base.xml
View file @ a0b790cf
......@@ -44,9 +44,9 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_gravity="center_horizontal|center_vertical"
android:layout_marginBottom="5dp"
android:layout_weight="1"
android:minWidth="200dp"
android:orientation="horizontal">
......@@ -78,17 +78,6 @@
</LinearLayout>
<ProgressBar
android:id="@+id/pb2"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="100px"
android:layout_gravity="center_horizontal|center_vertical"
android:progressDrawable="@drawable/background_lp_progress_bar"
android:visibility="gone"
tools:visibility="visible" />
<LinearLayout
android:id="@+id/layout_button"
android:layout_width="match_parent"
......
mobile/src/main/res/values-zh/strings.xml
View file @ a0b790cf
......@@ -247,7 +247,7 @@
<string name="to_open">去开启</string>
<string name="crashed">软件错误退出</string>
<string name="invalid_shortcut">无效的快捷方式</string>
<string name="return_to_duel">返回决斗☞</string>
<string name="return_to_duel">点此返回决斗</string>
<string name="Start_ServiceDuelAssistant">开启决斗助手</string>
<string name="about_DuelAssistant">复制约战房间号直接加房
\n复制“？”+关键词直接查询卡片
......
mobile/src/main/res/values/strings.xml
View file @ a0b790cf
......@@ -173,7 +173,7 @@
<string name="delete_server_info">delete this server info?</string>
<string name="exit_edit_mode">Exit Edit Mode</string>
<string name="logo_text">Thank you all for your support.</string>
<string name="start_game_error">Join game fail</string>
<string name="start_game_error">Join game failed</string>
<string name="set_font_size">In game font size</string>
<string name="copy_to_clipbroad">Copy to clipbroad</string>
<string name="deck_share_head">share deck by ygomobile.</string>
......
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