diff --git a/app_main/src/main/java/cn/rrg/rdv/activities/tools/AboutActicity.java b/app_main/src/main/java/cn/rrg/rdv/activities/tools/AboutActicity.java index 2a694fe1..d6779a51 100644 --- a/app_main/src/main/java/cn/rrg/rdv/activities/tools/AboutActicity.java +++ b/app_main/src/main/java/cn/rrg/rdv/activities/tools/AboutActicity.java @@ -1,42 +1,22 @@ package cn.rrg.rdv.activities.tools; -import android.content.DialogInterface; -import android.content.Intent; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; -import android.net.Uri; import android.os.Bundle; + import androidx.annotation.Nullable; -import androidx.appcompat.app.AlertDialog; import android.view.View; -import android.webkit.WebView; import android.widget.Button; import android.widget.TextView; -import android.widget.Toast; -import java.io.File; - -import cn.dxl.common.util.AppUtil; -import cn.dxl.common.util.FileUtils; -import cn.dxl.common.widget.FilesSelectorDialog; import cn.rrg.rdv.R; import cn.rrg.rdv.activities.main.BaseActivity; import cn.rrg.rdv.util.Commons; -import cn.rrg.rdv.util.Paths; -import cn.dxl.common.util.RestartUtils; -import cn.dxl.common.widget.ToastUtil; public class AboutActicity extends BaseActivity { - private TextView txtUserHelp = null; - private TextView txtDisclaimer = null; - private TextView txtJoinGroup = null; - private TextView txtContactDev = null; private TextView txtShowVersion = null; - private TextView txtSendLogFile = null; - private TextView txtCleanData = null; - private Button btnGo2ProxgrindWebsite; private Button btnGo2RRGWebsite; @@ -51,105 +31,13 @@ public class AboutActicity extends BaseActivity { } private void initViews() { - txtUserHelp = findViewById(R.id.txtUserHelp); - txtDisclaimer = findViewById(R.id.txtDisclaimer); - txtJoinGroup = findViewById(R.id.txtJoinQQGroup); - txtContactDev = findViewById(R.id.txtContactDev); txtShowVersion = findViewById(R.id.txtShowAppVersion); - txtSendLogFile = findViewById(R.id.txtSendLogFile); - txtCleanData = findViewById(R.id.txtCleanData); btnGo2ProxgrindWebsite = findViewById(R.id.btnGo2ProxgrindWebsite); btnGo2RRGWebsite = findViewById(R.id.btnGo2RRGWebsite); } private void initActions() { - txtUserHelp.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //建立视图 - WebView wv = new WebView(AboutActicity.this); - //加载文件 - wv.loadUrl("file:///android_asset/help.html"); - //加载进对话框中 - new AlertDialog.Builder(AboutActicity.this) - .setView(wv).show(); - } - }); - - txtDisclaimer.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - } - }); - - txtJoinGroup.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - boolean result = joinQQGroup("4QQrqUHKMNZDNWLvi4kEWeEDHYMekp7x"); - if (!result) { - Toast.makeText(AboutActicity.this, "未安装手Q或安装的版本不支持!", Toast.LENGTH_SHORT).show(); - } - } - }); - - txtContactDev.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Commons.callQQ(AboutActicity.this, "64101226", new Runnable() { - @Override - public void run() { - ToastUtil.show(context, getString(R.string.error), false); - } - }); - } - }); - - txtSendLogFile.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - new FilesSelectorDialog.Builder(AboutActicity.this) - .setPathOnLoad(Paths.LOG_DIRECTORY) - .setTitle(R.string.logList) - .setOnSelectListener(new FilesSelectorDialog.OnSelectListener() { - @Override - public void selected(File file) { - FileUtils.shareFile(file); - } - }) - .create().show(); - } - }); - - txtCleanData.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - new AlertDialog.Builder(AboutActicity.this) - .setTitle(R.string.warning) - .setMessage(R.string.tipls_clearData) - .setPositiveButton(getString(R.string.clear), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - Toast.makeText(AboutActicity.this, getString(R.string.cleaning), Toast.LENGTH_SHORT).show(); - FileUtils.delete(new File(Paths.TOOLS_DIRECTORY)); - Toast.makeText(AboutActicity.this, getString(R.string.clearFinish), Toast.LENGTH_SHORT).show(); - //必须重启APP - RestartUtils.restartAPP(AboutActicity.this, 1000, new RestartUtils.OnExitAction() { - @Override - public boolean usingSystemExit() { - //调用act管理器结束所有的活动！ - AppUtil.getInstance().finishAll(); - return false; - } - }); - AppUtil.getInstance().finishAll(); - } - }) - .setNegativeButton(R.string.cancel, null) - .show(); - } - }); - btnGo2ProxgrindWebsite.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -177,27 +65,6 @@ public class AboutActicity extends BaseActivity { } } - /**************** - * - * 发起添加群流程。群号：NFC PN532 计算机 单片机(573359551) 的 key 为： 4QQrqUHKMNZDNWLvi4kEWeEDHYMekp7x - * 调用 joinQQGroup(4QQrqUHKMNZDNWLvi4kEWeEDHYMekp7x) 即可发起手Q客户端申请加群 NFC PN532 计算机 单片机(573359551) - * - * @param key 由官网生成的key - * @return 返回true表示呼起手Q成功，返回fals表示呼起失败 - ******************/ - public boolean joinQQGroup(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%26k%3D" + key)); - // 此Flag可根据具体产品需要自定义，如设置，则在加群界面按返回，返回手Q主界面，不设置，按返回会返回到呼起产品界面 //intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - try { - startActivity(intent); - return true; - } catch (Exception e) { - // 未安装手Q或安装的版本不支持 - return false; - } - } - @Override protected void onDestroy() { super.onDestroy(); diff --git a/app_main/src/main/java/cn/rrg/rdv/util/Commons.java b/app_main/src/main/java/cn/rrg/rdv/util/Commons.java index 620412dd..10c1f616 100644 --- a/app_main/src/main/java/cn/rrg/rdv/util/Commons.java +++ b/app_main/src/main/java/cn/rrg/rdv/util/Commons.java @@ -39,18 +39,6 @@ public class Commons { private Commons() { } - //呼叫QQ - public static void callQQ(Context context, String qq, Runnable onFaild) { - //这里的228451878是自己指定的QQ号码，可以自己更换 - String url = "mqqwpa://im/chat?chat_type=wpa&uin=" + qq; - try { - context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); - } catch (Exception e) { - onFaild.run(); - } - } - - //打开浏览器，链接到指定的链接 public static void openUrl(Context context, String url) { try { Uri uri = Uri.parse(url); @@ -63,32 +51,9 @@ public class Commons { } } - //根据单选返回地址! - public static String getCustomerPath(RadioGroup group) { - if (group == null) return Paths.DUMP_DIRECTORY; - int id = group.getCheckedRadioButtonId(); - String path; - if (id == R.id.rdoBtnWriteDataDefaultPath) { - path = Paths.DUMP_DIRECTORY; - } else if (id == R.id.rdoBtnWriteDataMCTPath) { - path = Paths.MCT_DUMP_DIRECTORY; - } else if (id == R.id.rdoBtnWriteDataWecatPath) { - path = Paths.WECAT_DIRECTORY; - } else if (id == R.id.rdoBtnWriteDataSdcardPath) { - path = Paths.EXTERNAL_STORAGE_DIRECTORY; - } else if (id == R.id.rdoBtnWriteDataQQPath) { - path = Paths.QQ_DIRECTORY; - } else if (id == R.id.rdoBtnWriteDataMToolsPath) { - return Paths.MTools_DUMP_DIRECTORY; - } else if (id == R.id.rdoBtnWriteDataPM3Path) { - return Paths.PM3_DIRECTORY; - } else { - path = Paths.DUMP_DIRECTORY; - } - return path; - } - - //移除设备对象从集合中! + /** + * Remove the device from a list + */ public static boolean removeDevByList(DevBean devBean, List list) { if (devBean != null) { String addr = devBean.getMacAddress(); @@ -107,14 +72,18 @@ public class Commons { return true; } - //判断两个设备是否是一致的 + /** + * Check device is equal + */ public static boolean equalDebBean(DevBean a, DevBean b) { if (a == b) return true; if (a == null || b == null) return false; return a.getMacAddress().equals(b.getMacAddress()); } - //从蓝牙适配器中取出历史连接的设备列表! + /** + * Get all device from bluetooth adapter + */ public static DevBean[] getDevsFromBTAdapter(BluetoothAdapter btAdapter) { ArrayList devList = new ArrayList<>(); Set pairedDevices = btAdapter.getBondedDevices(); @@ -131,10 +100,12 @@ public class Commons { return ArrayUtils.list2Arr(devList); } - //设备是否是USB设备! + /** + * Check is a usb device + * the usb no valid mac! + */ public static boolean isUsbDevice(String address) { if (address == null) return false; - //这三种mac是开发者定义的用于区分USB设备和蓝牙设备的特征符！ switch (address) { case "00:00:00:00:00:00": case "00:00:00:00:00:01": diff --git a/app_main/src/main/res/layout-land/act_app_about.xml b/app_main/src/main/res/layout-land/act_app_about.xml index 94d2e1ab..34c96779 100644 --- a/app_main/src/main/res/layout-land/act_app_about.xml +++ b/app_main/src/main/res/layout-land/act_app_about.xml @@ -72,149 +72,4 @@ android:gravity="center" android:padding="6dp" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app_main/src/main/res/layout/act_app_about.xml b/app_main/src/main/res/layout/act_app_about.xml index dea8c5f4..0391d996 100644 --- a/app_main/src/main/res/layout/act_app_about.xml +++ b/app_main/src/main/res/layout/act_app_about.xml @@ -79,149 +79,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index cc4b1fd5..501b4b07 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' + classpath 'com.android.tools.build:gradle:4.1.0' classpath('com.github.dcendents:android-maven-gradle-plugin:1.5') } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 11596900..9a72a8ce 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Feb 26 18:00:31 CST 2020 +#Fri Oct 23 14:41:30 CST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip