remove donation

mobile/build.gradle

@@ -8,7 +8,7 @@ android {
         applicationId "cn.garymb.ygomobile"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 371200105
+        versionCode 371200107
         versionName "3.7.12"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true
@@ -97,8 +97,6 @@ dependencies {
 
     implementation 'com.nightonke:boommenu:2.1.0'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    //
-    implementation(name: 'paysdk-release-1.2.4', ext: 'aar')
     //dialog库
     implementation(name: 'dialogutils2-release', ext: 'aar')
     //recyclerview的adapter库

mobile/src/main/java/cn/garymb/ygomobile/Constants.java

@@ -143,8 +143,9 @@ 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 PAYPAL_URL = "https://www.paypal.me/ygomobile1";
+    String URL_PGYER_CN= "https://www.pgyer.com/ygomobilecn";
+    String URL_PGYER_EN= "https://www.pgyer.com/ygomobileen";
+    String URL_PGYER_KO= "https://www.pgyer.com/ygomobileko";
     String URL_HELP = "http://note.youdao.com/noteshare?id=8ae2dc824b7dc04a95a4665a938e2251";
     String URL_MASTERRULE_CN = "https://ocg-rule.readthedocs.io/zh_CN/master/";
     String WIKI_SEARCH_URL = "https://www.ourocg.cn/S.aspx?key=";

mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java

@@ -27,7 +27,6 @@ import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.base.bj.paysdk.utils.TrPay;
 import com.google.android.material.navigation.NavigationView;
 import com.nightonke.boommenu.BoomButtons.BoomButton;
 import com.nightonke.boommenu.BoomButtons.TextOutsideCircleButton;
@@ -57,6 +56,7 @@ import cn.garymb.ygomobile.bean.Deck;
 import cn.garymb.ygomobile.bean.ServerInfo;
 import cn.garymb.ygomobile.bean.ServerList;
 import cn.garymb.ygomobile.bean.events.ServerInfoEvent;
+import cn.garymb.ygomobile.lite.BuildConfig;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.activities.BaseActivity;
 import cn.garymb.ygomobile.ui.activities.FileLogActivity;
@@ -76,13 +76,15 @@ import cn.garymb.ygomobile.ui.widget.Shimmer;
 import cn.garymb.ygomobile.ui.widget.ShimmerTextView;
 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 cn.garymb.ygomobile.utils.YGOUtil;
 import ocgcore.CardManager;
 import ocgcore.data.Card;
 
 import static cn.garymb.ygomobile.Constants.ASSET_SERVER_LIST;
+import static cn.garymb.ygomobile.Constants.URL_PGYER_CN;
+import static cn.garymb.ygomobile.Constants.URL_PGYER_EN;
+import static cn.garymb.ygomobile.Constants.URL_PGYER_KO;
 
 public abstract class HomeActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener, OnDuelAssistantListener {
 
@@ -140,8 +142,6 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
         };
         //x5内核初始化接口
         QbSdk.initX5Environment(this, cb);
-        //trpay
-        TrPay.getInstance(HomeActivity.this).initPaySdk("e1014da420ea4405898c01273d6731b6", "YGOMobile");
         //check update
         Beta.checkUpgrade(false, false);
         //初始化决斗助手
@@ -289,28 +289,18 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
 
     private boolean doMenu(int id) {
         switch (id) {
-            case R.id.nav_donation: {
-
-                final DialogPlus dialog = new DialogPlus(getContext());
-                dialog.setContentView(R.layout.dialog_alipay_or_wechat);
-                dialog.setTitle(R.string.logo_text);
-                dialog.show();
-                View viewDialog = dialog.getContentView();
-                Button btnAlipay = viewDialog.findViewById(R.id.button_alipay);
-                Button btnTrpay = viewDialog.findViewById(R.id.button_trpay);
-                Button btnpaypal = viewDialog.findViewById(R.id.button_paypal);
-                btnAlipay.setOnClickListener((v) -> {
-                    PayUtils.openAlipayPayPage(getContext(), Constants.ALIPAY_URL);
-                    dialog.dismiss();
-                });
-                btnTrpay.setOnClickListener((v) -> {
-                    PayUtils.inputMoney(HomeActivity.this);
-                    dialog.dismiss();
-                });
-                btnpaypal.setOnClickListener((v) -> {
-                    WebActivity.open(this, getString(R.string.donation), Constants.PAYPAL_URL);
-                    dialog.dismiss();
-                });
+            case R.id.nav_webpage: {
+                String url;
+                if (BuildConfig.APPLICATION_ID == "cn.garymb.ygomobile.EN") {
+                    url = URL_PGYER_EN;
+                } else if (BuildConfig.APPLICATION_ID == "cn.garymb.ygomobile.KO") {
+                    url = URL_PGYER_KO;
+                } else {
+                    url = URL_PGYER_CN;
+                }
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse(url));
+                startActivity(intent);
             }
             break;
             case R.id.action_game:
@@ -501,7 +491,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
 
         addMenuButton(mMenuIds, menu, R.id.action_reset_game_res, R.string.reset_game_res, R.drawable.downloadimages);
         addMenuButton(mMenuIds, menu, R.id.action_settings, R.string.settings, R.drawable.setting);
-        addMenuButton(mMenuIds, menu, R.id.nav_donation, R.string.donation, R.drawable.about);
+        addMenuButton(mMenuIds, menu, R.id.nav_webpage, R.string.donation, R.drawable.about);
 
         //设置展开或隐藏的延时。 默认值为 800ms。
         menu.setDuration(100);

mobile/src/main/java/cn/garymb/ygomobile/utils/PayUtils.java

-package cn.garymb.ygomobile.utils;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.text.InputType;
-import android.view.Gravity;
-import android.widget.EditText;
-
-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.util.UUID;
-
-import cn.garymb.ygomobile.ui.plus.DialogPlus;
-
-import static cn.garymb.ygomobile.Constants.ALIPAY_URL;
-
-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);
-    }
-
-    /***
-     *  图灵trpay
-     */
-    public static void inputMoney(Activity activity) {
-        DialogPlus dialog = new DialogPlus(activity);
-        dialog.setTitle("输入捐赠金额(元)");
-        EditText editText = new EditText(activity);
-        editText.setGravity(Gravity.TOP | Gravity.LEFT);
-        editText.setInputType(InputType.TYPE_CLASS_NUMBER);
-        editText.setSingleLine();
-        dialog.show();
-        dialog.setContentView(editText);
-        dialog.setOnCloseLinster((dlg) -> {
-            dlg.dismiss();
-        });
-        dialog.setLeftButtonListener((dlg, s) -> {
-            String message = editText.getText().toString().trim();
-            if (!message.equals("")) {
-                long money = Long.parseLong(message);
-                if (money != 0) {
-                    money = money * 100;
-                    callPay(activity, money);
-                    dlg.dismiss();
-                }
-            }
-        });
-    }
-
-
-    public static void callPay(Activity activity, Long money) {
-        String id = UUID.randomUUID() + "";
-        String notifyurl = "192.168.1.1";
-        TrPay.getInstance(activity).callPay("感谢您对YGOMobile的支持", id, money, "", notifyurl, "user", 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()) {
-                }
-            }
-        });
-    }
-
-    /*
-    public static String getID(Context context) {
-        TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        @SuppressLint("MissingPermission") String imei = telephonyManager.getDeviceId();
-        return imei;
-    }*/
-}

mobile/src/main/res/layout/dialog_alipay_or_wechat.xml

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="100dp"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal">
-
-        <LinearLayout
-            android:layout_width="60dp"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <Button
-                android:id="@+id/button_paypal"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:background="@drawable/paypal" />
-
-            <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"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            android:textColor="@color/gold" />
-
-        <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/wechat" />
-
-            <TextView
-                android:layout_width="60dp"
-                android:layout_height="20dp"
-                android:gravity="bottom|center_horizontal"
-                android:text="微信"
-                android:textSize="25px" />
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="@dimen/label_width_middle"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            android:textColor="@color/gold" />
-
-        <LinearLayout
-            android:layout_width="60dp"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <Button
-                android:id="@+id/button_alipay"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:background="@drawable/alipay" />
-
-            <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="10dp"
-        android:text="@string/donatefor"
-        android:textSize="25px" />
-</LinearLayout>
\ No newline at end of file

mobile/src/main/res/layout/nav_main_head.xml

@@ -42,7 +42,7 @@
                 android:textColor="@color/white" />
 
             <Button
-                android:id="@+id/nav_donation"
+                android:id="@+id/nav_webpage"
                 android:layout_width="124dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"