[fix]修改SSH账号密码

libraries/mogo-adas/README.md

@@ -4,18 +4,6 @@
 
 # 使用方法参见【app_ipc_monitoring】中的代码
 
-## 工控机账号密码
-~~~
-RSA密钥
-privateBase64=MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEA127FFvuPolaxYTBg5wkyDIrEbcNKXoIjf0bK7QUQ991Lsbv5Ktv/XM2F6qJFssVF1KTkStVBSQGxJB1eZLwJEwIDAQABAkBM39AgpV/Z1Amz3qmVh+h+JT521ItDMjksf7yF25r0dzGjOfGLQmMAqQXT68B+cQX5HSoFMwk/rE1hnXgifyNBAiEA6uNE2TfPj51mPOZztGy1Q8p4exWohfotiy64g/CyVeMCIQDqy9e7bGeZEi6p1zemEgFVtwgZZvLn/BOP4UO7NjJnEQIhAJBnprUwha/SYb+BIpNC3fHOcWGigBfWJdfSomejO9BnAiEApfojLqKbOWHZCsbQ19yyhN02JH7aB5PyYCtlrdnKF4ECIHR1P2LOQLddXO8PwgoF6gtCTO2sxIqdvu8fUruWyouQ
-publicBase64=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANduxRb7j6JWsWEwYOcJMgyKxG3DSl6CI39Gyu0FEPfdS7G7+Srb/1zNheqiRbLFRdSk5ErVQUkBsSQdXmS8CRMCAwEAAQ==
-
-工控机SSH
-账号:titan
-密码:mogo@ZHIDAO10
-加密后的密码:Lz71dnr3eEbcXbuRqSBuLPTk9N7vfqL1lkV1FvAzrLE45OslTvAmm0ekjXIuvOz3jw4hh/saV5pxc3ywNubnjQ==
-~~~
-
 ## 可用接口
 ~~~java
     /**

libraries/mogo-adas/build.gradle

@@ -22,6 +22,11 @@ android {
         versionName rootProject.versionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
+        externalNativeBuild {
+            ndk {
+                abiFilters 'armeabi-v7a', 'arm64-v8a'
+            }
+        }
     }
 
     buildTypes {
@@ -31,8 +36,9 @@ android {
         }
     }
 
-//    sourceSets {
-//        main {
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs']
 //            java {
 //                srcDir 'src/main/java'
 //            }
@@ -41,8 +47,8 @@ android {
 //                srcDir 'src/main/proto'
 //                include '**/*.proto'
 //            }
-//        }
-//    }
+        }
+    }
 //
 //    protobuf {
 //        protoc {

libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java

@@ -24,6 +24,7 @@ import com.zhidao.support.adas.high.common.ProtocolStatus;
 import com.zhidao.support.adas.high.common.RSATool;
 import com.zhidao.support.adas.high.common.RegexUtils;
 import com.zhidao.support.adas.high.common.SSH;
+import com.zhidao.support.adas.high.common.SSHTool;
 import com.zhidao.support.adas.high.common.ThreadPoolManager;
 import com.zhidao.support.adas.high.msg.IMsg;
 import com.zhidao.support.adas.high.msg.MyMessageFactory;
@@ -212,11 +213,11 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
                 @Override
                 public void run() {
                     ssh = new SSH();
-                    String encodePwd = "Lz71dnr3eEbcXbuRqSBuLPTk9N7vfqL1lkV1FvAzrLE45OslTvAmm0ekjXIuvOz3jw4hh/saV5pxc3ywNubnjQ==";
-                    String privateKey = "MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEA127FFvuPolaxYTBg5wkyDIrEbcNKXoIjf0bK7QUQ991Lsbv5Ktv/XM2F6qJFssVF1KTkStVBSQGxJB1eZLwJEwIDAQABAkBM39AgpV/Z1Amz3qmVh+h+JT521ItDMjksf7yF25r0dzGjOfGLQmMAqQXT68B+cQX5HSoFMwk/rE1hnXgifyNBAiEA6uNE2TfPj51mPOZztGy1Q8p4exWohfotiy64g/CyVeMCIQDqy9e7bGeZEi6p1zemEgFVtwgZZvLn/BOP4UO7NjJnEQIhAJBnprUwha/SYb+BIpNC3fHOcWGigBfWJdfSomejO9BnAiEApfojLqKbOWHZCsbQ19yyhN02JH7aB5PyYCtlrdnKF4ECIHR1P2LOQLddXO8PwgoF6gtCTO2sxIqdvu8fUruWyouQ";
+                    String encodePwd = SSHTool.getEncodePwd();
+                    String privateKey = SSHTool.getPrivateKey();
                     try {
                         String pwd = RSATool.decodeByPrivateKey(encodePwd, Base64.decodeBase64(privateKey));
-                        ssh.connect(ipcConnectedIp, 22, "titan", pwd);
+                        ssh.connect(ipcConnectedIp, 22, "reset", pwd);
                         SSHResult result = ssh.exec(cmd, pwd);
                         if (mAdasListener != null)
                             mAdasListener.onSSHResult(result);

libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/SSHTool.java

@@ -0,0 +1,12 @@
+package com.zhidao.support.adas.high.common;
+
+public class SSHTool {
+    static {
+        System.loadLibrary("sshtool");
+    }
+
+    public static native String getEncodePwd();
+
+    public static native String getPrivateKey();
+
+}