Change config add jar.

milesking · Oct 16, 2019 · dfde284 · dfde284
1 parent a461939
commit dfde284
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/CarLife-Android-Vehicle/ant.properties b/CarLife-Android-Vehicle/ant.properties
@@ -10,10 +10,17 @@
 proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard.cfg
 
 # Project target.
+#target=android-21
+#key.store=carlife.keystore
+#key.store.password=m5ZRYQe4yrpm6jdx
+#key.alias=carlife.keystore
+#key.alias.password=m5ZRYQe4yrpm6jdx
+#javaoption.test=false
+#android.library=false
 target=android-21
 key.store=carlife.keystore
-key.store.password=m5ZRYQe4yrpm6jdx
-key.alias=carlife.keystore
-key.alias.password=m5ZRYQe4yrpm6jdx
+key.store.password=android
+key.alias=androiddebugkey
+key.alias.password=android
 javaoption.test=false
-android.library=false
+android.library=false
diff --git a/CarLife-Android-Vehicle/assets/bdcf b/CarLife-Android-Vehicle/assets/bdcf
@@ -44,7 +44,7 @@ MEDIA_SAMPLE_RATE = 0
 CONNECT_TYPE_ANDROID = 1
 
 # Iphone手机的连接类型 1:Wifi 2:保留 4:EAP  5:UsbMuxd
-CONNECT_TYPE_IPHONE = 4
+CONNECT_TYPE_IPHONE = 1
 
 #Next song
 #KEYCODE_SEEK_ADD = 23

diff --git a/CarLife-Android-Vehicle/libs/JavaPNS_2.2.jar b/CarLife-Android-Vehicle/libs/JavaPNS_2.2.jar
diff --git a/CarLife-Android-Vehicle/project.properties b/CarLife-Android-Vehicle/project.properties
@@ -13,7 +13,7 @@
 # Project target.
 target=android-21
 #ndk.dir=c:\\android-ndk-r7b
-sdk.dir=D:\\android-sdk-windows
+sdk.dir=/Users/mileshome/Library/Android/sdk
 key.store=carlife.keystore
 key.store.password=m5ZRYQe4yrpm6jdx
 key.alias=carlife.keystore

diff --git a/CarLife-Android-Vehicle/src/com/baidu/carlifevehicle/connect/EanConnectManager.java b/CarLife-Android-Vehicle/src/com/baidu/carlifevehicle/connect/EanConnectManager.java
@@ -108,7 +108,7 @@ public void eanUinit() {
         eaNativeFd = NAGATIVE;
         stopEanReadThread();
         stopSocketReadThread();
-        JniEanMethod.closeEan();
+//        JniEanMethod.closeEan();
         LogUtil.e(TAG, "Close ean port /dev/mfi-ean");
     }
 
@@ -650,7 +650,7 @@ public void run() {
                     }
                     eanDataLen = JniEanMethod.eanRead(eanData, EAN_BULK_BUFFER_SIZE);
                     if (eanDataLen < 0) {
-                        JniEanMethod.closeEan();
+//                        JniEanMethod.closeEan();
 //                        devStatus = JniEanMethod.openEan();
                         if (NAGATIVE == devStatus) {
                             LogUtil.e(TAG, "read thread Open ean port /dev/mfi-ean failed devStatus = " + devStatus);

diff --git a/CarLife-Android-Vehicle/src/com/baidu/carlifevehicle/util/CarlifeConfUtil.java b/CarLife-Android-Vehicle/src/com/baidu/carlifevehicle/util/CarlifeConfUtil.java
@@ -310,11 +310,11 @@ private int readBdcf() {
         String line = null;
         String[] keyValue = null;
         int linenum = 1;
+        propertyMap = new HashMap<String, String>();
 
         try {
             bdcf = new File(CONF_FILE_DIR + "/" + CONF_FILE);
             reader = new BufferedReader(new FileReader(bdcf));
-            propertyMap = new HashMap<String, String>();
 
             while ((line = reader.readLine()) != null) {
                 LogUtil.d(TAG, "line " + linenum + ": " + line);
@@ -352,8 +352,8 @@ private int readBdcf() {
             propertyMap.put("FOCUS_UI", "false");
             propertyMap.put("MEDIA_SAMPLE_RATE", "0");
             propertyMap.put("CONNECT_TYPE_ANDROID", "1");
-            propertyMap.put("CONNECT_TYPE_IPHONE", "4");
-            propertyMap.put("AUDIO_TRANSMISSION_MODE=0");
+            propertyMap.put("CONNECT_TYPE_IPHONE", "1");
+            propertyMap.put("AUDIO_TRANSMISSION_MODE", "0");
             propertyMap.put("CONTENT_ENCRYPTION", "true");
             propertyMap.put("ENGINE_TYPE", "0");
         } catch (Exception e) {