From b64454309260d76cea44a329defbd292f39ecc1c Mon Sep 17 00:00:00 2001 From: fengyuecanzhu <1021300691@qq.com> Date: Fri, 2 Oct 2020 22:23:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0README?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../myreader/application/MyApplication.java | 21 ----------- .../xyz/fycz/myreader/common/APPCONST.java | 4 +-- .../myreader/ui/activity/AboutActivity.java | 14 ++------ .../myreader/ui/fragment/MineFragment.java | 16 --------- app/src/main/res/layout/fragment_mine.xml | 29 --------------- .../main/res/layout/layout_about_content.xml | 36 +------------------ app/version_code.properties | 2 +- 7 files changed, 6 insertions(+), 116 deletions(-) diff --git a/app/src/main/java/xyz/fycz/myreader/application/MyApplication.java b/app/src/main/java/xyz/fycz/myreader/application/MyApplication.java index 4deef83..aef69c1 100644 --- a/app/src/main/java/xyz/fycz/myreader/application/MyApplication.java +++ b/app/src/main/java/xyz/fycz/myreader/application/MyApplication.java @@ -432,25 +432,4 @@ public class MyApplication extends Application { return mActivity == null || mActivity.isFinishing() || mActivity.isDestroyed(); } - - /**************** - * - * 发起添加群流程。群号：风月读书交流群(1085028304) 的 key 为： 8PIOnHFuH6A38hgxvD_Rp2Bu-Ke1ToBn - * 调用 joinQQGroup(8PIOnHFuH6A38hgxvD_Rp2Bu-Ke1ToBn) 即可发起手Q客户端申请加群 风月读书交流群(1085028304) - * - * @param key 由官网生成的key - * @return 返回true表示呼起手Q成功，返回false表示呼起失败 - ******************/ - public static boolean joinQQGroup(Context context, String key) { - Intent intent = new Intent(); - intent.setData(Uri.parse("mqqopensdkapi://bizAgent/qm/qr?url=http%3A%2F%2Fqm.qq.com%2Fcgi-bin%2Fqm%2Fqr%3Ffrom%3Dapp%26p%3Dandroid%26jump_from%3Dwebapi%26k%3D" + key)); - // 此Flag可根据具体产品需要自定义，如设置，则在加群界面按返回，返回手Q主界面，不设置，按返回会返回到呼起产品界面 //intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - try { - context.startActivity(intent); - return true; - } catch (Exception e) { - // 未安装手Q或安装的版本不支持 - return false; - } - } } diff --git a/app/src/main/java/xyz/fycz/myreader/common/APPCONST.java b/app/src/main/java/xyz/fycz/myreader/common/APPCONST.java index c893364..ded754a 100644 --- a/app/src/main/java/xyz/fycz/myreader/common/APPCONST.java +++ b/app/src/main/java/xyz/fycz/myreader/common/APPCONST.java @@ -10,10 +10,10 @@ import java.io.File; public class APPCONST { - public static String publicKey = "";//服务端公钥 + public static String publicKey = "fyds1.0";//服务端公钥 public static String privateKey;//app私钥 public final static String s = "11940364935628058505"; - public static final String KEY = ""; + public static final String KEY = "readerByFengyue"; public static final String ALARM_SCHEDULE_MSG = "alarm_schedule_msg"; diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/AboutActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/AboutActivity.java index 68c4ea4..e8a549b 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/activity/AboutActivity.java +++ b/app/src/main/java/xyz/fycz/myreader/ui/activity/AboutActivity.java @@ -32,8 +32,7 @@ public class AboutActivity extends BaseActivity2 { CardView vmUpdate; @BindView(R.id.vw_update_log) CardView vmUpdateLog; - @BindView(R.id.vw_qq) - CardView vmQQ; + @BindView(R.id.vw_git) CardView vmGit; @BindView(R.id.vw_disclaimer) @@ -74,16 +73,7 @@ public class AboutActivity extends BaseActivity2 { SharedPreUtils.getInstance().getString("downloadLink"))); vmUpdate.setOnClickListener(v -> MyApplication.checkVersionByServer(this, true, null)); vmUpdateLog.setOnClickListener(v -> DialogCreator.createAssetTipDialog(this, "更新日志", "updatelog.fy")); - vmQQ.setOnClickListener(v -> { - if (!MyApplication.joinQQGroup(this,"8PIOnHFuH6A38hgxvD_Rp2Bu-Ke1ToBn")){ - //数据 - ClipData mClipData = ClipData.newPlainText("Label", "1085028304"); - //把数据设置到剪切板上 - assert mClipboardManager != null; - mClipboardManager.setPrimaryClip(mClipData); - ToastUtils.showError("未安装手Q或安装的版本不支持！\n已复制QQ群号，您可自行前往QQ添加！"); - } - }); + vmGit.setOnClickListener(v -> openIntent(Intent.ACTION_VIEW, getString(R.string.this_github_url))); vmDisclaimer.setOnClickListener(v -> DialogCreator.createAssetTipDialog(this, "免责声明", "disclaimer.fy")); diff --git a/app/src/main/java/xyz/fycz/myreader/ui/fragment/MineFragment.java b/app/src/main/java/xyz/fycz/myreader/ui/fragment/MineFragment.java index 364afe9..12eb5f1 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/fragment/MineFragment.java +++ b/app/src/main/java/xyz/fycz/myreader/ui/fragment/MineFragment.java @@ -56,8 +56,6 @@ public class MineFragment extends BaseFragment { RelativeLayout mRlThemeMode; @BindView(R.id.tv_theme_mode_select) TextView tvThemeModeSelect; - @BindView(R.id.mine_rl_feedback) - RelativeLayout mRlFeedback; @BindView(R.id.mine_rl_about) RelativeLayout mRlAbout; @@ -252,20 +250,6 @@ public class MineFragment extends BaseFragment { startActivity(aboutIntent); }); - mRlFeedback.setOnClickListener(v -> { - DialogCreator.createCommonDialog(getContext(), "问题反馈", "请加入QQ群(1085028304)反馈问题!", true, - "加入QQ群", "取消", (dialog, which) -> { - if (!MyApplication.joinQQGroup(getContext(),"8PIOnHFuH6A38hgxvD_Rp2Bu-Ke1ToBn")){ - ClipboardManager mClipboardManager = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE); - //数据 - ClipData mClipData = ClipData.newPlainText("Label", "1085028304"); - //把数据设置到剪切板上 - assert mClipboardManager != null; - mClipboardManager.setPrimaryClip(mClipData); - ToastUtils.showError("未安装手Q或安装的版本不支持！\n已复制QQ群号，您可自行前往QQ添加！"); - } - }, null); - }); } @Override diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index f49f246..a053766 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -230,36 +230,7 @@ android:text="其他"/> - - - - - - - - - - - - - - -