2020-09-24 1.修改MQTTSDK引用方式，修复闪退问题。

JLChen

2020-09-24 e91af284643d5e370b0d18c384fe8de65f59d9b3

2020-09-24 1.修改MQTTSDK引用方式，修复闪退问题。

 Android_HDL_SDK_XW/.idea/encodings.xml

File was deleted

 Android_HDL_SDK_XW/.idea/jarRepositories.xml

New file
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="RemoteRepositoriesConfiguration">
    <remote-repository>
      <option name="id" value="central" />
      <option name="name" value="Maven Central repository" />
      <option name="url" value="https://repo1.maven.org/maven2" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="jboss.community" />
      <option name="name" value="JBoss Community repository" />
      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="MavenRepo" />
      <option name="name" value="MavenRepo" />
      <option name="url" value="https://repo.maven.apache.org/maven2/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="maven" />
      <option name="name" value="maven" />
      <option name="url" value="https://maven.google.com" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="BintrayJCenter" />
      <option name="name" value="BintrayJCenter" />
      <option name="url" value="https://jcenter.bintray.com/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="Google" />
      <option name="name" value="Google" />
      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="$USER_HOME$/Library/Android/sdk/extras/google/m2repository" />
      <option name="name" value="$USER_HOME$/Library/Android/sdk/extras/google/m2repository" />
      <option name="url" value="file:$USER_HOME$/Library/Android/sdk/extras/google/m2repository" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="$USER_HOME$/Library/Android/sdk/extras/android/m2repository" />
      <option name="name" value="$USER_HOME$/Library/Android/sdk/extras/android/m2repository" />
      <option name="url" value="file:$USER_HOME$/Library/Android/sdk/extras/android/m2repository/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="$USER_HOME$/Library/Android/sdk/extras/m2repository" />
      <option name="name" value="$USER_HOME$/Library/Android/sdk/extras/m2repository" />
      <option name="url" value="file:$USER_HOME$/Library/Android/sdk/extras/m2repository" />
    </remote-repository>
  </component>
</project>

 Android_HDL_SDK_XW/README.md

@@ -2,66 +2,7 @@

HDL XW Android SDK  Copyright (c) 2019 HDL Inc.

SDK ç‰ˆæœ¬ï¼šhdl_lib_v1.6.9.20200316_beta
1.增加小类是3的音乐播放器支持;
2.加地热模块单独控制温度接口，接口自动根据当前模式设置当前模式的温度参数，不需要上层自己判断;(HDLCommand.geothermalCtrlTemp())
3.增加简易编程搜索回复,通过配置大类小类，让声必可设备模拟成第三方音乐播放器被搜索 ;
//配置简易编程搜索的参数 (SDK åˆå§‹åŒ–的时候配置一次)
/**
 * é…ç½®ç®€æ˜“编程搜索返回的默认参数
 * @param mSDKLocalBigClass å¤§ç±»ID
 * @param mSDKLocalSmallClass å°ç±»ID
 * @param mSDKLocalRemark å¤‡æ³¨
 */
public static void setEasyProgrammingSearchLocalData(int mSDKLocalBigClass, int mSDKLocalSmallClass, String mSDKLocalRemark);
声必可设备setEasyProgrammingSearchLocalData(9,1,"声必可音乐");

原地热对应关系  
HDL å£°å¿…可
普通 è‡ªåŠ¨
白天 æ‰‹åŠ¨
离开 ä¼‘眠
2020-03-15 ä¿®æ”¹ä¸º
HDL å£°å¿…可
普通 æ‰‹åŠ¨
白天 è‡ªåŠ¨
离开 ä¼‘眠

SDK ç‰ˆæœ¬ï¼šhdl_lib_v1.6.9.20200118_beta
1.修复RCU混合调光混合开关 ç±»æ¨¡å—，使用物理回路问题;
2.增加默认获取WiFi连接的广播配置方法;


SDK ç‰ˆæœ¬ï¼šhdl_lib_v1.6.8.20191016_beta
1.控制都改成广播形式了，不记录一端口的IP。


SDK ç‰ˆæœ¬ï¼šhdl_lib_v1.6.4.20191015_beta
1.增加搜索完设备或者备注刷新完，自动保存一次数据到本地。
2.增加读取本地数据接口；
3.增加刷新所有设备的备注和状态接口；

接口说明：
    /**
     * è¯»å–和加载本地数据
     */
    private void getLocalDevicesDataList() {
        devicesDatas = HDLDeviceManager.getLocalDevicesDataList();
        if (devicesDatas.size() > 0) {
            updateDeviceListView();
            HandleSearch.refreshAllDevicesStateAndRemarks();//如果本地有数据，可以调用该方法，遍历发送指令，刷新所有设备的备注和状态
        } else {
            //showToast("本地数据为空");
        }
    }

