Browse Source

修改版本更新的问题

tags/A.1.0.0.0_20230714_alpha
tangmingjie 2 years ago
parent
commit
3f6e893116
6 changed files with 31 additions and 25 deletions
  1. +7
    -6
      app/src/main/AndroidManifest.xml
  2. +14
    -14
      app/src/main/java/com/aispeech/nativedemo/DDSService.java
  3. +3
    -3
      app/src/main/java/com/aispeech/nativedemo/MainActivity.java
  4. +6
    -1
      app/src/main/java/com/aispeech/nativedemo/mqtt/MqttManager.java
  5. BIN
      test/src/main/assets/product.zip
  6. +1
    -1
      test/src/main/assets/product.zip.md5sum

+ 7
- 6
app/src/main/AndroidManifest.xml View File

@@ -38,12 +38,13 @@
android:name="android.max_aspect"
android:value="2.1" />

<!-- <activity-->
<!-- android:name=".MainActivity"-->
<!-- android:launchMode="singleTask"-->
<!-- android:screenOrientation="portrait">-->
<!-- </activity>-->
<activity android:name=".MainActivity" android:exported="true">
<activity
android:name=".MainActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait">
</activity>

<activity android:name=".ui.LauncherActivity" android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />



+ 14
- 14
app/src/main/java/com/aispeech/nativedemo/DDSService.java View File

