libchip android project

11 months ago · 098429eb21
parent da1a1e8e07
commit 098429eb21
50 changed files with 3121 additions and 0 deletions
--- a/test6/.gitignore
+++ b/test6/.gitignore
@ -0,0 +1,15 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
--- a/test6/.idea/.gitignore
+++ b/test6/.idea/.gitignore
@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
--- a/test6/.idea/compiler.xml
+++ b/test6/.idea/compiler.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="17" />
+  </component>
+</project>
--- a/test6/.idea/gradle.xml
+++ b/test6/.idea/gradle.xml
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
--- a/test6/.idea/misc.xml
+++ b/test6/.idea/misc.xml
@ -0,0 +1,9 @@
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>
--- a/test6/app/.gitignore
+++ b/test6/app/.gitignore
@ -0,0 +1 @@
+/build
--- a/test6/app/build.gradle
+++ b/test6/app/build.gradle
@ -0,0 +1,48 @@
+plugins {
+    id 'com.android.application'
+}
+
+android {
+    namespace 'com.example.test6'
+    compileSdk 33
+
+    defaultConfig {
+        applicationId "com.example.test6"
+        minSdk 30
+        targetSdk 33
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    externalNativeBuild {
+        cmake {
+            path file('src/main/cpp/CMakeLists.txt')
+            version '3.22.1'
+        }
+    }
+    buildFeatures {
+        viewBinding true
+    }
+}
+
+dependencies {
+
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+}
--- a/test6/app/proguard-rules.pro
+++ b/test6/app/proguard-rules.pro
@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
--- a/test6/app/src/androidTest/java/com/example/test6/ExampleInstrumentedTest.java
+++ b/test6/app/src/androidTest/java/com/example/test6/ExampleInstrumentedTest.java
@ -0,0 +1,26 @@
+package com.example.test6;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("com.example.test6", appContext.getPackageName());
+    }
+}
--- a/test6/app/src/main/AndroidManifest.xml
+++ b/test6/app/src/main/AndroidManifest.xml
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Test6"
+        tools:targetApi="31">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
--- a/test6/app/src/main/cpp/CMakeLists.txt
+++ b/test6/app/src/main/cpp/CMakeLists.txt
@ -0,0 +1,53 @@
+# For more information about using CMake with Android Studio, read the
+# documentation: https://d.android.com/studio/projects/add-native-code.html
+
+# Sets the minimum version of CMake required to build the native library.
+
+cmake_minimum_required(VERSION 3.22.1)
+
+# Declares and names the project.
+
+project("chip")
+
+# Creates and names a library, sets it as either STATIC
+# or SHARED, and provides the relative paths to its source code.
+# You can define multiple libraries, and CMake builds them for you.
+# Gradle automatically packages shared libraries with your APK.
+
+add_library( # Sets the name of the library.
+        chip
+
+        # Sets the library as a shared library.
+        SHARED
+
+        # Provides a relative path to your source file(s).
+        chip.cpp
+        GPIOControl.cpp
+        NrsecPort.cpp
+        SpiPort.cpp
+        native-lib.cpp
+        )
+
+# Searches for a specified prebuilt library and stores the path as a
+# variable. Because CMake includes system libraries in the search path by
+# default, you only need to specify the name of the public NDK library
+# you want to add. CMake verifies that the library exists before
+# completing its build.
+
+find_library( # Sets the name of the path variable.
+        log-lib
+
+        # Specifies the name of the NDK library that
+        # you want CMake to locate.
+        log)
+
+# Specifies libraries CMake should link to your target library. You
+# can link multiple libraries, such as libraries you define in this
+# build script, prebuilt third-party libraries, or system libraries.
+
+target_link_libraries( # Specifies the target library.
+        chip
+
+        # Links the target library to the log library
+        # included in the NDK.
+        ${log-lib})
--- a/test6/app/src/main/cpp/GPIOControl.cpp
+++ b/test6/app/src/main/cpp/GPIOControl.cpp
@ -0,0 +1,134 @@
+//
+// Created by Matthew on 2023/12/27.
+//
+
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <unistd.h>
+
+
+#include "GPIOControl.h"
+
+#ifdef _DEBUG
+#include <AndroidHelper.h>
+#endif
+
+#define IOT_PARAM_WRITE 0xAE
+#define IOT_PARAM_READ 0xAF
+#define MAX_STRING_LEN 32
+
+typedef struct
+{
+    int cmd;
+    int value;
+    int result;
+    long value2;
+    char str[MAX_STRING_LEN];
+}IOT_PARAM;
+
+void GpioControl::setInt(int cmd, int value)
+{
+    int fd = open("/dev/mtkgpioctrl", O_RDONLY);
+    IOT_PARAM param;
+    param.cmd = cmd;
+    param.value = value;
+    // LOGE("set_int fd=%d,cmd=%d,value=%d\r\n",fd, cmd, value);
+    if( fd > 0 )
+    {
+        int res = ioctl(fd, IOT_PARAM_WRITE, &param);
+        // LOGE("set_int22 cmd=%d,value=%d,result=%d\r\n",param.cmd, param.value, param.result);
+        close(fd);
+    }
+    return;
+}
+
+int GpioControl::getInt(int cmd)
+{
+    int fd = open("/dev/mtkgpioctrl", O_RDONLY);
+    // LOGE("get_int fd=%d,cmd=%d\r\n",fd, cmd);
+    if( fd > 0 )
+    {
+        IOT_PARAM param;
+        param.cmd = cmd;
+        ioctl(fd, IOT_PARAM_READ, &param);
+#ifdef _DEBUG
+        ALOGI("getInt cmd=%d,value=%d,result=%d\r\n",param.cmd, param.value, param.result);
+#endif
+        close(fd);
+        return param.value;
+    }
+    return -1;
+}
+
+void GpioControl::setLong(int cmd, long value)
+{
+    int fd = open("/dev/mtkgpioctrl", O_RDONLY);
+    IOT_PARAM param;
+    param.cmd = cmd;
+    param.value2 = value;
+    // LOGE("set_long fd=%d,cmd=%d,value2=%ld\r\n",fd, param.cmd, param.value2);
+
+    if( fd > 0 )
+    {
+        ioctl(fd, IOT_PARAM_WRITE, &param);
+        // LOGE("set_long22 cmd=%d,value2=%ld,result=%d\r\n",param.cmd, param.value2, param.result);
+        close(fd);
+    }
+}
+
+long GpioControl::getLong(int cmd)
+{
+    int fd = open("/dev/mtkgpioctrl", O_RDONLY);
+    // LOGE("get_long fd=%d,cmd=%d\r\n",fd, cmd);
+    if( fd > 0 )
+    {
+        IOT_PARAM param;
+        param.cmd = cmd;
+        ioctl(fd, IOT_PARAM_READ, &param);
+        // LOGE("get_long22 cmd=%d,value2=%ld,result=%d\r\n",param.cmd, param.value2, param.result);
+        close(fd);
+        return param.value2;
+    }
+    return -1;
+}
+
+void GpioControl::setString(int cmd, const std::string& value)
+{
+    IOT_PARAM param;
+    // char *pval = jstringToChars(env, value);
+    int fd = open("/dev/mtkgpioctrl", O_RDONLY);
+    int len = MAX_STRING_LEN < value.size() ? MAX_STRING_LEN : value.size();
+
+    param.cmd = cmd;
+    memset(param.str, 0, MAX_STRING_LEN);
+    memcpy(param.str, value.c_str(), len);
+    // LOGE("set_string fd=%d,cmd=%d,str=%s\r\n",fd, param.cmd, param.str);
+    if( fd > 0 )
+    {
+        ioctl(fd, IOT_PARAM_WRITE, &param);
+        // LOGE("set_string22 cmd=%d,str=%s,result=%d\r\n",param.cmd, param.str, param.result);
+        close(fd);
+    }
+    return;
+}
+
+std::string GpioControl::getString(int cmd)
+{
+    int fd = open("/dev/mtkgpioctrl", O_RDONLY);
+    // LOGE("get_string fd=%d,cmd=%d\r\n",fd, cmd);
+    if( fd > 0 )
+    {
+        IOT_PARAM param;
+        param.cmd = cmd;
+        ioctl(fd, IOT_PARAM_READ, &param);
+        // LOGE("get_string22 cmd=%d,str=%s,result=%d\r\n",param.cmd, param.str, param.result);
+        close(fd);
+        return std::string(param.str);
+    }
+    return "";
+}
--- a/test6/app/src/main/cpp/GPIOControl.h
+++ b/test6/app/src/main/cpp/GPIOControl.h
@ -0,0 +1,166 @@
+//
+// Created by Matthew on 2023/12/27.
+//
+
+#ifndef MICROPHOTO_GPIOCONTROL_H
+#define MICROPHOTO_GPIOCONTROL_H
+
+#include <string>
+
+#define CMD_GET_LIGHT_ADC                       101
+#define CMD_SET_LIGHT_ADC                       102
+#define CMD_GET_KEY_LOCKSTATE                   103
+#define CMD_GET_BAT_ADC                         104
+#define CMD_SET_FLASH_LED                       105
+#define CMD_SET_NETWORK_STATE                   106
+#define CMD_SET_OTG_STATE                       107
+#define CMD_GET_OTG_STATE                       108
+#define CMD_GET_CHARGING_VOL_STATE              110
+#define CMD_GET_CHARGING_SHUNT_VOLTAGE_STATE    111
+#define CMD_GET_CHARGING_BUS_VOLTAGE_STATE      112
+#define CMD_GET_CHARGING_POWER_STATE            113
+#define CMD_GET_CHARGING_CURRENT_STATE          114
+#define CMD_GET_BAT_VOL_STATE                   115
+#define CMD_GET_BAT_SHUNT_VOLTAGE_STATE         116
+#define CMD_GET_BAT_BUS_VOLTAGE_STATE           117
+#define CMD_GET_BAT_POWER_STATE                 118
+#define CMD_GET_BAT_CURRENT_STATE               119
+#define CMD_SET_485_STATE                       121
+#define CMD_SET_SPI_MODE                        123
+#define CMD_SET_SPI_BITS_PER_WORD               124
+#define CMD_SET_SPI_MAXSPEEDHZ                  125
+#define CMD_SET_PWM_BEE_STATE                   126
+#define CMD_SET_ALM_MODE                        128
+#define CMD_SET_SPI_POWER                       129
+#define CMD_SET_485_EN_STATE					131
+#define CMD_SET_CAM_3V3_EN_STATE				132
+#define CMD_SET_12V_EN_STATE					133
+#define CMD_SET_SYSTEM_RESET  		            202
+
+class GpioControl
+{
+public:
+
+    static void setInt(int cmd, int value);
+    static int getInt(int cmd);
+    static void setLong(int cmd, long value);
+    static long getLong(int cmd);
+    static void setString(int cmd, const std::string& value);
+    static std::string getString(int cmd);
+
+    static void setOtgState(bool on)
+    {
+        setInt(CMD_SET_OTG_STATE, on ? 1 : 0);
+    }
+
+    static bool getOtgState()
+    {
+        return getInt(CMD_SET_OTG_STATE) != 0;
+    }
+
+    static void setCam3V3Enable(bool enabled)
+    {
+        setInt(CMD_SET_CAM_3V3_EN_STATE, enabled ? 1 : 0);
+    }
+
+    static void reboot()
+    {
+        setInt(CMD_SET_SYSTEM_RESET, 1);
+    }
+
+    static void setLightAdc(int i)
+    {
+        setInt(CMD_SET_LIGHT_ADC, i);
+    }
+
+    static int getLightAdc()
+    {
+        return getInt(CMD_GET_LIGHT_ADC);
+    }
+
+    static int getChargingVoltage()
+    {
+        return getInt(CMD_GET_CHARGING_VOL_STATE);
+    }
+
+    static int getChargingShuntVoltage()
+    {
+        return getInt(CMD_GET_CHARGING_SHUNT_VOLTAGE_STATE);
+    }
+
+    static int getChargingBusVoltage() {
+        return getInt(CMD_GET_CHARGING_BUS_VOLTAGE_STATE);
+    }
+
+    static int getChargingPower() {
+        return getInt(CMD_GET_CHARGING_POWER_STATE);
+    }
+
+    static int getChargingCurrent() {
+        return getInt(CMD_GET_CHARGING_CURRENT_STATE);
+    }
+
+    static int getBatteryVoltage() {
+        return getInt(CMD_GET_BAT_VOL_STATE);
+    }
+
+    static int getBatteryShuntVoltage() {
+        return getInt(CMD_GET_BAT_SHUNT_VOLTAGE_STATE);
+    }
+
+    static int getBatteryBusVoltage() {
+        return getInt(CMD_GET_BAT_BUS_VOLTAGE_STATE);
+    }
+
+    static int getBatteryPower() {
+        return getInt(CMD_GET_BAT_POWER_STATE);
+    }
+
+    static int getBatteryCurrent() {
+        return getInt(CMD_GET_BAT_CURRENT_STATE);
+    }
+
+    static void set485WriteMode() {
+        setInt(CMD_SET_485_STATE, 1);
+    }
+
+    static void set485ReadMode() {
+        setInt(CMD_SET_485_STATE, 0);
+    }
+
+    static void setSpiMode(int i) {
+        setInt(CMD_SET_SPI_MODE, i);
+    }
+
+    static void setSpiBitsPerWord(int i) {
+        setInt(CMD_SET_SPI_BITS_PER_WORD, i);
+    }
+
+    static void setSpiMaxSpeedHz(long j) {
+        setLong(CMD_SET_SPI_MAXSPEEDHZ, j);
+    }
+
+    static void setBeeOn(bool z) {
+        setInt(CMD_SET_PWM_BEE_STATE, z ? 1 : 0);
+    }
+
+    static void setJidianqiState(bool z) {
+        setInt(CMD_SET_ALM_MODE, z ? 1 : 0);
+    }
+
+    static void setSpiPower(bool on) {
+        setInt(CMD_SET_SPI_POWER, on ? 1 : 0);
+    }
+
+    static void setRS485Enable(bool z) {
+        setInt(CMD_SET_485_EN_STATE, z ? 1 : 0);
+    }
+    
+    static void set12VEnable(bool z) {
+        setInt(CMD_SET_12V_EN_STATE, z ? 1 : 0);
+    }
+
+};
+
+
+#endif //MICROPHOTO_GPIOCONTROL_H
--- a/test6/app/src/main/cpp/NrsecPort.cpp
+++ b/test6/app/src/main/cpp/NrsecPort.cpp
--- a/test6/app/src/main/cpp/NrsecPort.h
+++ b/test6/app/src/main/cpp/NrsecPort.h
@ -0,0 +1,58 @@
+#ifndef __NRSECPORT_H__
+#define __NRSECPORT_H__
+
+#include "SpiPort.h"
+#include <mutex>
+
+
+#define CMD_HEAD_SIZE           5
+using namespace std;
+typedef uint8_t uint8_t;
+
+class NrsecPort : public SpiPort {
+public:
+
+	int SM1ImportKey(const uint8_t* ek, const uint8_t* ak);
+	int ImportIV(const uint8_t* iv, uint8_t ivLength);
+
+	int SM1Encrypt(const uint8_t* data, uint16_t dataLen, uint8_t* encryptedData, uint16_t *bufferLen);
+	int SM1Decrypt(const uint8_t* encryptedData, uint16_t encryptedDataLen, uint8_t* data, uint16_t* bufferLen);
+
+	int Random(uint8_t* output, uint8_t length);
+	std::string Version();
+	int Indentify(uint8_t *to_idt, uint8_t *out_idt);
+	int SM2keypair(int index);
+	int SM2ExportPublicKey(int index, uint8_t result[] ,uint8_t * len);
+	int SM2ExportPrivateKey(int index, uint8_t result[] ,uint8_t * len);
+	int SM2ImportPublicKey(int index, const uint8_t new_key[]);
+	int SM2ImportPrivateKey(int index, const uint8_t new_key[]);
+	int SM3Hash(uint8_t *to_hash, int len, uint8_t *out_hash);
+	int SM3Hash(uint8_t *in, int inl, uint8_t *out, uint8_t *pubkey, uint8_t *pucID, int idl);
+	int SM2Sign(int index, const uint8_t *to_sign, uint8_t *out_sign);
+	int SM2VerifySign(int index, uint8_t *hash, uint8_t * vs);
+	int SM2Encrypt(int index, uint8_t *to_encrypt, uint8_t * out_encrypt);
+	int SM2Decrypt(int index, uint8_t *to_decoder, uint8_t *out_decoder);
+	int SM2cert(int type, int index, string cert, uint8_t *out_cert, uint16_t *len);
+
+protected:
+
+	uint8_t CalcCRC7(const uint8_t *buff, int len);
+	void SendCMD(uint8_t *cmd, uint8_t *rxbuf);
+	void RcvINS(uint8_t *txbuf, uint8_t *buf, uint8_t ins);
+	void RcvLEN(uint8_t *txbuf, uint8_t *buf, uint8_t len);
+	void RcvData(uint8_t *txbuf, uint8_t *buf);
+	void RcvData(uint8_t *txbuf, uint8_t *buf, int len);
+	bool RcvSW(uint8_t *txbuf, uint8_t *buf, uint8_t sw);
+	void SendEnd(uint8_t *txbuf, uint8_t *buf);
+	void SendId(uint8_t *txbuf, uint8_t *buf, uint8_t id);
+	void SendData(uint8_t *data, uint8_t *rxbuf, int data_size);
+
+protected:
+	std::mutex m_mutex;
+
+};
+
+
+
+
+#endif // __NRSECPORT_H__
--- a/test6/app/src/main/cpp/SpiPort.cpp
+++ b/test6/app/src/main/cpp/SpiPort.cpp
@ -0,0 +1,207 @@
+#include "SpiPort.h"
+#ifdef _WIN32
+#include <io.h>
+#include <atlstr.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <thread>
+#ifdef __ANDROID__
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <linux/types.h>
+#include <linux/spi/spidev.h>
+
+#include <android/log.h>
+#endif
+
+//typedef unsigned char u8;
+
+#define  RE_SUC   0x01
+#define  RE_ERROR 0x00
+
+#define TAG_SPI "SPI"
+
+SpiPort::SpiPort()
+#ifdef _WIN32
+#ifdef TERMINAL_SERVER
+	: m_fd(INVALID_HANDLE_VALUE)
+#endif
+#else
+	: m_fd(0)
+#endif
+{
+}
+
+SpiPort::~SpiPort()
+{
+    Close();
+}
+
+bool SpiPort::Open(const char *path)
+{
+    m_path = path;
+#ifdef _WIN32
+#ifdef TERMINAL_SERVER
+	CW2T utf8Path(CA2W(path, CP_UTF8));
+    // m_fd = _open(path, O_RDWR);
+	m_fd = CreateFile(utf8Path,            //port name 
+		GENERIC_READ | GENERIC_WRITE, //Read/Write   				 
+		0,            // No Sharing                               
+		NULL,         // No Security                              
+		OPEN_EXISTING,// Open existing port only                     
+		0,            // Non Overlapped I/O                           
+		NULL);        // Null for Comm Devices
+	if (m_fd == INVALID_HANDLE_VALUE)
+	{
+		return false;
+	}
+#endif
+	return false;
+#else
+	m_fd = open(path, O_RDWR);
+
+    if (m_fd < 0) {
+        perror("open");
+        return false;
+    }
+#endif
+    spi_master_init();
+
+    return true;
+}
+
+void SpiPort::Close()
+{
+#ifdef _WIN32
+#ifdef TERMINAL_SERVER
+	if (m_fd != INVALID_HANDLE_VALUE)
+	{
+		CloseHandle(m_fd);
+		m_fd = INVALID_HANDLE_VALUE;
+	}
+#endif
+#else
+	if (m_fd > 0)
+	{
+		close(m_fd);
+		m_fd = 0;
+	}
+#endif
+}
+
+bool SpiPort::IsOpened() const
+{
+#ifdef _WIN32
+#ifdef TERMINAL_SERVER
+	return m_fd != INVALID_HANDLE_VALUE;
+#else
+	return false;
+#endif
+#else
+	return m_fd > 0;
+#endif
+}
+
+int SpiPort::spi_transfer(uint8_t *txbuf, uint8_t *rxbuf, int bytes)
+{
+    int    status = 0;
+
+#ifdef _WIN32
+
+	// BOOL res = DeviceIoControl();
+	// status = res ? 0 : -1;
+#else
+
+#if 0
+    struct spi_ioc_transfer    xfer[2];
+    memset(xfer, 0, sizeof(xfer));
+    xfer[0].tx_buf = (__u64)txbuf;
+    xfer[0].rx_buf = (__u64)rxbuf;
+    xfer[0].len = bytes;
+    xfer[0].delay_usecs = 2;
+
+    status = ioctl(m_fd, SPI_IOC_MESSAGE(1), xfer);
+#else
+    struct spi_ioc_transfer    xfer;
+    memset(&xfer, 0, sizeof(xfer));
+    xfer.tx_buf = (__u64)txbuf;
+    xfer.rx_buf = (__u64)rxbuf;
+    xfer.len = bytes;
+    xfer.delay_usecs = 2;
+
+    status = ioctl(m_fd, SPI_IOC_MESSAGE(1), &xfer);
+#endif
+    if (status < 0)
+    {
+        perror("SPI_IOC_MESSAGE");
+        return -1;
+    }
+#endif
+
+    return status;
+}
+
+void SpiPort::spi_master_init()
+{
+	uint8_t    mode = 3;
+	uint8_t    lsb = 0;
+	uint8_t    bits = 8;
+    //uint32_t    speed = 30000000;
+    uint32_t      speed = 2000000;
+    //uint32_t    speed = 2000000;
+    //uint32_t    speed = 33000000;
+
+    // SPI_IOC_WR_MODE
+    int res = 0;
+
+#ifdef __ANDROID__
+    res = ioctl(m_fd, SPI_IOC_WR_MODE, &mode);
+    res = ioctl(m_fd, SPI_IOC_WR_MAX_SPEED_HZ, &speed);
+    res = ioctl(m_fd, SPI_IOC_WR_LSB_FIRST, &lsb);
+
+    if (ioctl(m_fd, SPI_IOC_RD_MODE, &mode) < 0)
+    {
+        perror("SPI rd_mode");
+        return;
+    }
+
+    if (ioctl(m_fd, SPI_IOC_RD_LSB_FIRST, &lsb) < 0)
+    {
+        perror("SPI rd_lsb_fist");
+        return;
+    }
+
+    if (ioctl(m_fd, SPI_IOC_RD_BITS_PER_WORD, &bits) < 0)
+    {
+        perror("SPI rd bits_per_word");
+        return;
+    }
+
+    if (ioctl(m_fd, SPI_IOC_RD_MAX_SPEED_HZ, &speed) < 0)
+    {
+        perror("SPI rd max_speed_hz");
+        return;
+    }
+
+    __android_log_print(ANDROID_LOG_INFO, TAG_SPI, "%s: spi mode %d, %d bits %sper word, %d Hz max\n", m_path.c_str(), mode, bits, lsb ? "(lsb first) " : "", speed);
+#endif
+
+    //printf("%s: spi mode %d, %d bits %sper word, %d Hz max\n",
+    //    name, mode, bits, lsb ? "(lsb first) " : "", speed);
+}
+
+int SpiPort::delay(int x)
+{
+#ifdef _WIN32
+    std::this_thread::sleep_for(std::chrono::milliseconds(x));
+#else
+    usleep(x);
+#endif
+    return 0;
+}
--- a/test6/app/src/main/cpp/SpiPort.h
+++ b/test6/app/src/main/cpp/SpiPort.h
@ -0,0 +1,44 @@
+#ifndef TESTCOMM_SPIPORT_H
+#define TESTCOMM_SPIPORT_H
+
+#ifdef _WIN32
+#ifdef TERMINAL_SERVER
+#include <winsock2.h>
+#include <Windows.h>
+#endif
+#else
+#include <stdint.h>
+#endif
+#include <string>
+using namespace std;
+
+class SpiPort {
+public:
+
+    SpiPort();
+    virtual ~SpiPort();
+
+    bool Open(const char* path);
+    void Close();
+	bool IsOpened() const;
+
+    int spi_transfer(uint8_t *txbuf, uint8_t *rxbuf, int bytes);
+    void spi_master_init();
+    static int delay(int x);
+
+protected:
+    std::string m_path;
+
+#ifdef _WIN32
+#ifdef TERMINAL_SERVER
+	HANDLE m_fd;
+#endif
+#else
+    int m_fd;
+#endif
+};
+
+
+
+
+#endif //TESTCOMM_SPIPORT_H
--- a/test6/app/src/main/cpp/chip.cpp
+++ b/test6/app/src/main/cpp/chip.cpp
@ -0,0 +1,153 @@
+#include "chip.h"
+#include "NrsecPort.h"
+#include "GPIOControl.h"
+
+/* 生成动态库名称为libchip.so*/
+
+#define SPI_NODE "/dev/spidev0.0"
+NrsecPort m_nrsec;
+bool nrsec_flag= false;
+/* 
+ * 打开设备，初始化资源...
+ * 成功返回1，错误返回0
+ */
+
+int chip_init()
+{
+    GpioControl::setCam3V3Enable(true);
+    GpioControl::setSpiPower(true);
+    if(nrsec_flag==false)
+    {
+        bool ret = m_nrsec.Open(SPI_NODE);
+        if (ret == 1)
+        {
+            nrsec_flag = true;
+        }
+        return ret;
+
+    }
+    else{
+        return 0;
+    }
+}
+
+/* 
+ * 关闭设备，释放资源...
+ */
+void chip_finish()
+{
+    m_nrsec.Close();   
+    GpioControl::setSpiPower(false);
+    GpioControl::setCam3V3Enable(false);
+    nrsec_flag=false;
+}
+
+/* 
+ * 调用芯片完成sm2签名运算，输入32字节，已HASH，输出64字节
+ * 成功返回1，错误返回0
+ */
+int chip_sm2_sign(unsigned char *from, unsigned int flen,
+    unsigned char *to, unsigned int *tlen)
+{
+    int ret = m_nrsec.SM2Sign(0,from,to);
+    if(ret ==1)
+    {
+        *tlen =64;
+    }
+    else{
+        *tlen =0;
+    }
+    return ret;  
+}
+    
+/* 
+ * 调用芯片完成sm2验签运算，输入from 32字节，已HASH，输入sig 64字节
+ * 成功返回1，错误返回0
+ */
+int chip_sm2_verify(unsigned char *from, unsigned int flen,
+    unsigned char *sig, unsigned int siglen)
+{
+    int ret =m_nrsec.SM2VerifySign(0,from,sig);
+
+    return ret;
+}
+
+/* 
+ * 调用芯片完成sm3运算，输入d，输入长度n，输出md，32字节
+ * 成功返回1，错误返回0
+ */
+int chip_sm3(const unsigned char *d, unsigned int n, unsigned char *md)
+{
+    uint8_t * cert = NULL;
+    uint8_t len = 0;
+    cert = (uint8_t *) malloc(64);
+    memset(cert,0,64);
+    int ret = m_nrsec.SM2ExportPublicKey(0,cert,&len);
+    if( ret == 0)
+    {
+        free(cert);
+        return ret;
+    }
+    uint8_t * pucID = NULL;
+    pucID = (uint8_t *) malloc(16);
+    memset(pucID,0,16);
+    memset(pucID,1,16);
+
+    ret = m_nrsec.SM3Hash((uint8_t*)d,len,md,cert,pucID,16);
+
+    free(pucID);
+    free(cert);
+    return ret;
+}
+
+/* 
+ * 调用芯片生成随机数，输入n，表示需要生成的随机数的长度，输出random
+ * 成功返回1，错误返回0
+ */
+int chip_rand(unsigned int n, unsigned char *random)
+{
+    int ret =m_nrsec.Random(random,n);
+   
+    return ret;
+}
+
+/* 
+ * 调用芯片完成sm1运算，加解密模式CBC
+ * 输入key 16字节，输入iv 16字节，
+ * 输入enc，1表示加密，0表示解密
+ * 输入in，16倍数，输入长度inlen，输出out
+ * 成功返回1，错误返回0
+ */
+int chip_sm1(unsigned char *key, unsigned char *iv, int enc,
+        unsigned char *in, unsigned int inlen, unsigned char *out)
+{
+    unsigned char ak[16]={0};
+    int ret =m_nrsec.SM1ImportKey(key,ak);
+    if(ret == 0)
+    {
+        return ret;
+    }
+    ret =m_nrsec.ImportIV(iv,16);
+    if(ret == 0)
+    {
+        return ret;
+    }
+    uint16_t outlen;
+    if(enc==1)
+    {
+        ret = m_nrsec.SM1Encrypt(in,inlen,out, &outlen);
+        if(ret == 0)
+        {
+            return ret;
+        }
+
+    }
+    else{
+        ret = m_nrsec.SM1Decrypt(in,inlen,out, &outlen);
+        if(ret == 0)
+        {
+            return ret;
+        }
+    }
+    return ret;
+}
--- a/test6/app/src/main/cpp/chip.h
+++ b/test6/app/src/main/cpp/chip.h
@ -0,0 +1,64 @@
+#ifndef __CHIP_H__
+#define __CHIP_H__
+
+/* 生成动态库名称为libchip.so*/
+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif
+#endif /* __cplusplus */
+/*
+ * 打开设备，初始化资源...
+ * 成功返回1，错误返回0
+ */
+int chip_init();
+
+/*
+ * 关闭设备，释放资源...
+ */
+void chip_finish();
+
+/*
+ * 调用芯片完成sm2签名运算，输入32字节，已HASH，输出64字节
+ * 成功返回1，错误返回0
+ */
+int chip_sm2_sign(unsigned char *from, unsigned int flen,
+                  unsigned char *to, unsigned int *tlen);
+
+/*
+ * 调用芯片完成sm2验签运算，输入from 32字节，已HASH，输入sig 64字节
+ * 成功返回1，错误返回0
+ */
+int chip_sm2_verify(unsigned char *from, unsigned int flen,
+                    unsigned char *sig, unsigned int siglen);
+
+/*
+ * 调用芯片完成sm3运算，输入d，输入长度n，输出md，32字节
+ * 成功返回1，错误返回0
+ */
+int chip_sm3(const unsigned char *d, unsigned int n, unsigned char *md);
+
+/*
+ * 调用芯片生成随机数，输入n，表示需要生成的随机数的长度，输出random
+ * 成功返回1，错误返回0
+ */
+int chip_rand(unsigned int n, unsigned char *random);
+
+/*
+ * 调用芯片完成sm1运算，加解密模式CBC
+ * 输入key 16字节，输入iv 16字节，
+ * 输入enc，1表示加密，0表示解密
+ * 输入in，16倍数，输入长度inlen，输出out
+ * 成功返回1，错误返回0
+ */
+int chip_sm1(unsigned char *key, unsigned char *iv, int enc,
+             unsigned char *in, unsigned int inlen, unsigned char *out);
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif /* __cplusplus */
+
+
+#endif /* __DS_NRSEC_STRUCT_H__ */
--- a/test6/app/src/main/cpp/native-lib.cpp
+++ b/test6/app/src/main/cpp/native-lib.cpp
@ -0,0 +1,73 @@
+#include <jni.h>
+#include <string>
+#include "chip.h"
+#include <android/log.h>
+#include <unistd.h>
+#include <vector>
+
+#define TAG_Test "TESTCHIP"
+
+using namespace std;
+
+extern "C" JNIEXPORT jstring JNICALL
+Java_com_example_test3_MainActivity_stringFromJNI(
+        JNIEnv* env,
+        jobject /* this */) {
+
+    int ret = chip_init();
+    __android_log_print(ANDROID_LOG_INFO, TAG_Test, "chip_init status %d", ret);
+
+    sleep(1);
+
+    vector<uint8_t> data(32,1);
+    vector<uint8_t> hash(32,1);
+    vector<uint8_t> sign(64,0);
+    //uint8_t pbdata[64]={0x64,0x3c,0xd1,0x20,0x7f,0x42,0xcd,0xc7,0xac,0xa1,0xe8,0x12,0x92,0x24,0x58,0x76,0x2f,0x40,0xc5,0x1f,0xd8,0x18,0x78,0x69,0x2b,0xca,0x4c,0x8a,0x8e,0x75,0xcb,0xda,0xda,0x22,0x2f,0xb9,0x7d,0xb8,0x67,0x16,0x0d,0x81,0x39,0x8d,0xf1,0x09,0x4f,0xcf,0x51,0xf9,0xdc,0x71,0x20,0x40,0xe5,0x4d,0x52,0xb5,0xc5,0x74,0x85,0xe6,0xbb,0x65};
+    vector<uint8_t> pucid(16,1);
+
+    unsigned int len=1;
+
+    ret = chip_sm3(&data[0],32,&hash[0]);
+    __android_log_print(ANDROID_LOG_INFO, TAG_Test, "chip_sm3_all status %d ", ret);
+    sleep(1);
+
+
+    ret = chip_sm2_sign(&hash[0],32,&sign[0],&len);
+    __android_log_print(ANDROID_LOG_INFO, TAG_Test, "chip_sm2_sign status %d,len=%d", ret,len);
+    for(int i=0;i<len;i++)
+    {
+        __android_log_print(ANDROID_LOG_INFO, TAG_Test, "chip_sm2_sign value %d ", sign[i]);
+    }
+
+    sleep(1);
+
+    ret= chip_sm2_verify(&hash[0],32,&sign[0],len);
+    __android_log_print(ANDROID_LOG_INFO, TAG_Test, "chip_sm2_verify %d", ret);
+
+    //vector<uint8_t> data(16,0);
+    //ret = chip_rand(16,&data[0]);
+    //__android_log_print(ANDROID_LOG_INFO, TAG_Test, "chip_rand %d", ret);
+
+    vector<uint8_t> DK(16,1);
+    vector<uint8_t> IV(16,1);
+    data.clear();
+    data.resize(16,2);
+    vector<uint8_t> edata(16,0);
+    ret = chip_sm1(&DK[0],&IV[0],1,&data[0],16,&edata[0]);
+
+    sleep(1);
+    vector<uint8_t> edata2(16,0);
+    ret = chip_sm1(&DK[0],&IV[0],0,&edata[0],16,&edata2[0]);
+
+    for(int i=0;i<16;i++)
+    {
+        __android_log_print(ANDROID_LOG_INFO, TAG_Test, "chip_sm1 %d value %d ", i, edata2[i]);
+    }
+
+
+
+    chip_finish();
+
+    std::string hello = "Hello from C++";
+    return env->NewStringUTF(hello.c_str());
+}
--- a/test6/app/src/main/java/com/example/test6/MainActivity.java
+++ b/test6/app/src/main/java/com/example/test6/MainActivity.java
@ -0,0 +1,36 @@
+package com.example.test6;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+import android.widget.TextView;
+
+import com.example.test6.databinding.ActivityMainBinding;
+
+public class MainActivity extends AppCompatActivity {
+
+    // Used to load the 'test6' library on application startup.
+    static {
+        System.loadLibrary("test6");
+    }
+
+    private ActivityMainBinding binding;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        binding = ActivityMainBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        // Example of a call to a native method
+        TextView tv = binding.sampleText;
+        tv.setText(stringFromJNI());
+    }
+
+    /**
+     * A native method that is implemented by the 'test6' native library,
+     * which is packaged with this application.
+     */
+    public native String stringFromJNI();
+}
--- a/test6/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/test6/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
--- a/test6/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/test6/app/src/main/res/drawable/ic_launcher_background.xml
@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
--- a/test6/app/src/main/res/layout/activity_main.xml
+++ b/test6/app/src/main/res/layout/activity_main.xml
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <TextView
+        android:id="@+id/sample_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Hello World!"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/test6/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/test6/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
--- a/test6/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/test6/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
--- a/test6/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ b/test6/app/src/main/res/mipmap-hdpi/ic_launcher.webp
--- a/test6/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ b/test6/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
--- a/test6/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ b/test6/app/src/main/res/mipmap-mdpi/ic_launcher.webp
--- a/test6/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ b/test6/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
--- a/test6/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ b/test6/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
--- a/test6/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ b/test6/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
--- a/test6/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ b/test6/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
--- a/test6/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ b/test6/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
--- a/test6/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
+++ b/test6/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
--- a/test6/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
+++ b/test6/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
--- a/test6/app/src/main/res/values-night/themes.xml
+++ b/test6/app/src/main/res/values-night/themes.xml
@ -0,0 +1,16 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.Test6" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/purple_200</item>
+        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorOnPrimary">@color/black</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_200</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
--- a/test6/app/src/main/res/values/colors.xml
+++ b/test6/app/src/main/res/values/colors.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+</resources>
--- a/test6/app/src/main/res/values/strings.xml
+++ b/test6/app/src/main/res/values/strings.xml
@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">test6</string>
+</resources>
--- a/test6/app/src/main/res/values/themes.xml
+++ b/test6/app/src/main/res/values/themes.xml
@ -0,0 +1,16 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.Test6" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/purple_500</item>
+        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
--- a/test6/app/src/main/res/xml/backup_rules.xml
+++ b/test6/app/src/main/res/xml/backup_rules.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample backup rules file; uncomment and customize as necessary.
+   See https://developer.android.com/guide/topics/data/autobackup
+   for details.
+   Note: This file is ignored for devices older that API 31
+   See https://developer.android.com/about/versions/12/backup-restore
+-->
+<full-backup-content>
+    <!--
+   <include domain="sharedpref" path="."/>
+   <exclude domain="sharedpref" path="device.xml"/>
+-->
+</full-backup-content>
--- a/test6/app/src/main/res/xml/data_extraction_rules.xml
+++ b/test6/app/src/main/res/xml/data_extraction_rules.xml
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample data extraction rules file; uncomment and customize as necessary.
+   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
+   for details.
+-->
+<data-extraction-rules>
+    <cloud-backup>
+        <!-- TODO: Use <include> and <exclude> to control what is backed up.
+        <include .../>
+        <exclude .../>
+        -->
+    </cloud-backup>
+    <!--
+    <device-transfer>
+        <include .../>
+        <exclude .../>
+    </device-transfer>
+    -->
+</data-extraction-rules>
--- a/test6/app/src/test/java/com/example/test6/ExampleUnitTest.java
+++ b/test6/app/src/test/java/com/example/test6/ExampleUnitTest.java
@ -0,0 +1,17 @@
+package com.example.test6;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
--- a/test6/build.gradle
+++ b/test6/build.gradle
@ -0,0 +1,5 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    id 'com.android.application' version '8.0.0' apply false
+    id 'com.android.library' version '8.0.0' apply false
+}
--- a/test6/gradle.properties
+++ b/test6/gradle.properties
@ -0,0 +1,21 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
--- a/test6/gradle/wrapper/gradle-wrapper.jar
+++ b/test6/gradle/wrapper/gradle-wrapper.jar
--- a/test6/gradle/wrapper/gradle-wrapper.properties
+++ b/test6/gradle/wrapper/gradle-wrapper.properties
@ -0,0 +1,6 @@
+#Thu Aug 01 15:31:22 CST 2024
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.0-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
--- a/test6/gradlew
+++ b/test6/gradlew
@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
--- a/test6/gradlew.bat
+++ b/test6/gradlew.bat
@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/test6/settings.gradle
+++ b/test6/settings.gradle
@ -0,0 +1,18 @@
+pluginManagement {
+    repositories {
+        maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
+        maven { url 'https://maven.aliyun.com/repository/google' }
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+rootProject.name = "test6"
+include ':app'