Skip to content

Commit 304338c

Browse files
shiyinghanshiyinghan
committed
1.add example app
2.update package of demo app 3.fix some bug of mqtt module
1 parent 0b48e81 commit 304338c

File tree

74 files changed

+837
-249
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+837
-249
lines changed

‎app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ android {
77
buildToolsVersion build_versions.build_tools
88

99
defaultConfig {
10-
applicationId "com.shiyinghan.mqttdemo"
10+
applicationId "com.shiyinghan.mqtt.demo"
1111
minSdkVersion build_versions.min_sdk
1212
targetSdkVersion build_versions.target_sdk
1313
versionCode 1
@@ -23,6 +23,7 @@ android {
2323
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2424
}
2525
}
26+
2627
compileOptions {
2728
sourceCompatibility JavaVersion.VERSION_1_8
2829
targetCompatibility JavaVersion.VERSION_1_8
@@ -36,16 +37,15 @@ android {
3637
dependencies {
3738
implementation fileTree(dir: 'libs', include: ['*.jar'])
3839

39-
implementation deps.support.v4
40-
implementation deps.support.multidex
41-
4240
//support
4341
implementation deps.support.app_compat
4442
implementation deps.support.recyclerview
4543
implementation deps.support.design
4644
implementation deps.support.v4
4745
implementation deps.support.constraint_layout
4846
implementation deps.support.fragment
47+
implementation deps.support.multidex
48+
4949
//room
5050
implementation deps.room.runtime
5151
annotationProcessor deps.room.compiler

‎app/proguard-rules.pro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
#----------------------------------------- --定制化区域----------------------------------------------
4747
#---------------------------------1.实体类---------------------------------
48-
-keep class com.shiyinghan.mqttdemo.mqtt.entity.*{*;}
48+
-keep class com.shiyinghan.mqtt.demo.mqtt.entity.*{*;}
4949

5050
#-------------------------------------------------------------------------
5151

app/src/androidTest/java/com/shiyinghan/mqttdemo/ExampleInstrumentedTest.java renamed to app/src/androidTest/java/com/shiyinghan/ExampleInstrumentedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.shiyinghan.mqttdemo;
1+
package com.shiyinghan;
22

33
import android.content.Context;
44

@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
2121
public void useAppContext() {
2222
// Context of the app under test.
2323
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
24-
assertEquals("com.shiyinghan.demo", appContext.getPackageName());
24+
assertEquals("com.shiyinghan.mqtt.demo", appContext.getPackageName());
2525
}
2626
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.shiyinghan.mqttdemo">
3+
package="com.shiyinghan.mqtt.demo">
44

55
<!-- Permissions the Application Requires -->
66
<uses-permission android:name="android.permission.WAKE_LOCK" />

app/src/main/java/com/shiyinghan/mqttdemo/adapter/ConnectionListRecyclerViewAdapter.java renamed to app/src/main/java/com/shiyinghan/mqtt/demo/adapter/ConnectionListRecyclerViewAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.shiyinghan.mqttdemo.adapter;
1+
package com.shiyinghan.mqtt.demo.adapter;
22

33
import android.widget.ImageView;
44
import android.widget.TextView;
55

66
import com.chad.library.adapter.base.BaseQuickAdapter;
77
import com.chad.library.adapter.base.viewholder.BaseViewHolder;
8-
import com.shiyinghan.mqttdemo.R;
9-
import com.shiyinghan.mqttdemo.mqtt.entity.ConnectionEntity;
8+
import com.shiyinghan.mqtt.demo.R;
9+
import com.shiyinghan.mqtt.demo.mqtt.entity.ConnectionEntity;
1010

1111
import org.jetbrains.annotations.NotNull;
1212

app/src/main/java/com/shiyinghan/mqttdemo/adapter/HistoryListRecyclerViewAdapter.java renamed to app/src/main/java/com/shiyinghan/mqtt/demo/adapter/HistoryListRecyclerViewAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.shiyinghan.mqttdemo.adapter;
1+
package com.shiyinghan.mqtt.demo.adapter;
22

33
import android.content.res.Resources;
44
import android.widget.TextView;
55

66
import com.chad.library.adapter.base.BaseQuickAdapter;
77
import com.chad.library.adapter.base.viewholder.BaseViewHolder;
8-
import com.shiyinghan.mqttdemo.R;
9-
import com.shiyinghan.mqttdemo.mqtt.entity.ReceivedMessageEntity;
8+
import com.shiyinghan.mqtt.demo.R;
9+
import com.shiyinghan.mqtt.demo.mqtt.entity.ReceivedMessageEntity;
1010

1111
import org.jetbrains.annotations.NotNull;
1212

app/src/main/java/com/shiyinghan/mqttdemo/adapter/SubscriptionListRecyclerViewAdapter.java renamed to app/src/main/java/com/shiyinghan/mqtt/demo/adapter/SubscriptionListRecyclerViewAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package com.shiyinghan.mqttdemo.adapter;
1+
package com.shiyinghan.mqtt.demo.adapter;
22

33
import android.content.res.Resources;
44
import android.widget.ImageView;
55
import android.widget.TextView;
66

77
import com.chad.library.adapter.base.BaseQuickAdapter;
88
import com.chad.library.adapter.base.viewholder.BaseViewHolder;
9-
import com.shiyinghan.mqttdemo.R;
10-
import com.shiyinghan.mqttdemo.mqtt.entity.SubscriptionEntity;
9+
import com.shiyinghan.mqtt.demo.R;
10+
import com.shiyinghan.mqtt.demo.mqtt.entity.SubscriptionEntity;
1111

1212
import org.jetbrains.annotations.NotNull;
1313

app/src/main/java/com/shiyinghan/mqttdemo/base/AbstractActivity.java renamed to app/src/main/java/com/shiyinghan/mqtt/demo/base/AbstractActivity.java

File renamed without changes.

app/src/main/java/com/shiyinghan/mqttdemo/base/AbstractFragment.java renamed to app/src/main/java/com/shiyinghan/mqtt/demo/base/AbstractFragment.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.shiyinghan.mqttdemo.base;
1+
package com.shiyinghan.mqtt.demo.base;
22

33

44
import android.content.Context;
@@ -15,9 +15,9 @@
1515
import androidx.annotation.Nullable;
1616
import androidx.fragment.app.Fragment;
1717

18-
import com.shiyinghan.mqttdemo.R;
19-
import com.shiyinghan.mqttdemo.event.DummyEvent;
20-
import com.shiyinghan.mqttdemo.reactivex.RxUtils;
18+
import com.shiyinghan.mqtt.demo.R;
19+
import com.shiyinghan.mqtt.demo.event.DummyEvent;
20+
import com.shiyinghan.mqtt.demo.reactivex.RxUtils;
2121

2222
import org.greenrobot.eventbus.EventBus;
2323
import org.greenrobot.eventbus.Subscribe;

app/src/main/java/com/shiyinghan/mqttdemo/base/AbstractMvpActivity.java renamed to app/src/main/java/com/shiyinghan/mqtt/demo/base/AbstractMvpActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.shiyinghan.mqttdemo.base;
1+
package com.shiyinghan.mqtt.demo.base;
22

33
import android.os.Bundle;
44

55
import androidx.annotation.Nullable;
66

7-
import com.shiyinghan.mqttdemo.base.presenter.IBasePresenter;
7+
import com.shiyinghan.mqtt.demo.base.presenter.IBasePresenter;
88

99
/**
1010
* created at 2020/2/27

0 commit comments

Comments
 (0)