@@ -213,22 +213,22 @@ public class DDSService extends Service {
// config.addConfig(DDSConfig.K_API_KEY, "d709678a1595dcf1e18956da6440cd6c"); // 产品授权秘钥,服务端生成,用于产品授权 -- 必填
// config.addConfig(DDSConfig.K_DEVICE_ID, getDeviceId(getApplicationContext()));//填入唯一的deviceId -- 选填

config.addConfig(DDSConfig.K_PRODUCT_ID, "279616521"); // 产品ID -- 必填
config.addConfig(DDSConfig.K_USER_ID, "aispeech"); // 用户ID -- 必填
config.addConfig(DDSConfig.K_ALIAS_KEY, "test"); // 产品的发布分支 -- 必填
config.addConfig(DDSConfig.K_PRODUCT_KEY, "e98db68bd807accc8eb12144c54ef1a1");// Product Key -- 必填
config.addConfig(DDSConfig.K_PRODUCT_SECRET, "6d7db9adbc8dbb5efd89e4d5bf46db7f");// Product Secre -- 必填
config.addConfig(DDSConfig.K_API_KEY, "d797bc5edc9778f7d0ca8242643fa41a"); // 产品授权秘钥,服务端生成,用于产品授权 -- 必填
config.addConfig(DDSConfig.K_DEVICE_ID, getDeviceId(getApplicationContext()));//填入唯一的deviceId -- 选填
config.addConfig(DDSConfig.K_AUDIO_FOCUS_MODE, "external");//填入唯一的deviceId -- 选填

// config.addConfig(DDSConfig.K_PRODUCT_ID, "279617278"); // 产品ID -- 必填
// config.addConfig(DDSConfig.K_PRODUCT_ID, "279616521"); // 产品ID -- 必填
// config.addConfig(DDSConfig.K_USER_ID, "aispeech"); // 用户ID -- 必填
// config.addConfig(DDSConfig.K_ALIAS_KEY, "test"); // 产品的发布分支 -- 必填
// config.addConfig(DDSConfig.K_PRODUCT_KEY, "da09e6ff1a4ca4de4a6a447e596ed41e");// Product Key -- 必填
// config.addConfig(DDSConfig.K_PRODUCT_SECRET, "6def485b9e41c80e1a24a9ca4d1865f4");// Product Secre -- 必填
// config.addConfig(DDSConfig.K_API_KEY, "c27a9e478c3bbe8f87b03b266440e2ff"); // 产品授权秘钥,服务端生成,用于产品授权 -- 必填
// config.addConfig(DDSConfig.K_PRODUCT_KEY, "e98db68bd807accc8eb12144c54ef1a1");// Product Key -- 必填
// config.addConfig(DDSConfig.K_PRODUCT_SECRET, "6d7db9adbc8dbb5efd89e4d5bf46db7f");// Product Secre -- 必填
// config.addConfig(DDSConfig.K_API_KEY, "d797bc5edc9778f7d0ca8242643fa41a"); // 产品授权秘钥,服务端生成,用于产品授权 -- 必填
// config.addConfig(DDSConfig.K_DEVICE_ID, getDeviceId(getApplicationContext()));//填入唯一的deviceId -- 选填
// config.addConfig(DDSConfig.K_AUDIO_FOCUS_MODE, "external");//填入唯一的deviceId -- 选填

config.addConfig(DDSConfig.K_PRODUCT_ID, "279617278"); // 产品ID -- 必填
config.addConfig(DDSConfig.K_USER_ID, "aispeech"); // 用户ID -- 必填
config.addConfig(DDSConfig.K_ALIAS_KEY, "test"); // 产品的发布分支 -- 必填
config.addConfig(DDSConfig.K_PRODUCT_KEY, "da09e6ff1a4ca4de4a6a447e596ed41e");// Product Key -- 必填
config.addConfig(DDSConfig.K_PRODUCT_SECRET, "6def485b9e41c80e1a24a9ca4d1865f4");// Product Secre -- 必填
config.addConfig(DDSConfig.K_API_KEY, "c27a9e478c3bbe8f87b03b266440e2ff"); // 产品授权秘钥,服务端生成,用于产品授权 -- 必填
config.addConfig(DDSConfig.K_DEVICE_ID, getDeviceId(getApplicationContext()));//填入唯一的deviceId -- 选填

// 更多高级配置项,请参考文档: https://www.dui.ai/docs/ct_common_Andriod_SDK 中的 --> 四.高级配置项

@@ -236,7 +236,7 @@ public class DDSService extends Service {
config.addConfig(DDSConfig.K_USE_UPDATE_DUICORE, "false"); //设置为false可以关闭dui内核的热更新功能,可以配合内置dui内核资源使用

// 资源更新配置项
// config.addConfig(DDSConfig.K_CUSTOM_ZIP, "product.zip"); // 预置在指定目录下的DUI产品配置资源包名, 避免在线下载产品配置消耗流量, 推荐使用
config.addConfig(DDSConfig.K_CUSTOM_ZIP, "product.zip"); // 预置在指定目录下的DUI产品配置资源包名, 避免在线下载产品配置消耗流量, 推荐使用
// config.addConfig(DDSConfig.K_USE_UPDATE_NOTIFICATION, "false"); // 是否使用内置的资源更新通知栏

// 录音配置项


+ 3
- 3
app/src/main/java/com/aispeech/nativedemo/MainActivity.java View File

@@ -661,9 +661,9 @@ public class MainActivity extends Activity implements DuiUpdateObserver.UpdateCa
private void initConfig() {
sendWebsocketMsg();

// DDSManager.getInstance().sendHiMessage(this);
// enableWakeup();
// registMsg();
DDSManager.getInstance().sendHiMessage(this);
enableWakeup();
registMsg();
}

private void sendWebsocketMsg() {


+ 6
- 1
app/src/main/java/com/aispeech/nativedemo/mqtt/MqttManager.java View File

@@ -280,7 +280,12 @@ public class MqttManager {
public void onCheckerDownloadSuccess(File file) {
publish(MqttConfig.TOPIC_REPLY_SETUP, MqttReply.createSetupReplyMessage(MqttConfig.Upgrade.DOWNLOAD_SUCCESS));
publish(MqttConfig.TOPIC_REPLY_SETUP, MqttReply.createSetupReplyMessage(MqttConfig.Upgrade.INSTALL_BEGIN));
AppUtils.installApk(mContext, file);
((MainActivity)mContext).runOnUiThread(new Runnable() {
@Override
public void run() {
AppUtils.installApk(mContext, file);
}
});
publish(MqttConfig.TOPIC_REPLY_SETUP, MqttReply.createSetupReplyMessage(MqttConfig.Upgrade.INSTALLING));
}



BIN
test/src/main/assets/product.zip View File


+ 1
- 1
test/src/main/assets/product.zip.md5sum View File

@@ -1 +1 @@
cf773b8a675569ac97295d5860cdd5ad
8cbdc1ada3f69c487bb0a3457f09e324

Loading…
Cancel
Save