拓展卡包日志页增加反馈按钮打开233bug反馈页

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

@@ -162,6 +162,7 @@ public interface Constants {
     String URL_YGO233_DATAVER = "https://ygo233.com/pre/dataver";
     String URL_YGO233_FILE = "https://ygo233.com/pre/download-ygomobile";
     String URL_YGO233_FILE_ALT = "https://ygo233.com/pre/download-ygomobile/alt";
+    String URL_YGO233_BUG_REPORT = "https://ygo233.com/bugs";
     int PORT_YGO233 = 23333;
     String URL_YGO233_1 = "s1.ygo233.com";
     String URL_YGO233_2 = "s2.ygo233.com";

mobile/src/main/java/cn/garymb/ygomobile/ex_card/ExCardActivity.java

@@ -14,8 +14,6 @@ import cn.garymb.ygomobile.ui.activities.BaseActivity;
 
 public class ExCardActivity extends BaseActivity {
     private static final String TAG = String.valueOf(ExCardActivity.class);
-    private Context context;
-    private Toolbar toolbar;
     public static TabLayout tabLayout;
     public static ViewPager viewPager;
     private PackageTabAdapter adapter;
@@ -24,7 +22,6 @@ public class ExCardActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_ex_card);
-
         viewPager = findViewById(R.id.viewPager);
         viewPager.setOffscreenPageLimit(2);
         tabLayout = findViewById(R.id.packagetablayout);

mobile/src/main/java/cn/garymb/ygomobile/ex_card/ExCardListFragment.java

@@ -15,7 +15,6 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -42,6 +41,7 @@ import cn.garymb.ygomobile.bean.ServerInfo;
 import cn.garymb.ygomobile.bean.ServerList;
 import cn.garymb.ygomobile.bean.events.ExCardEvent;
 import cn.garymb.ygomobile.lite.R;
+import cn.garymb.ygomobile.ui.activities.WebActivity;
 import cn.garymb.ygomobile.ui.home.MainActivity;
 import cn.garymb.ygomobile.ui.home.ServerListManager;
 import cn.garymb.ygomobile.ui.plus.VUiKit;
@@ -57,7 +57,7 @@ import cn.garymb.ygomobile.utils.YGOUtil;
 import ocgcore.DataManager;
 
 
-public class ExCardListFragment extends Fragment {
+public class ExCardListFragment extends Fragment implements View.OnClickListener {
     private static final String TAG = String.valueOf(ExCardListFragment.class);
     private Context context;
     private View layoutView;
@@ -115,19 +115,23 @@ public class ExCardListFragment extends Fragment {
         mExCardListView.setLayoutManager(linearLayoutManager);
         mExCardListView.setAdapter(mExCardListAdapter);
         mExCardListAdapter.loadData();
-
         textDownload = layoutView.findViewById(R.id.text_download_prerelease);
         ll_Download = layoutView.findViewById(R.id.btn_download_prerelease);
-        ll_Download.setOnClickListener(new View.OnClickListener() {
+        ll_Download.setOnClickListener(this);
+        changeDownloadText();
+    }
+
     @Override
     public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.btn_download_prerelease:
                 if (downloadState != DownloadState.DOWNLOAD_ING) {
                     downloadState = DownloadState.DOWNLOAD_ING;
                     downloadfromWeb(URL_YGO233_FILE);
                 }
+                break;
         }
-        });
-        changeDownloadText();
+
     }
 
     /**

mobile/src/main/java/cn/garymb/ygomobile/ex_card/ExCardLogFragment.java

 package cn.garymb.ygomobile.ex_card;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ExpandableListView;
+import android.widget.LinearLayout;
 
 import androidx.fragment.app.Fragment;
 
@@ -20,13 +22,15 @@ import java.util.regex.Pattern;
 
 import cn.garymb.ygomobile.Constants;
 import cn.garymb.ygomobile.lite.R;
+import cn.garymb.ygomobile.ui.activities.WebActivity;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;
 import cn.garymb.ygomobile.ui.plus.VUiKit;
 
-public class ExCardLogFragment extends Fragment {
+public class ExCardLogFragment extends Fragment implements View.OnClickListener {
     private static final String TAG = String.valueOf(ExCardLogFragment.class);
-
+    private Context mContext;
     private View layoutView;
+    private LinearLayout ll_report;
     private ExCardLogAdapter mExCardLogAdapter;
     private ExpandableListView mExCardLogView;
 
@@ -36,6 +40,7 @@ public class ExCardLogFragment extends Fragment {
                              Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
         layoutView = inflater.inflate(R.layout.fragment_ex_card_log, container, false);
+        this.mContext = getContext();
         initView(layoutView);
         loadData();
         return layoutView;
@@ -45,6 +50,8 @@ public class ExCardLogFragment extends Fragment {
         mExCardLogView = layoutView.findViewById(R.id.expandableListView);
         mExCardLogAdapter = new ExCardLogAdapter(getContext());
         mExCardLogView.setAdapter(mExCardLogAdapter);
+        ll_report = layoutView.findViewById(R.id.btn_report);
+        ll_report.setOnClickListener(this);
 
     }
 
@@ -114,4 +121,12 @@ public class ExCardLogFragment extends Fragment {
         });
     }
 
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.btn_report:
+                WebActivity.open(mContext, getString(R.string.ex_card_report_title), Constants.URL_YGO233_BUG_REPORT);
+                break;
+        }
+    }
 }
\ No newline at end of file

mobile/src/main/java/cn/garymb/ygomobile/ex_card/PackageTabAdapter.java

 package cn.garymb.ygomobile.ex_card;
 
+import android.app.Activity;
+import android.content.Context;
+
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 
 import com.google.android.material.tabs.TabLayout;
 
+import cn.garymb.ygomobile.Constants;
+import cn.garymb.ygomobile.lite.R;
+import cn.garymb.ygomobile.ui.activities.WebActivity;
+import cn.garymb.ygomobile.ui.home.HomeActivity;
+
 /**
  * Tab的适配器，用来实现页面切换
  */
@@ -15,6 +23,7 @@ public class PackageTabAdapter extends FragmentStatePagerAdapter {
         super(fm);
         this.tabLayout = _tabLayout;
     }
+
     @Override
     public Fragment getItem(int position) {
         Fragment fragment = null;
@@ -28,10 +37,12 @@ public class PackageTabAdapter extends FragmentStatePagerAdapter {
         }
         return fragment;
     }
+
     @Override
     public int getCount() {
         return 2;
     }
+
     @Override
     public CharSequence getPageTitle(int position) {
         String title = null;
@@ -45,7 +56,4 @@ public class PackageTabAdapter extends FragmentStatePagerAdapter {
         }
         return title;
     }
-
-
-
 }

