From b2805dfefe2ecda69a90b005ab40ac12fb618708 Mon Sep 17 00:00:00 2001
From: hyx <dylan1949@163.com>
Date: Wed, 9 Apr 2025 12:40:51 +0800
Subject: [PATCH] fix T->t modify getLocalip upto v1.1.8

---
 cp.sh     |  2 +-
 main.c    | 21 +++++++++++++++------
 mymake.sh |  4 ++--
 ssh.sh    |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/cp.sh b/cp.sh
index 0207356..b59da6d 100755
--- a/cp.sh
+++ b/cp.sh
@@ -1,4 +1,4 @@
-sshpass -p "PddloTSecPwdOnly!" scp ./output/bin/tx_server root@10.10.10.225:/home/linaro/
+sshpass -p "PddloTSecPwdOnly!" scp ./output/bin/tx_server root@192.168.0.148:/home/linaro/
 #sshpass -p "PddloTSecPwdOnly!" scp ./output/bin/tx_server root@10.10.10.132:/root/
 #sshpass -p "PddloTSecPwdOnly!" scp ./start.sh root@10.10.10.225:/root/
 #sshpass -p "PddloTSecPwdOnly!" scp ./start.sh root@10.10.10.132:/root/
diff --git a/main.c b/main.c
index 1fa8453..f0589aa 100644
--- a/main.c
+++ b/main.c
@@ -36,7 +36,7 @@ int fd;
 int UPCASE=0;
 int count_value=0;
 int getPayloadTime=120*1000;//usecond
-char softwareVersion[16]="1.1.7";
+char softwareVersion[16]="1.1.8";
 char stationsn[16]="TJ251372224247";//TJ250995217957
 char productid[8]="10045";
 char appKey[32]="fdhQmhqhvbL1cf1K9mUqt";
@@ -334,7 +334,7 @@ int readQrcode()
                         if(UPCASE==1){
                             input_value[count_value]='T';
                         }else{
-                            input_value[count_value]='t';
+                            input_value[count_value]='T';
                         }
                         UPCASE=0;
                         count_value++;
@@ -1447,9 +1447,13 @@ void hmacsha1(char *key,char* data,char *signbase64,int signbase64_len){
 
 void getLocalIp(char *local_ip){
     char hostname[32]={0};
-    gethostname(hostname,32);
-    LOG_I("hostname:%s\n",hostname);
-    get_ip_by_domain(hostname, local_ip, 32);
+    FILE *fp;
+    char buffer[64]={0};
+    //get_ip_by_domain(hostname, local_ip, 32);
+    fp=popen("ifconfig eth0 | grep 'inet' | awk '{print $2}' | cut -d':' -f2","r");
+    fgets(buffer,sizeof(buffer),fp);
+    LOG_I("buffer:%s\n",buffer);
+    memcpy(local_ip,buffer,strlen(buffer)-1);
 }
 
 void saveStartUpTime(){
@@ -1602,7 +1606,12 @@ int main(int argc, char *argv[])
         readresult=NULL;
         LOG_I("saved mqttRawPassword:%s\n",mqttRawPassword);
     }else{
-        getDevRawPassword(stationsn);
+        if((ping("8.8.8.8") == 0)||(ping("8.8.4.4") == 0)){
+            getDevRawPassword(stationsn);
+        }else{
+            LOG_I("getDevRawPassword net not ready\n");
+            sleep(3);
+        }
     }
 
     readresult=file_to_buffer("LightEnable",&len);
diff --git a/mymake.sh b/mymake.sh
index c7f7bdd..c4fd06c 100755
--- a/mymake.sh
+++ b/mymake.sh
@@ -1,6 +1,6 @@
 . compile.sh
-rm -fr output
-mkdir output
+#rm -fr output
+#mkdir output
 cd output
 cmake ..
 make
diff --git a/ssh.sh b/ssh.sh
index 3569057..a08131d 100755
--- a/ssh.sh
+++ b/ssh.sh
@@ -1,2 +1,2 @@
 #sshpass -p "PddloTSecPwdOnly!" ssh root@10.10.10.132 
-sshpass -p "PddloTSecPwdOnly!" ssh root@10.10.10.225
+sshpass -p "PddloTSecPwdOnly!" ssh root@192.168.0.148