rfidrig/RFIDtools
0
0
Fork 0
mirror of https://github.com/RfidResearchGroup/RFIDtools.git synced 2026-05-12 11:19:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove some resource and comment change.

Browse Source
This commit is contained in:
dxl
2020-10-23 15:03:47 +08:00
parent 556d071c2a
commit 6198d7219f
6 changed files with 17 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app_main/src/main/java/cn/rrg/rdv/activities/tools/AboutActicity.java
+1 -134
View File
@@ -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();
app_main/src/main/java/cn/rrg/rdv/util/Commons.java
+13 -42
View File
@@ -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<DevBean> 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<DevBean> devList = new ArrayList<>();
Set<BluetoothDevice> 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":
app_main/src/main/res/layout-land/act_app_about.xml
-145
View File
@@ -72,149 +72,4 @@
android:gravity="center"
android:padding="6dp" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="28dp"
android:background="@color/md_grey_100"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/main_settings"
android:drawablePadding="16dp"
android:gravity="start"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/appSettings" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/md_grey_300" />
<TextView
android:id="@+id/txtUserHelp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/help_blue"
android:drawablePadding="16dp"
android:gravity="start"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/usage" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/md_grey_300"
android:visibility="gone" />
<TextView
android:id="@+id/txtDisclaimer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/disclaimer_blue"
android:drawablePadding="16dp"
android:gravity="start"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/disclaimer" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/md_grey_300" />
<TextView
android:id="@+id/txtJoinQQGroup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/qq_group_blue"
android:drawablePadding="16dp"
android:gravity="start"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/joinGroup" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/md_grey_300" />
<TextView
android:id="@+id/txtContactDev"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/dev_blue"
android:drawablePadding="16dp"
android:gravity="start"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/contactDev" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/md_grey_300" />
<TextView
android:id="@+id/txtSendLogFile"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/share"
android:drawablePadding="16dp"
android:gravity="start"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/sendLog" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/md_grey_300" />
<TextView
android:id="@+id/txtCleanData"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/clear_blue"
android:drawablePadding="16dp"
android:gravity="start"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/clearData" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/md_grey_300" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/update_blue"
android:drawablePadding="16dp"
android:gravity="start"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/checkUpdate" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/md_grey_300" />
</LinearLayout>
</ScrollView>
</LinearLayout>
app_main/src/main/res/layout/act_app_about.xml
-145
View File
@@ -79,149 +79,4 @@
</ScrollView>
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="28dp"
android:background="@color/md_grey_100"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/main_settings"
android:drawablePadding="16dp"
android:gravity="start"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/appSettings" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/md_grey_300" />
<TextView
android:id="@+id/txtUserHelp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/help_blue"
android:drawablePadding="16dp"
android:gravity="start"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/usage" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/md_grey_300"
android:visibility="gone" />
<TextView
android:id="@+id/txtDisclaimer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/disclaimer_blue"
android:drawablePadding="16dp"
android:gravity="start"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/disclaimer" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/md_grey_300" />
<TextView
android:id="@+id/txtJoinQQGroup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/qq_group_blue"
android:drawablePadding="16dp"
android:gravity="start"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/joinGroup" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/md_grey_300" />
<TextView
android:id="@+id/txtContactDev"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/dev_blue"
android:drawablePadding="16dp"
android:gravity="start"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/contactDev" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/md_grey_300" />
<TextView
android:id="@+id/txtSendLogFile"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/share"
android:drawablePadding="16dp"
android:gravity="start"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/sendLog" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/md_grey_300" />
<TextView
android:id="@+id/txtCleanData"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/clear_blue"
android:drawablePadding="16dp"
android:gravity="start"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/clearData" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/md_grey_300" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/update_blue"
android:drawablePadding="16dp"
android:gravity="start"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/checkUpdate" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/md_grey_300" />
</LinearLayout>
</ScrollView>
</RelativeLayout>
build.gradle
+1 -1
View File
@@ -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')
}
}
gradle/wrapper/gradle-wrapper.properties
Vendored
+2 -2
View File
@@ -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