mobile/src/main/java/cn/garymb/ygomobile/ui/settings/SettingFragment.java

@@ -356,7 +356,7 @@ public class SettingFragment extends PreferenceFragmentPlus {
             setPendlumScale(checkBoxPreference.isChecked());
         } else if (PREF_GAME_FONT.equals(key)) {
             //选择ttf字体文件，保存
-            showFileChooser(preference, "*.ttf", mSettings.getFontDirPath(), getString(R.string.dialog_select_font));
+            showFileChooser(preference, "*.ttf", mSettings.getFontDirPath(), getString(R.string.dialog_select_file));
         } else if (SETTINGS_AVATAR.equals(key)) {
             final DialogPlus dialog = new DialogPlus(getContext());
             dialog.setContentView(R.layout.dialog_avatar_select);

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

@@ -15,6 +15,7 @@
         android:scrollbars="vertical" />
 
     <LinearLayout
+        android:id="@+id/btn_download_prerelease"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|right"
@@ -24,10 +25,7 @@
         android:focusableInTouchMode="true"
         android:orientation="vertical"
         android:padding="10dp">
-
-
         <Button
-            android:id="@+id/btn_download_prerelease"
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_gravity="center"

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

@@ -12,6 +12,38 @@
         android:divider="@android:color/darker_gray"
         android:dividerHeight="0.5dp"
         android:indicatorLeft="?android:attr/expandableListPreferredItemIndicatorLeft" />
+    <LinearLayout
+        android:id="@+id/btn_report"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|right"
+        android:layout_marginRight="20dp"
+        android:layout_marginBottom="70dp"
+        android:clickable="true"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical"
+        android:padding="10dp">
+
+
+        <Button
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:layout_marginBottom="5dp"
+            android:background="@drawable/rename" />
+
+        <TextView
+            android:id="@+id/text_report"
+            android:layout_width="60dp"
+            android:layout_height="30dp"
+            android:background="@drawable/ic_radius_bg"
+            android:clickable="false"
+            android:text="@string/ex_card_report_title"
+            android:gravity="center"
+            android:textAlignment="center"
+            android:textColor="@color/gold"
+            android:textSize="10sp" />
+    </LinearLayout>
 </FrameLayout>
 
 

mobile/src/main/res/values-ko/strings.xml

@@ -18,7 +18,7 @@
     <string name="game_sound">사운드 파일</string>
     <string name="game_skins">스킨 파일</string>
     <string name="coping_pendulum_image">펜듈럼 스케일 이미지 복사</string>
-    <string name="dialog_select_font">폰트 파일을 선택하세요</string>
+    <string name="dialog_select_file">파일을 선택하세요</string>
     <string name="dialog_select_image">이미지를 선택하세요</string>
     <string name="dialog_select_database">데이터베이스 파일을 선택하세요</string>
     <string name="copy_databse">데이터베이스 파일 복사중</string>
@@ -39,7 +39,9 @@
     <string name="back_tip">뒤로가기 키를 한번 더 누르시면 앱이 종료됩니다</string>
     <string name="string_help_text">현재 앱에 필요한 권한이 없습니다. \n설정 - 권한 - 필요한 권한 얻기를 터치하십시오.</string>
     <string name="fetch_ex_card">웹에서 프리릴리즈 카드 팩 가져오기</string>
+    <string name="ex_card_list_title">카드 목록</string>
     <string name="ex_card_log_title">업데이트 기록</string>
+    <string name="ex_card_report_title">보고</string>
     <string name="ex_card_check_toast_message">이 서버에 들어가기 전에 먼저 설정에서 "프리릴리즈 카드 팩 활성화"를 클릭하십시오.</string>
     <string name="ex_card_check_toast_message_ii">이 서버에 들어가기 전에 먼저 프리릴리즈 카드 팩을 다운로드하십시오.</string>
 

mobile/src/main/res/values-zh/strings.xml

@@ -18,7 +18,7 @@
     <string name="game_sound">音效文件</string>
     <string name="game_skins">皮肤文件</string>
     <string name="coping_pendulum_image">复制灵摆数字图片</string>
-    <string name="dialog_select_font">请选择一个字体文件</string>
+    <string name="dialog_select_file">请选择一个文件</string>
     <string name="dialog_select_image">请选择一张图片</string>
     <string name="dialog_select_database">请选择一个数据库文件</string>
     <string name="copy_databse">复制数据库中</string>
@@ -39,7 +39,9 @@
     <string name="back_tip">请再按一次返回键退出</string>
     <string name="string_help_text">当前应用缺少必要权限。\n请点击 设置-权限 打开所需权限。</string>
     <string name="fetch_ex_card">通过网络获取先行卡</string>
+    <string name="ex_card_list_title">先行卡</string>
     <string name="ex_card_log_title">更新日志</string>
+    <string name="ex_card_report_title">反馈</string>
     <string name="ex_card_check_toast_message">未开启拓展卡包会在该服务器遇到未知卡，推荐开启拓展卡包后再进入</string>
     <string name="ex_card_check_toast_message_ii">未下载拓展卡包会在该服务器遇到未知卡，推荐下载拓展卡包后再进入</string>
 

mobile/src/main/res/values/strings.xml

@@ -19,7 +19,7 @@
     <string name="game_sound">sound files</string>
     <string name="game_skins">skin files</string>
     <string name="coping_pendulum_image">Coping pendulum image</string>
-    <string name="dialog_select_font">Select a font file</string>
+    <string name="dialog_select_file">Select a file</string>
     <string name="dialog_select_image">Select a iamge</string>
     <string name="dialog_select_database">Select a database file</string>
     <string name="copy_databse">copying databse</string>
@@ -46,7 +46,9 @@
     <string name="string_help_text">The current application lacks the necessary permissions. \n
         please click Settings - permissions - open the required permissions.</string>
     <string name="fetch_ex_card">Fetching pre-cards via web</string>
+    <string name="ex_card_list_title">Card List</string>
     <string name="ex_card_log_title">update log</string>
+    <string name="ex_card_report_title">Reoprt</string>
     <string name="ex_card_check_toast_message">before join in this server, please "used Expansions" in settings first</string>
     <string name="ex_card_check_toast_message_ii">before join in this server, please download expansions first</string>
     <!-- settings -->