/**保存数据到本地接口，除SDK自动保存后，上层可以选择手动调用保存*/
HDLDeviceManager.saveDevicesDataList();


提供声必可SDK项目

##Version 1.0.2
1.新增地热模块和新风系统控制和读取状态接口；
2.新增地热模块和新风系统控制演示页面；
3.targetSdkVersion 28；
##Version HDL_ZigBeeSDK_V1.0.1.B1.20200923.aar
1.修改org.eclipse.paho.client.mqttv3引用方式，解决罗家乐之前，打包方法会丢失mqtt jar资源文件，导致闪退问题。

 Android_HDL_SDK_XW/app/build.gradle

@@ -21,12 +21,14 @@
}

dependencies {
    implementation fileTree(include: ['*.jar'], dir: 'libs')
    implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
//    implementation fileTree(include: ['*.jar'], dir: 'libs')
    implementation 'com.android.support:appcompat-v7:28+'
    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
    testImplementation 'junit:junit:4.12'
    androidTestImplementation 'com.android.support.test:runner:1.0.2'
    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
    implementation project(':hdl_core')
//    implementation project(':hdl_core')
    implementation 'org.greenrobot:eventbus:3.0.0'
    implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
}

 Android_HDL_SDK_XW/app/libs/HDL_ZigBeeSDK_V1.0.1.B1.20200923.aar

Binary files differ

 Android_HDL_SDK_XW/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java

@@ -60,7 +60,6 @@
    private boolean isZigbee = false;



    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -77,7 +76,6 @@
        initcurState();
        initView();
        initClickOnEvent();



    }
