更新README

pull/5/head
fengyuecanzhu 4 years ago
parent ebe8ed07ff
commit b644543092
  1. 21
      app/src/main/java/xyz/fycz/myreader/application/MyApplication.java
  2. 4
      app/src/main/java/xyz/fycz/myreader/common/APPCONST.java
  3. 14
      app/src/main/java/xyz/fycz/myreader/ui/activity/AboutActivity.java
  4. 16
      app/src/main/java/xyz/fycz/myreader/ui/fragment/MineFragment.java
  5. 29
      app/src/main/res/layout/fragment_mine.xml
  6. 36
      app/src/main/res/layout/layout_about_content.xml
  7. 2
      app/version_code.properties

@ -432,25 +432,4 @@ public class MyApplication extends Application {
return mActivity == null || mActivity.isFinishing() || mActivity.isDestroyed(); 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;
}
}
} }

@ -10,10 +10,10 @@ import java.io.File;
public class APPCONST { public class APPCONST {
public static String publicKey = "";//服务端公钥 public static String publicKey = "fyds1.0";//服务端公钥
public static String privateKey;//app私钥 public static String privateKey;//app私钥
public final static String s = "11940364935628058505"; 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"; public static final String ALARM_SCHEDULE_MSG = "alarm_schedule_msg";

@ -32,8 +32,7 @@ public class AboutActivity extends BaseActivity2 {
CardView vmUpdate; CardView vmUpdate;
@BindView(R.id.vw_update_log) @BindView(R.id.vw_update_log)
CardView vmUpdateLog; CardView vmUpdateLog;
@BindView(R.id.vw_qq)
CardView vmQQ;
@BindView(R.id.vw_git) @BindView(R.id.vw_git)
CardView vmGit; CardView vmGit;
@BindView(R.id.vw_disclaimer) @BindView(R.id.vw_disclaimer)
@ -74,16 +73,7 @@ public class AboutActivity extends BaseActivity2 {
SharedPreUtils.getInstance().getString("downloadLink"))); SharedPreUtils.getInstance().getString("downloadLink")));
vmUpdate.setOnClickListener(v -> MyApplication.checkVersionByServer(this, true, null)); vmUpdate.setOnClickListener(v -> MyApplication.checkVersionByServer(this, true, null));
vmUpdateLog.setOnClickListener(v -> DialogCreator.createAssetTipDialog(this, "更新日志", "updatelog.fy")); 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))); vmGit.setOnClickListener(v -> openIntent(Intent.ACTION_VIEW, getString(R.string.this_github_url)));
vmDisclaimer.setOnClickListener(v -> DialogCreator.createAssetTipDialog(this, "免责声明", "disclaimer.fy")); vmDisclaimer.setOnClickListener(v -> DialogCreator.createAssetTipDialog(this, "免责声明", "disclaimer.fy"));

@ -56,8 +56,6 @@ public class MineFragment extends BaseFragment {
RelativeLayout mRlThemeMode; RelativeLayout mRlThemeMode;
@BindView(R.id.tv_theme_mode_select) @BindView(R.id.tv_theme_mode_select)
TextView tvThemeModeSelect; TextView tvThemeModeSelect;
@BindView(R.id.mine_rl_feedback)
RelativeLayout mRlFeedback;
@BindView(R.id.mine_rl_about) @BindView(R.id.mine_rl_about)
RelativeLayout mRlAbout; RelativeLayout mRlAbout;
@ -252,20 +250,6 @@ public class MineFragment extends BaseFragment {
startActivity(aboutIntent); 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 @Override

@ -230,36 +230,7 @@
android:text="其他"/> android:text="其他"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout
android:id="@+id/mine_rl_feedback"
android:layout_width="match_parent"
android:layout_height="60dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:background="@drawable/selector_common_bg">
<ImageView
android:layout_marginStart="3dp"
android:id="@+id/iv_feedback"
android:layout_alignParentStart="true"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_centerVertical="true"
app:tint="@color/textPrimary"
android:src="@drawable/ic_feedback"
/>
<TextView
android:id="@+id/tv_feedback"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="18dp"
android:layout_toEndOf="@id/iv_feedback"
android:textColor="@color/textSecondary"
android:textSize="@dimen/text_normal_size"
android:text="@string/mine_feedback"/>
</RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/mine_rl_about" android:id="@+id/mine_rl_about"
android:layout_width="match_parent" android:layout_width="match_parent"

@ -41,6 +41,7 @@
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/vm_author" android:id="@+id/vm_author"
android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
@ -207,41 +208,6 @@
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/vw_qq"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="6dp"
android:clickable="true"
android:focusable="true"
android:foreground="?attr/selectableItemBackground"
app:cardBackgroundColor="@color/background_card">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="5dp">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_qq_group"
app:tint="@color/textSecondary" />
<TextView
android:id="@+id/tv_qq"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="5dp"
android:gravity="center_vertical"
android:textColor="@color/textSecondary"
android:text="@string/join_qq_group" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/vw_git" android:id="@+id/vw_git"

@ -1,2 +1,2 @@
#Fri Oct 02 20:55:45 CST 2020 #Fri Oct 02 22:23:04 CST 2020
VERSION_CODE=150 VERSION_CODE=150

Loading…
Cancel
Save