Commit d7fa3f40b7c8ceac8e8e66d2f357f0610bd89925
1 parent
99f22531
1 版本更新
Showing
4 changed files
with
7 additions
and
6 deletions
config.gradle
module_xiaojiaSoundBox/build.gradle
| @@ -81,5 +81,5 @@ dependencies { | @@ -81,5 +81,5 @@ dependencies { | ||
| 81 | implementation 'com.daimajia.easing:library:2.0@aar' | 81 | implementation 'com.daimajia.easing:library:2.0@aar' |
| 82 | implementation 'com.daimajia.androidanimations:library:2.3@aar' | 82 | implementation 'com.daimajia.androidanimations:library:2.3@aar' |
| 83 | implementation 'com.android.support.constraint:constraint-layout:1.1.3' | 83 | implementation 'com.android.support.constraint:constraint-layout:1.1.3' |
| 84 | - implementation files('libs/pinyin4j-2.5.0.jar') | 84 | + api files('libs/pinyin4j-2.5.0.jar') |
| 85 | } | 85 | } |
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/constants/XiaoJiaConst.java
| @@ -4,7 +4,4 @@ public class XiaoJiaConst { | @@ -4,7 +4,4 @@ public class XiaoJiaConst { | ||
| 4 | public static final String QRCODE_TYPE="xiaoJiaSpeakerType"; | 4 | public static final String QRCODE_TYPE="xiaoJiaSpeakerType"; |
| 5 | public static final String INVIT_QRCODE="1";//二维码邀请 | 5 | public static final String INVIT_QRCODE="1";//二维码邀请 |
| 6 | public static final String INVIT_FRIEND="2";//联系人邀请 | 6 | public static final String INVIT_FRIEND="2";//联系人邀请 |
| 7 | - | ||
| 8 | - | ||
| 9 | - | ||
| 10 | } | 7 | } |
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/AllDeviceActivity.java
| 1 | package com.cnlive.strike.xiaojiaspeaker.ui.activity; | 1 | package com.cnlive.strike.xiaojiaspeaker.ui.activity; |
| 2 | 2 | ||
| 3 | +import android.app.Activity; | ||
| 4 | +import android.content.Intent; | ||
| 3 | import android.database.DatabaseUtils; | 5 | import android.database.DatabaseUtils; |
| 4 | import android.databinding.DataBindingUtil; | 6 | import android.databinding.DataBindingUtil; |
| 5 | import android.support.v4.content.ContextCompat; | 7 | import android.support.v4.content.ContextCompat; |
| @@ -31,6 +33,8 @@ public class AllDeviceActivity extends AppCompatActivity { | @@ -31,6 +33,8 @@ public class AllDeviceActivity extends AppCompatActivity { | ||
| 31 | getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, AllDeviceFragment.newInstance()).commitAllowingStateLoss(); | 33 | getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, AllDeviceFragment.newInstance()).commitAllowingStateLoss(); |
| 32 | 34 | ||
| 33 | } | 35 | } |
| 34 | - | 36 | + public static void startActivity(Activity activity) { |
| 37 | + activity.startActivity(new Intent(activity, AllDeviceActivity.class)); | ||
| 38 | + } | ||
| 35 | 39 | ||
| 36 | } | 40 | } |