@@ -1409,7 +1407,6 @@
            }
        }
    }



    public void showToast(String text) {

 Android_HDL_SDK_XW/build.gradle

@@ -4,12 +4,11 @@
    
    repositories {
        google()
        mavenCentral()
        maven { url 'https://maven.google.com' }
        jcenter()
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:3.3.0'
        classpath 'com.android.tools.build:gradle:3.4.1'
//        classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0'
//        classpath 'com.novoda:bintray-release:+'


@@ -19,8 +18,6 @@
allprojects {
    repositories {
        google()
        mavenCentral()
        maven { url 'https://maven.google.com' }
        jcenter()
    }
}

 Android_HDL_SDK_XW/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

 Android_HDL_SDK_XW/hdl_core/build.gradle

@@ -1,15 +1,13 @@
apply plugin: 'com.android.library'
//apply plugin: 'com.novoda.bintray-release'

android {
    compileSdkVersion 28
    defaultConfig {
        minSdkVersion 17
        targetSdkVersion 28
        versionCode 2
        versionName "1.0.8"
        versionCode 1
        versionName "1.0.1"

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

    }
    buildTypes {
@@ -20,47 +18,34 @@
    }
    buildToolsVersion '28.0.3'

    /**
     * æ‰“包自动命名
     */
    android.libraryVariants.all { variant ->
        variant.outputs.all {
            outputFileName = "HDL_ZigBeeSDK_V" +
                    defaultConfig.versionName + ".B" + defaultConfig.versionCode + "." + releaseTime() + ".aar"
        }
    }


//    lintOptions {
//        abortOnError false
//        warning 'InvalidPackage'
//    }
}

dependencies {
    implementation fileTree(include: ['*.jar'], dir: 'libs')
    implementation 'com.android.support:appcompat-v7:28+'
    api 'org.greenrobot:eventbus:3.0.0'
    testImplementation 'junit:junit:4.12'
    androidTestImplementation 'com.android.support.test:runner:1.0.2'
    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
    implementation files('libs/org.eclipse.paho.client.mqttv3-1.2.0.jar')
def releaseTime() {
    return new Date().format("yyyyMMdd")
}


//task makeJar(type: Copy) {
////删除存在的
//      delete'build/libs/test.jar'
////设置拷贝的文件
//      from('build/intermediates/packaged-classes/release/')
////打进jar包后的文件目录
//      into('build/libs/')
////将casses.jar放入build/libs/目录下
////include ,exclude参数来设置过滤
////（我们只关心classes.jar这个文件）
//      include('classes.jar')
////重命名
//    rename ('classes.jar','test.jar')
//}
//makeJar.dependsOn(build)
dependencies {
    implementation fileTree(include: ['*.jar'], dir: 'libs')
    implementation 'com.android.support:appcompat-v7:28.0.0'
    api 'org.greenrobot:eventbus:3.0.0'
    api 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
    testImplementation 'junit:junit:4.12'




//publish {
//    userOrg = 'tommydai'
//    groupId = 'com.hdl.sdk'
//    artifactId = 'hdlsdk'
//    publishVersion = '1.5.8'
//    desc = 'HDL core libray'
//}
}


 Android_HDL_SDK_XW/hdl_core/proguard-rules.pro

@@ -19,3 +19,6 @@
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile

#-keep class org.eclipse.paho.client.mqttv3.logging.JSR47Logger { *; }
#-keep class org.eclipse.paho.* { *; }

 Android_HDL_SDK_XW/hdl_core/src/androidTest/java/com/hdl/sdk/hdl_core/ExampleInstrumentedTest.java

File was deleted

 Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java

@@ -84,7 +84,6 @@
    }



//    /**
//     * èŽ·å–本地广播IP
//     * @return
@@ -95,6 +94,7 @@

    /**
     * èŽ·å–本地广播IP
     *
     * @return
     */
    public static String getLocalBroadCastIp(){
@@ -104,6 +104,7 @@
    /**
     * æ˜¯å¦å¼€å¯SDK日志打印
     * 2019-07-10新增
     *
     * @param bOpen
     */
    public static void setHDLLogOpen(boolean bOpen) {
@@ -123,7 +124,6 @@
//    }



    /**
     * èŽ·å–RCU模块的设备
     *
@@ -136,7 +136,6 @@
        }
        HandleSearch.getRcuDevices(context, rcuIp);
    }



    /**
@@ -678,6 +677,7 @@
//        }, 5000);
//
//    }

    /**
     * èŽ·å–单一设备状态
     */

 Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommandText.java

@@ -1,6 +1,7 @@
package com.hdl.sdk.hdl_core.HDLDeviceManger.Core;



import android.util.Log;



import com.google.gson.Gson;

import com.hdl.sdk.hdl_core.Config.ZigbeeDeviceID;

import com.hdl.sdk.hdl_core.HDLDeviceManger.Bean.ZigbeeBean.CommonErrorBean;

@@ -184,7 +185,8 @@
                    }

                }

                if (is1 && is2 ){ //代表获取恒温器和风扇的状态后的回调

                    is1 = false;is2 = false;

                    is1 = false;

                    is2 = false;

                    thermostatReadBackBean.setTag(airTag);

                    String thermostatReadJson = JsonUtil.toJson(thermostatReadBackBean);

                    //Log.d("11113", "数据数据数据"+thermostatReadJson);

@@ -530,7 +532,8 @@
    //发送空调控制

    public static void sendAirStatus(final ZigbeeDeviceSaveBean zigbeeDevice,final int type ,final int value,

                                     int tag,int mode){

        airTag = tag;  airMode = mode;

        airTag = tag;

        airMode = mode;

        String sendStatus = HDLCommandText.setSendStatus("write",value);

        HDLCommandText.sendThirdPartyJson(zigbeeDevice,sendStatus,type);

    }

@@ -719,6 +722,7 @@
            }

        },1,500);

    }



    public static void reSearch(){

        if (timer != null){

            timer.cancel();


 Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLZigbeeMqtt.java

@@ -9,6 +9,7 @@
import org.eclipse.paho.client.mqttv3.MqttException;
import org.eclipse.paho.client.mqttv3.MqttMessage;
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;

import com.hdl.sdk.hdl_core.HDLDeviceManger.Callback.PushCallback;
import com.hdl.sdk.hdl_core.Util.LogUtil.HDLLog;

@@ -18,6 +19,7 @@
    private static final String clientid = "HDLZigbeeDriver";
    private static MqttClient client;
    private static boolean isCancel  = false;

    public static void setIsCancel(boolean isCancel) {
        HDLZigbeeMqtt.isCancel = isCancel;
    }

 Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/SearchZigbeeGateway.java

@@ -12,7 +12,6 @@
import java.util.TimerTask;



import com.hdl.sdk.hdl_core.HDLDeviceManger.Bean.ZigbeeBean.ZigbeeGatewayInfoBean;
import com.hdl.sdk.hdl_core.HDLDeviceManger.Callback.PushCallback;
import com.hdl.sdk.hdl_core.Util.LogUtil.HDLLog;
@@ -30,8 +29,10 @@
    public static Timer searchTimer = null;
    private static DatagramSocket datagramSocket; // æ•°æ®æŠ¥å¥—接字
    private static boolean isStop = false;

    public interface OnSearchListener{
         void onSuccess( List<ZigbeeGatewayInfoBean> zigbeeGatewayInfoBeanList);

         void onEorror(Exception e);
    }


 Android_HDL_SDK_XW/hdl_core/src/test/java/com/hdl/sdk/hdl_core/ExampleUnitTest.java

File was deleted

 org.eclipse.paho.client.mqttv3-1.2.0.jar

Binary files differ

 org.eclipse.paho.client.mqttv3-1.2.5.jar

Binary files differ

 ´ò°üaar/2020-09-23/HDL_ZigBeeSDK_V1.0.1.B1.20200923.aar

Binary files differ