杨帅 / XiaojiaSoundBox · Commits

Commit fcc065b341838e0af3ff977c75eaf482db7bddf0

Authored by YangShuai
1 parent 5771a8b6

1 修改项目资源,去除与主项目冲突

Inline Side-by-side
Showing 178 changed files with 142 additions and 183 deletions
app/src/main/res/layout/dialog_select.xml
  View file @fcc065b
... ... @@ -9,7 +9,7 @@
9 9 android:id="@+id/ll_child"
10 10 android:layout_width="match_parent"
11 11 android:layout_height="wrap_content"
12   - android:background="@drawable/free_dialog_bg"
  12 + android:background="@drawable/free_xiaojia_dialog_bg"
13 13 android:orientation="vertical"
14 14 android:paddingTop="10dp"
15 15 >
... ... @@ -51,7 +51,7 @@
51 51 android:layout_width="match_parent"
52 52 android:layout_height="match_parent"
53 53 android:layout_gravity="center"
54   - android:background="@drawable/selector_dialog_btn_left"
  54 + android:background="@drawable/selector_xiaojia_dialog_btn_left"
55 55 android:text="否"
56 56 android:textColor="@color/black"
57 57 android:textSize="15sp"
... ... @@ -75,7 +75,7 @@
75 75 android:layout_width="match_parent"
76 76 android:layout_height="match_parent"
77 77 android:layout_gravity="center"
78   - android:background="@drawable/selector_dialog_btn_right"
  78 + android:background="@drawable/selector_xiaojia_dialog_btn_right"
79 79 android:text="否"
80 80 android:textColor="@color/black"
81 81 android:textSize="15sp"
... ...
config.gradle
  View file @fcc065b
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "0.1.0",
  24 + version: "0.1.1",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.module",
27 27 //Lib库名称
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectIMFriendView.java
  View file @fcc065b
... ... @@ -329,7 +329,7 @@ public class SelectIMFriendView implements MvpView, LetterBarView.OnLetterSelect
329 329 */
330 330 public void nextBtnCanNotClick() {
331 331 fragment.binding.btnNext.setEnabled(false);
332   - fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_btn_gray));
  332 + fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_xiaojia_btn_gray));
333 333 }
334 334  
335 335 /**
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SetFriendsRoleView.java
  View file @fcc065b
... ... @@ -2,14 +2,12 @@ package com.cnlive.strike.xiaojiaspeaker.frame.view;
2 2  
3 3 import android.app.Activity;
4 4 import android.support.v4.content.ContextCompat;
5   -import android.support.v7.widget.GridLayoutManager;
6 5 import android.support.v7.widget.LinearLayoutManager;
7 6 import android.text.TextUtils;
8 7 import android.view.View;
9 8  
10 9 import com.cnlive.libs.base.util.AlertUtil;
11 10 import com.cnlive.strike.xiaojiaspeaker.R;
12   -import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SetFriendsRolePresenter;
13 11 import com.cnlive.strike.xiaojiaspeaker.model.RoleInfo;
14 12 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RoleNetBean;
15 13 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.SetRoleAdapter;
... ... @@ -169,6 +167,6 @@ public class SetFriendsRoleView implements MvpView {
169 167 */
170 168 public void nextBtnCanNotClick() {
171 169 fragment.binding.btnNext.setEnabled(false);
172   - fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_btn_gray));
  170 + fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_xiaojia_btn_gray));
173 171 }
174 172 }
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/UserManagerView.java
  View file @fcc065b
... ... @@ -16,7 +16,6 @@ import com.cnlive.strike.xiaojiaspeaker.frame.presenter.UserManagerPresenter;
16 16 import com.cnlive.strike.xiaojiaspeaker.model.RoleInfo;
17 17 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyRoleBean;
18 18 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RoleNetBean;
19   -import com.cnlive.strike.xiaojiaspeaker.ui.activity.BlueToothStep1Activity;
20 19 import com.cnlive.strike.xiaojiaspeaker.ui.activity.InvitFriendActivity;
21 20 import com.cnlive.strike.xiaojiaspeaker.ui.activity.SelectIMFriendActivity;
22 21 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.UserＭanagerAdapter;
... ... @@ -25,7 +24,6 @@ import com.cnlive.strike.xiaojiaspeaker.ui.widget.EditRoleDialog;
25 24 import com.cnlive.strike.xiaojiaspeaker.ui.widget.SelectDialog;
26 25 import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenu;
27 26 import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenuInfo;
28   -import com.cnlive.strike.xiaojiaspeaker.util.GsonUtil;
29 27 import com.hannesdorfmann.mosby3.mvp.MvpView;
30 28  
31 29 import java.util.ArrayList;
... ... @@ -330,11 +328,11 @@ public class UserManagerView implements MvpView {
330 328 popMenuInfoList = new ArrayList<>();
331 329 PopMenuInfo popMenuInfo = new PopMenuInfo();
332 330 popMenuInfo.setTitle("邀请网家家好友");
333   - popMenuInfo.setImgDrawable(R.drawable.icon_friend);
  331 + popMenuInfo.setImgDrawable(R.drawable.icon_xiaojia_friend);
334 332 popMenuInfoList.add(popMenuInfo);
335 333 popMenuInfo = new PopMenuInfo();
336 334 popMenuInfo.setTitle("生成二维码邀请");
337   - popMenuInfo.setImgDrawable(R.drawable.icon_qrcode);
  335 + popMenuInfo.setImgDrawable(R.drawable.icon_xiaojia_qrcode);
338 336 popMenuInfoList.add(popMenuInfo);
339 337  
340 338 if (null == mPopMenu) {
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothHelpActivity.java
  View file @fcc065b
... ... @@ -29,7 +29,7 @@ public class BlueToothHelpActivity extends AppCompatActivity {
29 29 if (null != binding) {
30 30 binding.topbar.setTitle("帮助").setTextColor(ContextCompat.getColor(this, R.color.color_282828));
31 31 //设置返回按钮
32   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  32 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
33 33 @Override
34 34 public void onClick(View view) {
35 35 finish();
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothStep1Activity.java
  View file @fcc065b
... ... @@ -11,12 +11,10 @@ import android.view.View;
11 11 import com.cnlive.libs.base.util.StatusBarUtil;
12 12 import com.cnlive.libs.base.util.StatusBarUtil2;
13 13 import com.cnlive.strike.xiaojiaspeaker.R;
14   -import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
15 14 import com.cnlive.strike.xiaojiaspeaker.databinding.ActivityBlueToothStep1Binding;
16 15 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
17 16 import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
18 17  
19   -import org.greenrobot.eventbus.EventBus;
20 18 import org.greenrobot.eventbus.Subscribe;
21 19 import org.greenrobot.eventbus.ThreadMode;
22 20  
... ... @@ -53,7 +51,7 @@ public class BlueToothStep1Activity extends AppCompatActivity {
53 51 StatusBarUtil2.setColor(this, ContextCompat.getColor(this, R.color.white), 0);
54 52 if (null != binding) {
55 53 //设置返回按钮
56   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  54 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
57 55 @Override
58 56 public void onClick(View view) {
59 57 finish();
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothStep2Activity.java
  View file @fcc065b
... ... @@ -18,8 +18,6 @@ import android.support.v7.app.AppCompatActivity;
18 18 import android.os.Bundle;
19 19 import android.util.Log;
20 20 import android.view.View;
21   -import android.view.animation.Animation;
22   -import android.view.animation.AnimationUtils;
23 21  
24 22 import com.clj.fastble.BleManager;
25 23 import com.cnlive.libs.base.util.StatusBarUtil;
... ... @@ -103,7 +101,7 @@ public class BlueToothStep2Activity extends AppCompatActivity {
103 101 StatusBarUtil2.setColor(this, ContextCompat.getColor(this, R.color.white), 0);
104 102 if (null != binding) {
105 103 //设置返回按钮
106   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  104 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
107 105 @Override
108 106 public void onClick(View view) {
109 107 finish();
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ConnBluetoothSuccessActivity.java
  View file @fcc065b
... ... @@ -106,7 +106,7 @@ public class ConnBluetoothSuccessActivity extends AppCompatActivity {
106 106 if (null != binding) {
107 107 binding.topbar.setTitle("连接成功");
108 108 //设置返回按钮
109   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  109 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
110 110 @Override
111 111 public void onClick(View view) {
112 112 finish();
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceInfoActivity.java
  View file @fcc065b
... ... @@ -45,7 +45,7 @@ public class DeviceInfoActivity extends AppCompatActivity {
45 45 if (null != binding) {
46 46 binding.topbar.setTitle("设备信息");
47 47 //设置返回按钮
48   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  48 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
49 49 @Override
50 50 public void onClick(View view) {
51 51 finish();
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceInstructionActivity.java
  View file @fcc065b
... ... @@ -34,7 +34,7 @@ public class DeviceInstructionActivity extends AppCompatActivity {
34 34 if (null != binding) {
35 35 binding.topbar.setTitle("设备说明");
36 36 //设置返回按钮
37   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  37 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
38 38 @Override
39 39 public void onClick(View view) {
40 40 finish();
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceManagerActivity.java
  View file @fcc065b
... ... @@ -80,7 +80,7 @@ public class DeviceManagerActivity extends AppCompatActivity {
80 80 // if (null != binding) {
81 81 // binding.topbar.setTitle("设备管理");
82 82 // //设置返回按钮
83   -// binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  83 +// binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
84 84 // @Override
85 85 // public void onClick(View view) {
86 86 // finish();
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/RemoteControlActivity.java
  View file @fcc065b
... ... @@ -9,7 +9,6 @@ import android.support.v7.app.AppCompatActivity;
9 9 import android.os.Bundle;
10 10 import android.util.Log;
11 11 import android.view.View;
12   -import android.widget.CompoundButton;
13 12  
14 13 import com.cnlive.libs.base.logic.Logic;
15 14 import com.cnlive.libs.base.logic.callback.DataCallback;
... ... @@ -24,7 +23,6 @@ import com.cnlive.strike.xiaojiaspeaker.databinding.ActivityRemoteControlBinding
24 23 import com.cnlive.strike.xiaojiaspeaker.netWork.ApiServiceXiaoJia;
25 24 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.APIBaseInfo;
26 25 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RemoteControlBean;
27   -import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RoleNetBean;
28 26 import com.cnlive.strike.xiaojiaspeaker.netWork.result.SubscriptionRequest;
29 27 import com.cnlive.strike.xiaojiaspeaker.util.QMUITipDialogUtil;
30 28  
... ... @@ -69,7 +67,7 @@ public class RemoteControlActivity extends AppCompatActivity {
69 67 if (null != binding) {
70 68 binding.topbar.setTitle("远程控制管理");
71 69 //设置返回按钮
72   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  70 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
73 71 @Override
74 72 public void onClick(View view) {
75 73 finish();
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ShareFriendActivity.java
  View file @fcc065b
... ... @@ -17,7 +17,6 @@ import android.widget.TextView;
17 17  
18 18 import com.alibaba.android.arouter.launcher.ARouter;
19 19 import com.cnlive.libs.base.arouter.QrService;
20   -import com.cnlive.libs.base.util.SimpleDES;
21 20 import com.cnlive.libs.base.util.StatusBarUtil;
22 21 import com.cnlive.libs.base.util.StatusBarUtil2;
23 22 import com.cnlive.strike.application.GlideApp;
... ... @@ -28,8 +27,6 @@ import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsUtils;
28 27 import com.qmuiteam.qmui.util.QMUIDrawableHelper;
29 28 import com.qmuiteam.qmui.widget.QMUITopBar;
30 29  
31   -import org.json.JSONObject;
32   -
33 30 import java.io.ByteArrayOutputStream;
34 31  
35 32 public class ShareFriendActivity extends AppCompatActivity {
... ... @@ -72,7 +69,7 @@ import java.io.ByteArrayOutputStream;
72 69  
73 70 topBar.setTitle("");
74 71 //设置返回按钮
75   - topBar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  72 + topBar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
76 73 @Override
77 74 public void onClick(View view) {
78 75 finish();
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/AllDeviceFragment.java
  View file @fcc065b
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
2 2  
3   -import android.graphics.Color;
4 3 import android.os.Bundle;
5 4 import android.support.annotation.Nullable;
6 5 import android.support.v4.content.ContextCompat;
... ... @@ -18,18 +17,12 @@ import com.cnlive.strike.xiaojiaspeaker.frame.view.AllDeviceFragmentView;
18 17 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
19 18 import com.cnlive.strike.xiaojiaspeaker.ui.activity.BlueToothStep1Activity;
20 19 import com.cnlive.strike.xiaojiaspeaker.ui.activity.RemoteControlActivity;
21   -import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenuInfo;
22   -import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenu;
23 20 import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
24 21 import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton;
25 22  
26   -import org.greenrobot.eventbus.EventBus;
27 23 import org.greenrobot.eventbus.Subscribe;
28 24 import org.greenrobot.eventbus.ThreadMode;
29 25  
30   -import java.util.ArrayList;
31   -import java.util.List;
32   -
33 26 public class AllDeviceFragment extends MvpBindingFragment<AllDeviceFragmentView, AllDeviceFragmentPresenter, Object, FragmentAllDeviceBinding> {
34 27 private UIPopup qmuiPopup;
35 28 private QMUIAlphaImageButton addButton;
... ... @@ -87,7 +80,7 @@ public class AllDeviceFragment extends MvpBindingFragment&lt;AllDeviceFragmentView,
87 80 if (null != binding) {
88 81 binding.topbar.setTitle("所有设备");
89 82 //设置返回按钮
90   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  83 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
91 84 @Override
92 85 public void onClick(View view) {
93 86 getActivity().finish();
... ... @@ -96,7 +89,7 @@ public class AllDeviceFragment extends MvpBindingFragment&lt;AllDeviceFragmentView,
96 89  
97 90  
98 91 //添加设备按钮
99   - addButton = binding.topbar.addRightImageButton(R.drawable.icon_item_add, R.id.right_add);
  92 + addButton = binding.topbar.addRightImageButton(R.drawable.icon_xiaojia_item_add, R.id.right_add);
100 93 addButton.setOnClickListener(new View.OnClickListener() {
101 94 @Override
102 95 public void onClick(View view) {
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/ChangeDeviceNameFragment.java
  View file @fcc065b
... ... @@ -13,7 +13,6 @@ import com.cnlive.strike.xiaojiaspeaker.R;
13 13 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentChangeDeviceNameBinding;
14 14 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.ChangeDeviceNamePresenter;
15 15 import com.cnlive.strike.xiaojiaspeaker.frame.view.ChangeDeviceNameView;
16   -import com.cnlive.strike.xiaojiaspeaker.netWork.bean.DeviceDetail;
17 16  
18 17 public class ChangeDeviceNameFragment extends MvpBindingFragment<ChangeDeviceNameView, ChangeDeviceNamePresenter, Object, FragmentChangeDeviceNameBinding> {
19 18 public static ChangeDeviceNameFragment newInstance(String deviceId) {
... ... @@ -55,7 +54,7 @@ public class ChangeDeviceNameFragment extends MvpBindingFragment&lt;ChangeDeviceNam
55 54 if (null != binding) {
56 55 binding.topbar.setTitle("更改音箱名称");
57 56 //设置返回按钮
58   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  57 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
59 58 @Override
60 59 public void onClick(View view) {
61 60 getActivity().finish();
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/ChangeWifiFragment.java
  View file @fcc065b
... ... @@ -13,22 +13,14 @@ import android.text.TextUtils;
13 13 import android.util.Log;
14 14 import android.view.View;
15 15  
16   -import com.clj.fastble.data.BleDevice;
17 16 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
18 17 import com.cnlive.libs.base.util.StatusBarUtil;
19 18 import com.cnlive.libs.base.util.StatusBarUtil2;
20 19 import com.cnlive.strike.xiaojiaspeaker.R;
21 20 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentSelectWifiBinding;
22 21 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.ChangeWifiFragmentPresenter;
23   -import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SelectWifiFragmentPresenter;
24 22 import com.cnlive.strike.xiaojiaspeaker.frame.view.ChangeWifiFragmentView;
25   -import com.cnlive.strike.xiaojiaspeaker.frame.view.SelectWifiFragmentView;
26   -import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
27 23 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyListBean;
28   -import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
29   -
30   -import org.greenrobot.eventbus.Subscribe;
31   -import org.greenrobot.eventbus.ThreadMode;
32 24  
33 25 public class ChangeWifiFragment extends MvpBindingFragment<ChangeWifiFragmentView, ChangeWifiFragmentPresenter, Object, FragmentSelectWifiBinding> {
34 26 private String TAG = "SelectWifiFragment";
... ... @@ -76,7 +68,7 @@ public class ChangeWifiFragment extends MvpBindingFragment&lt;ChangeWifiFragmentVie
76 68 if (null != binding) {
77 69 binding.topbar.setTitle("切换WIFI网络").setTextColor(ContextCompat.getColor(getActivity(), R.color.color_282828));
78 70 //设置返回按钮
79   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  71 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
80 72 @Override
81 73 public void onClick(View view) {
82 74 if (null != getActivity()) {
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/DeviceDetailFragment.java
  View file @fcc065b
... ... @@ -55,7 +55,7 @@ public class DeviceDetailFragment extends MvpBindingFragment&lt;DeviceDetailView, D
55 55 if (null != binding) {
56 56 binding.topbar.setTitle(deviceName);
57 57 //设置返回按钮
58   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  58 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
59 59 @Override
60 60 public void onClick(View view) {
61 61 getActivity().finish();
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/DeviceManagerFragment.java
  View file @fcc065b
... ... @@ -11,7 +11,6 @@ import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
11 11 import com.cnlive.libs.base.util.StatusBarUtil;
12 12 import com.cnlive.libs.base.util.StatusBarUtil2;
13 13 import com.cnlive.strike.xiaojiaspeaker.R;
14   -import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
15 14 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentDeviceManagerBinding;
16 15 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.DeviceManagerFragmentPresenter;
17 16 import com.cnlive.strike.xiaojiaspeaker.frame.view.DeviceManagerFragmentView;
... ... @@ -94,7 +93,7 @@ public class DeviceManagerFragment extends MvpBindingFragment&lt;DeviceManagerFragm
94 93 if (null != binding) {
95 94 binding.topbar.setTitle("设备管理");
96 95 //设置返回按钮
97   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  96 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
98 97 @Override
99 98 public void onClick(View view) {
100 99 getActivity().finish();
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/FirmwareUpdateFragment.java
  View file @fcc065b
... ... @@ -58,7 +58,7 @@ public class FirmwareUpdateFragment extends MvpBindingFragment&lt;FirmwareUpdateFra
58 58 if (null != binding) {
59 59 binding.topbar.setTitle("固件升级");
60 60 //设置返回按钮
61   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  61 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
62 62 @Override
63 63 public void onClick(View view) {
64 64 getActivity().finish();
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/InvitFriendFragment.java
  View file @fcc065b
... ... @@ -54,7 +54,7 @@ public class InvitFriendFragment extends MvpBindingFragment&lt;InvitFriendView, Inv
54 54 if (null != binding) {
55 55 binding.topbar.setTitle("二维码邀请加入");
56 56 //设置返回按钮
57   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  57 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
58 58 @Override
59 59 public void onClick(View view) {
60 60 getActivity().finish();
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SearchDevicefragment.java
  View file @fcc065b
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
2 2  
3 3 import android.os.Bundle;
4   -import android.os.Handler;
5 4 import android.support.annotation.Nullable;
6 5 import android.support.v4.content.ContextCompat;
7 6 import android.view.View;
... ... @@ -17,7 +16,6 @@ import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SearchDevicefragmentPres
17 16 import com.cnlive.strike.xiaojiaspeaker.frame.view.SearchDevicefragmentView;
18 17 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
19 18 import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
20   -import com.hannesdorfmann.mosby3.mvp.MvpFragment;
21 19  
22 20 import org.greenrobot.eventbus.Subscribe;
23 21 import org.greenrobot.eventbus.ThreadMode;
... ... @@ -59,7 +57,7 @@ public class SearchDevicefragment extends MvpBindingFragment&lt;SearchDevicefragmen
59 57 if (null != binding) {
60 58 binding.topbar.setTitle("选择配对设备").setTextColor(ContextCompat.getColor(getActivity(), R.color.color_282828));
61 59 //设置返回按钮
62   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  60 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
63 61 @Override
64 62 public void onClick(View view) {
65 63 if (null != getActivity()) {
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SelectIMFriendFragment.java
  View file @fcc065b
... ... @@ -6,9 +6,6 @@ import android.support.v4.content.ContextCompat;
6 6 import android.text.TextUtils;
7 7 import android.view.View;
8 8  
9   -import com.alibaba.android.arouter.launcher.ARouter;
10   -import com.cnlive.libs.base.arouter.im.FriendListData;
11   -import com.cnlive.libs.base.arouter.im.ImOpenService;
12 9 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
13 10 import com.cnlive.libs.base.util.StatusBarUtil;
14 11 import com.cnlive.libs.base.util.StatusBarUtil2;
... ... @@ -22,8 +19,6 @@ import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
22 19 import org.greenrobot.eventbus.Subscribe;
23 20 import org.greenrobot.eventbus.ThreadMode;
24 21  
25   -import java.util.List;
26   -
27 22 public class SelectIMFriendFragment extends MvpBindingFragment<SelectIMFriendView, SelectIMFriendPresenter, Object, FragmentSelectImFriendBinding> {
28 23  
29 24 public static SelectIMFriendFragment newInstance(String currentSelectFamilyId) {
... ... @@ -76,7 +71,7 @@ public class SelectIMFriendFragment extends MvpBindingFragment&lt;SelectIMFriendVie
76 71 if (null != binding) {
77 72 binding.topbar.setTitle("选择好友").setTextColor(ContextCompat.getColor(getActivity(), R.color.color_282828));
78 73 //设置返回按钮
79   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  74 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
80 75 @Override
81 76 public void onClick(View view) {
82 77 if (null != getActivity()) {
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SelectWifiFragment.java
  View file @fcc065b
... ... @@ -21,14 +21,11 @@ import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentSelectWifiBinding;
21 21 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SelectWifiFragmentPresenter;
22 22 import com.cnlive.strike.xiaojiaspeaker.frame.view.SelectWifiFragmentView;
23 23 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
24   -import com.cnlive.strike.xiaojiaspeaker.netWork.bean.ConfigDeviceNetParam;
25 24 import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
26 25  
27 26 import org.greenrobot.eventbus.Subscribe;
28 27 import org.greenrobot.eventbus.ThreadMode;
29 28  
30   -import java.io.Serializable;
31   -
32 29 public class SelectWifiFragment extends MvpBindingFragment<SelectWifiFragmentView, SelectWifiFragmentPresenter, Object, FragmentSelectWifiBinding> {
33 30 private String TAG = "SelectWifiFragment";
34 31  
... ... @@ -75,7 +72,7 @@ public class SelectWifiFragment extends MvpBindingFragment&lt;SelectWifiFragmentVie
75 72 if (null != binding) {
76 73 binding.topbar.setTitle("请选择WIFI网络").setTextColor(ContextCompat.getColor(getActivity(), R.color.color_282828));
77 74 //设置返回按钮
78   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  75 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
79 76 @Override
80 77 public void onClick(View view) {
81 78 if (null != getActivity()) {
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SetFriendsRoleFragment.java
  View file @fcc065b
... ... @@ -67,7 +67,7 @@ public class SetFriendsRoleFragment extends MvpBindingFragment&lt;SetFriendsRoleVie
67 67 if (null != binding) {
68 68 binding.topbar.setTitle("设置角色").setTextColor(ContextCompat.getColor(getActivity(), R.color.color_282828));
69 69 //设置返回按钮
70   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  70 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
71 71 @Override
72 72 public void onClick(View view) {
73 73 if (null != getActivity()) {
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/UserManagerFragment.java
  View file @fcc065b
... ... @@ -5,7 +5,6 @@ import android.support.annotation.Nullable;
5 5 import android.support.v4.content.ContextCompat;
6 6 import android.text.TextUtils;
7 7 import android.view.View;
8   -import android.widget.Button;
9 8  
10 9 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
11 10 import com.cnlive.libs.base.util.StatusBarUtil;
... ... @@ -78,7 +77,7 @@ public class UserManagerFragment extends MvpBindingFragment&lt;UserManagerView, Use
78 77 if (null != binding) {
79 78 binding.topbar.setTitle("使用者管理").setTextColor(ContextCompat.getColor(getActivity(), R.color.color_282828));
80 79 //设置返回按钮
81   - binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  80 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
82 81 @Override
83 82 public void onClick(View view) {
84 83 if (null != getActivity()) {
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/widget/WifiPwdDialog.java
  View file @fcc065b
... ... @@ -103,7 +103,7 @@ public class WifiPwdDialog extends Dialog {
103 103 } else {
104 104 btn_ok.setClickable(true);
105 105 btn_ok.setTextColor(ContextCompat.getColor(context, rightColor));
106   - btn_ok.setBackground(context.getResources().getDrawable(R.drawable.selector_dialog_btn_right));
  106 + btn_ok.setBackground(context.getResources().getDrawable(R.drawable.selector_xiaojia_dialog_btn_right));
107 107 }
108 108 }
109 109  
... ... @@ -120,7 +120,7 @@ public class WifiPwdDialog extends Dialog {
120 120 if ("0".equals(iv_pwd.getTag().toString())) {
121 121 //显示明文
122 122 iv_pwd.setTag("1");
123   - iv_pwd.setBackground(ContextCompat.getDrawable(context, R.drawable.icon_see_pwd));
  123 + iv_pwd.setBackground(ContextCompat.getDrawable(context, R.drawable.icon_xiaojia_see_pwd));
124 124 //选择状态 显示明文--设置为可见的密码
125 125 // et_pwd.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD);
126 126 et_pwd.setInputType(InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD | InputType.TYPE_CLASS_TEXT);
... ... @@ -132,7 +132,7 @@ public class WifiPwdDialog extends Dialog {
132 132 //显示加密
133 133 else {
134 134 iv_pwd.setTag("0");
135   - iv_pwd.setBackground(ContextCompat.getDrawable(context, R.drawable.icon_no_see_pwd));
  135 + iv_pwd.setBackground(ContextCompat.getDrawable(context, R.drawable.icon_xiaojia_no_see_pwd));
136 136 //选择状态 设置为不可见的密码
137 137 et_pwd.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD | InputType.TYPE_CLASS_TEXT);
138 138 //移动光标位置
... ...
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/ic_audio.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/ic_xiaojia_audio.png
View file @fcc065b

4.77 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/ic_delete.webp renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/ic_xiaojia_delete.webp
View file @fcc065b
No preview for this file type
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/ic_item_continue.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/ic_xiaojia_item_continue.png
View file @fcc065b

1.37 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_back.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_xiaojia_back.png
View file @fcc065b

559 Bytes
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_conn_success.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_xiaojia_conn_success.png
View file @fcc065b

3.75 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_device_declare.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_xiaojia_device_declare.png
View file @fcc065b

1.91 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_device_manager.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_xiaojia_device_manager.png
View file @fcc065b

2.06 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_friend.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_xiaojia_friend.png
View file @fcc065b

901 Bytes
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_gray_close.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_xiaojia_gray_close.png
View file @fcc065b

1004 Bytes
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_item_add.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_xiaojia_item_add.png
View file @fcc065b

426 Bytes
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_item_right_arrow.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_xiaojia_item_right_arrow.png
View file @fcc065b

476 Bytes
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_no_see_pwd.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_xiaojia_no_see_pwd.png
View file @fcc065b

688 Bytes
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_qrcode.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_xiaojia_qrcode.png
View file @fcc065b

554 Bytes
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_search.webp renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_xiaojia_search.webp
View file @fcc065b
No preview for this file type
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_see_pwd.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_xiaojia_see_pwd.png
View file @fcc065b

1.27 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_set_role_close.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_xiaojia_set_role_close.png
View file @fcc065b

785 Bytes
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_user_manager.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_xiaojia_user_manager.png
View file @fcc065b

2.08 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/key_instruction.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/key_xiaojia_instruction.png
View file @fcc065b

83.4 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/light_instruction.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/light_xiaojia_instruction.png
View file @fcc065b

84.4 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/pop_gray_left.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/pop_xiaojia_gray_left.png
View file @fcc065b

1.92 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/pop_gray_right.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/pop_xiaojia_gray_right.png
View file @fcc065b

2.3 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/round_rectangle_bg.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/round_xiaojia_rectangle_bg.png
View file @fcc065b

3.97 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/bg_btn_green.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/xiaojia_bg_btn_green.png
View file @fcc065b

17.1 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/conn_success_gift.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/xiaojia_conn_success_gift.png
View file @fcc065b

135 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/conn_success_gift_close.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/xiaojia_conn_success_gift_close.png
View file @fcc065b

1.76 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/dd_xuanzhong.webp renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/xiaojia_dd_xuanzhong.webp
View file @fcc065b
No preview for this file type
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/family_bg.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/xiaojia_family_bg.png
View file @fcc065b

150 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/step1.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/xiaojia_step1.png
View file @fcc065b

45.1 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/step2.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/xiaojia_step2.png
View file @fcc065b

64.6 KB
module_xiaojiaSoundBox/src/main/res/drawable-v21/ripple_bg.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable-v21/ripple_xiaojia_bg.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable-v21/selectable_item_white.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable-v21/selectable_xiaojia_item_white.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/ic_delete.webp renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/ic_xiaojia_delete.webp
View file @fcc065b
No preview for this file type
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_back.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_xiaojia_back.png
View file @fcc065b

626 Bytes
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_conn_success.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_xiaojia_conn_success.png
View file @fcc065b

3.39 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_device_declare.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_xiaojia_device_declare.png
View file @fcc065b

2.1 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_device_manager.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_xiaojia_device_manager.png
View file @fcc065b

2.01 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_friend.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_xiaojia_friend.png
View file @fcc065b

1.17 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_gray_close.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_xiaojia_gray_close.png
View file @fcc065b

1.12 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_item_add.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_xiaojia_item_add.png
View file @fcc065b

274 Bytes
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_item_right_arrow.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_xiaojia_item_right_arrow.png
View file @fcc065b

461 Bytes
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_no_see_pwd.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_xiaojia_no_see_pwd.png
View file @fcc065b

872 Bytes
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_qrcode.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_xiaojia_qrcode.png
View file @fcc065b

731 Bytes
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_search.webp renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_xiaojia_search.webp
View file @fcc065b
No preview for this file type
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_see_pwd.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_xiaojia_see_pwd.png
View file @fcc065b

1.42 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_set_role_close.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_xiaojia_set_role_close.png
View file @fcc065b

955 Bytes
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_user_manager.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_xiaojia_user_manager.png
View file @fcc065b

2.38 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/key_instruction.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/key_xiaojia_instruction.png
View file @fcc065b

128 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/light_instruction.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/light_xiaojia_instruction.png
View file @fcc065b

151 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/pop_gray_left.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/pop_xiaojia_gray_left.png
View file @fcc065b

2.28 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/pop_gray_right.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/pop_xiaojia_gray_right.png
View file @fcc065b

2.44 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/round_rectangle_bg.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/round_xiaojia_rectangle_bg.png
View file @fcc065b

6.04 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/bg_btn_green.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/xiaojia_bg_btn_green.png
View file @fcc065b

46.2 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/conn_success_gift.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/xiaojia_conn_success_gift.png
View file @fcc065b

263 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/conn_success_gift_close.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/xiaojia_conn_success_gift_close.png
View file @fcc065b

1.22 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/family_bg.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/xiaojia_family_bg.png
View file @fcc065b

231 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/step1.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/xiaojia_step1.png
View file @fcc065b

70.6 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/step2.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/xiaojia_step2.png
View file @fcc065b

82.1 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/ic_delete.webp renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/ic_xiaojia_delete.webp
View file @fcc065b
No preview for this file type
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_back.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_xiaojia_back.png
View file @fcc065b

1.13 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_conn_success.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_xiaojia_conn_success.png
View file @fcc065b

8.42 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_device_declare.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_xiaojia_device_declare.png
View file @fcc065b

4.17 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_device_manager.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_xiaojia_device_manager.png
View file @fcc065b

4.18 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_friend.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_xiaojia_friend.png
View file @fcc065b

2.21 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_gray_close.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_xiaojia_gray_close.png
View file @fcc065b

2 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_item_add.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_xiaojia_item_add.png
View file @fcc065b

796 Bytes
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_item_right_arrow.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_xiaojia_item_right_arrow.png
View file @fcc065b

816 Bytes
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_no_see_pwd.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_xiaojia_no_see_pwd.png
View file @fcc065b

1.63 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_qrcode.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_xiaojia_qrcode.png
View file @fcc065b

1.16 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_search.webp renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_xiaojia_search.webp
View file @fcc065b
No preview for this file type
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_see_pwd.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_xiaojia_see_pwd.png
View file @fcc065b

2.87 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_set_role_close.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_xiaojia_set_role_close.png
View file @fcc065b

1.31 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_user_manager.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_xiaojia_user_manager.png
View file @fcc065b

4.74 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/key_instruction.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/key_xiaojia_instruction.png
View file @fcc065b

246 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/light_instruction.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/light_xiaojia_instruction.png
View file @fcc065b

266 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/pop_gray_left.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/pop_xiaojia_gray_left.png
View file @fcc065b

4.54 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/pop_gray_right.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/pop_xiaojia_gray_right.png
View file @fcc065b

6.1 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/round_rectangle_bg.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/round_xiaojia_rectangle_bg.png
View file @fcc065b

11.2 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/bg_btn_green.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/xiaojia_bg_btn_green.png
View file @fcc065b

72.9 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/conn_success_gift.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/xiaojia_conn_success_gift.png
View file @fcc065b

469 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/conn_success_gift_close.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/xiaojia_conn_success_gift_close.png
View file @fcc065b

4.04 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/family_bg.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/xiaojia_family_bg.png
View file @fcc065b

496 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/step1.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/xiaojia_step1.png
View file @fcc065b

133 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/step2.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/xiaojia_step2.png
View file @fcc065b

191 KB
module_xiaojiaSoundBox/src/main/res/drawable/bg_letterbar.xml deleted 100644 → 0
  View file @5771a8b
1   -<?xml version="1.0" encoding="utf-8"?>
2   -<selector xmlns:android="http://schemas.android.com/apk/res/android">
3   -
4   - <item android:drawable="@drawable/bg_letterbar_pressed" android:state_pressed="true" />
5   - <item android:drawable="@drawable/bg_letterbar_pressed" android:state_selected="true" />
6   - <item android:drawable="@drawable/bg_letterbar_pressed" android:state_focused="true" />
7   - <item android:drawable="@drawable/bg_letterbar_unpressed" />
8   -
9   -</selector>
module_xiaojiaSoundBox/src/main/res/drawable/bg_xiaojia_letterbar.xml 0 → 100644
  View file @fcc065b
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<selector xmlns:android="http://schemas.android.com/apk/res/android">
  3 +
  4 + <item android:drawable="@drawable/bg_xiaojia_letterbar_pressed" android:state_pressed="true" />
  5 + <item android:drawable="@drawable/bg_xiaojia_letterbar_pressed" android:state_selected="true" />
  6 + <item android:drawable="@drawable/bg_xiaojia_letterbar_pressed" android:state_focused="true" />
  7 + <item android:drawable="@drawable/bg_xiaojia_letterbar_unpressed" />
  8 +
  9 +</selector>
... ...
module_xiaojiaSoundBox/src/main/res/drawable/bg_letterbar_pressed.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/bg_xiaojia_letterbar_pressed.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/bg_letterbar_unpressed.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/bg_xiaojia_letterbar_unpressed.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/bg_overlay.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/bg_xiaojia_overlay.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/btn_selector_blue.xml
  View file @fcc065b
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <selector xmlns:android="http://schemas.android.com/apk/res/android">
3 3 <item android:drawable="@drawable/btn_press_shape" android:state_pressed="true"></item>
4   - <item android:drawable="@drawable/btn_nopress_shape" android:state_pressed="false"></item>
  4 + <item android:drawable="@drawable/btn_xiaojia_nopress_shape" android:state_pressed="false"></item>
5 5 </selector>
6 6 \ No newline at end of file
... ...
module_xiaojiaSoundBox/src/main/res/drawable/btn_nopress_shape.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/btn_xiaojia_nopress_shape.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/free_dialog_bg.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/free_xiaojia_dialog_bg.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/ksw_md_thumb.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/ksw_xiaojia_md_thumb.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/layer_tran.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/layer_xiaojia_tran.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/miui_back_drawable.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/miui_xiaojia_back_drawable.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/miui_thumb_drawable.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/miui_xiaojia_thumb_drawable.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/ripple_bg.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/ripple_xiaojia_bg.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/selectable_background.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/selectable_xiaojia_background.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/selectable_item_white.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/selectable_xiaojia_item_white.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/selectable_pop_item_background.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/selectable_xiaojia_pop_item_background.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/selector_shape_check_box_bg.xml deleted 100644 → 0
  View file @5771a8b
1   -<?xml version="1.0" encoding="utf-8"?>
2   -<selector xmlns:android="http://schemas.android.com/apk/res/android">
3   - <item android:drawable="@drawable/shape_check_box_checked" android:state_checked="true" />
4   - <item android:drawable="@drawable/shape_check_box_normal" android:state_checked="false" android:state_enabled="true" />
5   - <item android:drawable="@drawable/shape_check_box_normal" android:state_checked="false" android:state_enabled="false" />
6   -
7   -</selector>
8 0 \ No newline at end of file
module_xiaojiaSoundBox/src/main/res/drawable/selector_btn_gray.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/selector_xiaojia_btn_gray.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/selector_check_box_text_color.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/selector_xiaojia_check_box_text_color.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/selector_checkbox_no_default.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/selector_xiaojia_checkbox_no_default.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/selector_dialog_btn_left.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/selector_xiaojia_dialog_btn_left.xml
  View file @fcc065b
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <selector xmlns:android="http://schemas.android.com/apk/res/android">
3 3 <item android:drawable="@color/transparent" android:state_pressed="false" />
4   - <item android:drawable="@drawable/shape_dialog_btn_left_press" android:state_pressed="true" />
  4 + <item android:drawable="@drawable/shape_xiaojia_dialog_btn_left_press" android:state_pressed="true" />
5 5  
6 6 </selector>
7 7 \ No newline at end of file
... ...
module_xiaojiaSoundBox/src/main/res/drawable/selector_dialog_btn_right.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/selector_xiaojia_dialog_btn_right.xml
  View file @fcc065b
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <selector xmlns:android="http://schemas.android.com/apk/res/android">
3 3 <item android:drawable="@color/transparent" android:state_pressed="false" />
4   - <item android:drawable="@drawable/shape_dialog_btn_right_press" android:state_pressed="true" />
  4 + <item android:drawable="@drawable/shape_xiaojia_dialog_btn_right_press" android:state_pressed="true" />
5 5  
6 6 </selector>
7 7 \ No newline at end of file
... ...
module_xiaojiaSoundBox/src/main/res/drawable/selector_letterbar_text.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/selector_xiaojia_letterbar_text.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/selector_round_rectangle_white_bg.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/selector_xiaojia_round_rectangle_white_bg.xml
  View file @fcc065b
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <selector xmlns:android="http://schemas.android.com/apk/res/android">
3   - <item android:drawable="@drawable/round_rectangle_bg" android:state_pressed="false" />
  3 + <item android:drawable="@drawable/round_xiaojia_rectangle_bg" android:state_pressed="false" />
4 4 <item android:drawable="@color/round_rectangle_press" android:state_pressed="true" />
5 5 </selector>
6 6 \ No newline at end of file
... ...
module_xiaojiaSoundBox/src/main/res/drawable/selector_xiaojia_shape_check_box_bg.xml 0 → 100644
  View file @fcc065b
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<selector xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <item android:drawable="@drawable/shape_xiaojia_check_box_checked" android:state_checked="true" />
  4 + <item android:drawable="@drawable/shape_xiaojia_check_box_normal" android:state_checked="false" android:state_enabled="true" />
  5 + <item android:drawable="@drawable/shape_xiaojia_check_box_normal" android:state_checked="false" android:state_enabled="false" />
  6 +
  7 +</selector>
0 8 \ No newline at end of file
... ...
module_xiaojiaSoundBox/src/main/res/drawable/selector_tip_dialog_btn_bottom.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/selector_xiaojia_tip_dialog_btn_bottom.xml
  View file @fcc065b
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <selector xmlns:android="http://schemas.android.com/apk/res/android">
3 3 <item android:drawable="@color/transparent" android:state_pressed="false" />
4   - <item android:drawable="@drawable/shape_tip_dialog_btn_bottom_press" android:state_pressed="true" />
  4 + <item android:drawable="@drawable/shape_xiaojia_tip_dialog_btn_bottom_press" android:state_pressed="true" />
5 5  
6 6 </selector>
7 7 \ No newline at end of file
... ...
module_xiaojiaSoundBox/src/main/res/drawable/shape_10_radius_white_bg.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/shape_xiaojia_10_radius_white_bg.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/shape_5_radius_white_bg.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/shape_xiaojia_5_radius_white_bg.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/shape_check_box_checked.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/shape_xiaojia_check_box_checked.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/shape_check_box_normal.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/shape_xiaojia_check_box_normal.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/shape_dialog_btn_left_press.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/shape_xiaojia_dialog_btn_left_press.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/shape_dialog_btn_right_press.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/shape_xiaojia_dialog_btn_right_press.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/shape_et_wifi_bg.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/shape_xiaojia_et_wifi_bg.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/shape_green_stroke.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/shape_xiaojia_green_stroke.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/shape_menu_bg.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/shape_xiaojia_menu_bg.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/shape_red_circle.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/shape_xiaojia_red_circle.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/shape_tip_dialog_btn_bottom_press.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/shape_xiaojia_tip_dialog_btn_bottom_press.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/drawable/shape_wifi_dialog_bg.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/shape_xiaojia_wifi_dialog_bg.xml
  View file @fcc065b
module_xiaojiaSoundBox/src/main/res/layout/activity_blue_tooth_step1.xml
  View file @fcc065b
... ... @@ -20,7 +20,7 @@
20 20 android:layout_width="match_parent"
21 21 android:layout_height="match_parent"
22 22 android:layout_margin="20dp"
23   - android:background="@drawable/shape_10_radius_white_bg"
  23 + android:background="@drawable/shape_xiaojia_10_radius_white_bg"
24 24 android:orientation="vertical">
25 25  
26 26  
... ... @@ -55,7 +55,7 @@
55 55 android:layout_height="222dp"
56 56 android:layout_centerHorizontal="true"
57 57 android:layout_centerVertical="true"
58   - android:background="@drawable/step1" />
  58 + android:background="@drawable/xiaojia_step1" />
59 59 </LinearLayout>
60 60  
61 61 <LinearLayout
... ...
module_xiaojiaSoundBox/src/main/res/layout/activity_blue_tooth_step2.xml
  View file @fcc065b
... ... @@ -21,7 +21,7 @@
21 21 android:layout_height="match_parent"
22 22 android:layout_margin="20dp"
23 23 android:gravity="center"
24   - android:background="@drawable/shape_10_radius_white_bg"
  24 + android:background="@drawable/shape_xiaojia_10_radius_white_bg"
25 25 android:orientation="vertical">
26 26  
27 27  
... ... @@ -58,7 +58,7 @@
58 58 android:layout_height="273dp"
59 59 android:layout_centerHorizontal="true"
60 60 android:layout_centerVertical="true"
61   - android:background="@drawable/step2" />
  61 + android:background="@drawable/xiaojia_step2" />
62 62  
63 63  
64 64 </LinearLayout>
... ...
module_xiaojiaSoundBox/src/main/res/layout/activity_conn_bluetooth_success.xml
  View file @fcc065b
... ... @@ -29,7 +29,7 @@
29 29 <ImageView
30 30 android:layout_width="65dp"
31 31 android:layout_height="65dp"
32   - android:background="@drawable/icon_conn_success" />
  32 + android:background="@drawable/icon_xiaojia_conn_success" />
33 33  
34 34 <TextView
35 35 android:layout_width="wrap_content"
... ... @@ -67,7 +67,7 @@
67 67 android:layout_height="40dp"
68 68 android:layout_gravity="center_horizontal"
69 69 android:layout_marginTop="30dp"
70   - android:background="@drawable/shape_green_stroke"
  70 + android:background="@drawable/shape_xiaojia_green_stroke"
71 71 android:text="完成"
72 72 android:textColor="@color/btn_green"
73 73 android:textSize="18sp" />
... ... @@ -140,14 +140,14 @@
140 140 <ImageView
141 141 android:layout_width="370dp"
142 142 android:layout_height="339dp"
143   - android:background="@drawable/conn_success_gift" />
  143 + android:background="@drawable/xiaojia_conn_success_gift" />
144 144  
145 145 <ImageView
146 146 android:id="@+id/iv_close_gift"
147 147 android:layout_width="35dp"
148 148 android:layout_height="35dp"
149 149 android:layout_marginTop="20dp"
150   - android:background="@drawable/conn_success_gift_close" />
  150 + android:background="@drawable/xiaojia_conn_success_gift_close" />
151 151 </LinearLayout>
152 152 </FrameLayout>
153 153 </layout>
154 154 \ No newline at end of file
... ...
module_xiaojiaSoundBox/src/main/res/layout/activity_device_info.xml
  View file @fcc065b
... ... @@ -66,7 +66,7 @@
66 66 android:layout_width="7dp"
67 67 android:layout_height="13dp"
68 68 android:layout_marginRight="10dp"
69   - android:background="@drawable/icon_item_right_arrow"
  69 + android:background="@drawable/icon_xiaojia_item_right_arrow"
70 70 android:visibility="gone" />
71 71  
72 72 </LinearLayout>
... ... @@ -122,7 +122,7 @@
122 122 android:layout_width="7dp"
123 123 android:layout_height="13dp"
124 124 android:layout_marginRight="10dp"
125   - android:background="@drawable/icon_item_right_arrow"
  125 + android:background="@drawable/icon_xiaojia_item_right_arrow"
126 126 android:visibility="gone" />
127 127  
128 128 </LinearLayout>
... ... @@ -178,7 +178,7 @@
178 178 android:layout_width="7dp"
179 179 android:layout_height="13dp"
180 180 android:layout_marginRight="10dp"
181   - android:background="@drawable/icon_item_right_arrow"
  181 + android:background="@drawable/icon_xiaojia_item_right_arrow"
182 182 android:visibility="gone" />
183 183  
184 184 </LinearLayout>
... ...
module_xiaojiaSoundBox/src/main/res/layout/activity_device_instruction.xml
  View file @fcc065b
... ... @@ -39,13 +39,13 @@
39 39 android:layout_marginLeft="10dp"
40 40 android:layout_marginRight="10dp"
41 41 android:layout_marginBottom="20dp"
42   - android:background="@drawable/shape_5_radius_white_bg"
  42 + android:background="@drawable/shape_xiaojia_5_radius_white_bg"
43 43 android:gravity="center">
44 44  
45 45 <ImageView
46 46 android:layout_width="316dp"
47 47 android:layout_height="298dp"
48   - android:background="@drawable/key_instruction" />
  48 + android:background="@drawable/key_xiaojia_instruction" />
49 49 </LinearLayout>
50 50  
51 51 <TextView
... ... @@ -65,7 +65,7 @@
65 65 android:layout_marginRight="10dp"
66 66 android:layout_marginBottom="20dp"
67 67 android:adjustViewBounds="true"
68   - android:background="@drawable/light_instruction"
  68 + android:background="@drawable/light_xiaojia_instruction"
69 69 android:maxHeight="348dp"
70 70 android:scaleType="fitXY" />
71 71 </LinearLayout>
... ...
module_xiaojiaSoundBox/src/main/res/layout/activity_device_manager.xml
  View file @fcc065b
... ... @@ -31,7 +31,7 @@
31 31 <!-- android:layout_height="50dp"-->
32 32 <!-- android:layout_marginTop="10dp"-->
33 33 <!-- android:layout_marginBottom="10dp"-->
34   -<!-- android:background="@drawable/selectable_item_white"-->
  34 +<!-- android:background="@drawable/selectable_xiaojia_item_white"-->
35 35 <!-- android:clickable="true">-->
36 36  
37 37 <!-- <LinearLayout-->
... ... @@ -77,7 +77,7 @@
77 77 <!-- android:layout_width="7dp"-->
78 78 <!-- android:layout_height="13dp"-->
79 79 <!-- android:layout_marginRight="10dp"-->
80   -<!-- android:background="@drawable/icon_item_right_arrow" />-->
  80 +<!-- android:background="@drawable/icon_xiaojia_item_right_arrow" />-->
81 81  
82 82 <!-- </LinearLayout>-->
83 83  
... ... @@ -89,7 +89,7 @@
89 89 <!-- android:layout_height="50dp"-->
90 90 <!-- android:layout_marginTop="10dp"-->
91 91 <!-- android:layout_marginBottom="10dp"-->
92   -<!-- android:background="@drawable/selectable_item_white"-->
  92 +<!-- android:background="@drawable/selectable_xiaojia_item_white"-->
93 93 <!-- android:clickable="true">-->
94 94  
95 95 <!-- <LinearLayout-->
... ... @@ -134,7 +134,7 @@
134 134 <!-- android:layout_width="7dp"-->
135 135 <!-- android:layout_height="13dp"-->
136 136 <!-- android:layout_marginRight="10dp"-->
137   -<!-- android:background="@drawable/icon_item_right_arrow" />-->
  137 +<!-- android:background="@drawable/icon_xiaojia_item_right_arrow" />-->
138 138  
139 139 <!-- </LinearLayout>-->
140 140  
... ... @@ -146,7 +146,7 @@
146 146 <!-- android:layout_height="50dp"-->
147 147 <!-- android:layout_marginTop="10dp"-->
148 148 <!-- android:layout_marginBottom="10dp"-->
149   -<!-- android:background="@drawable/selectable_item_white"-->
  149 +<!-- android:background="@drawable/selectable_xiaojia_item_white"-->
150 150 <!-- android:clickable="true">-->
151 151  
152 152 <!-- <LinearLayout-->
... ... @@ -191,7 +191,7 @@
191 191 <!-- android:layout_width="7dp"-->
192 192 <!-- android:layout_height="13dp"-->
193 193 <!-- android:layout_marginRight="10dp"-->
194   -<!-- android:background="@drawable/icon_item_right_arrow" />-->
  194 +<!-- android:background="@drawable/icon_xiaojia_item_right_arrow" />-->
195 195  
196 196 <!-- </LinearLayout>-->
197 197  
... ... @@ -203,7 +203,7 @@
203 203 <!-- android:layout_height="50dp"-->
204 204 <!-- android:layout_marginTop="10dp"-->
205 205 <!-- android:layout_marginBottom="10dp"-->
206   -<!-- android:background="@drawable/selectable_item_white"-->
  206 +<!-- android:background="@drawable/selectable_xiaojia_item_white"-->
207 207 <!-- android:clickable="true">-->
208 208  
209 209 <!-- <LinearLayout-->
... ... @@ -248,7 +248,7 @@
248 248 <!-- android:layout_width="7dp"-->
249 249 <!-- android:layout_height="13dp"-->
250 250 <!-- android:layout_marginRight="10dp"-->
251   -<!-- android:background="@drawable/icon_item_right_arrow" />-->
  251 +<!-- android:background="@drawable/icon_xiaojia_item_right_arrow" />-->
252 252  
253 253 <!-- </LinearLayout>-->
254 254  
... ... @@ -260,7 +260,7 @@
260 260 <!-- android:layout_width="match_parent"-->
261 261 <!-- android:layout_height="60dp"-->
262 262 <!-- android:layout_alignParentBottom="true"-->
263   -<!-- android:background="@drawable/selectable_item_white"-->
  263 +<!-- android:background="@drawable/selectable_xiaojia_item_white"-->
264 264 <!-- android:clickable="true"-->
265 265 <!-- android:gravity="center"-->
266 266 <!-- android:text="删除设备"-->
... ...
module_xiaojiaSoundBox/src/main/res/layout/activity_remote_control.xml
  View file @fcc065b
... ... @@ -27,7 +27,7 @@
27 27 android:layout_width="match_parent"
28 28 android:layout_height="90dp"
29 29 android:layout_margin="10dp"
30   - android:background="@drawable/shape_10_radius_white_bg"
  30 + android:background="@drawable/shape_xiaojia_10_radius_white_bg"
31 31 android:clickable="true"
32 32 android:orientation="vertical">
33 33  
... ... @@ -55,8 +55,8 @@
55 55 android:layout_height="wrap_content"
56 56 android:layout_gravity="right"
57 57 android:layout_marginRight="10dp"
58   - app:kswBackDrawable="@drawable/miui_back_drawable"
59   - app:kswThumbDrawable="@drawable/miui_thumb_drawable"
  58 + app:kswBackDrawable="@drawable/miui_xiaojia_back_drawable"
  59 + app:kswThumbDrawable="@drawable/miui_xiaojia_thumb_drawable"
60 60 app:kswThumbHeight="20dp"
61 61 app:kswThumbRangeRatio="2.1"
62 62 app:kswThumbWidth="20dp" />
... ...
module_xiaojiaSoundBox/src/main/res/layout/activity_share_friend.xml
  View file @fcc065b
... ... @@ -22,7 +22,7 @@
22 22 android:layout_marginTop="20dp"
23 23 android:layout_marginRight="20dp"
24 24 android:layout_marginBottom="60dp"
25   - android:background="@drawable/family_bg">
  25 + android:background="@drawable/xiaojia_family_bg">
26 26  
27 27 <LinearLayout
28 28 android:layout_width="match_parent"
... ... @@ -41,7 +41,7 @@
41 41 android:id="@+id/img_icon"
42 42 android:layout_width="37dp"
43 43 android:layout_height="37dp"
44   - android:src="@drawable/icon_friend" />
  44 + android:src="@drawable/icon_xiaojia_friend" />
45 45  
46 46 <TextView
47 47 android:id="@+id/name"
... ...
module_xiaojiaSoundBox/src/main/res/layout/dialog_edit_role.xml
  View file @fcc065b
... ... @@ -9,7 +9,7 @@
9 9 android:id="@+id/ll_child"
10 10 android:layout_width="match_parent"
11 11 android:layout_height="wrap_content"
12   - android:background="@drawable/free_dialog_bg"
  12 + android:background="@drawable/free_xiaojia_dialog_bg"
13 13 android:orientation="vertical"
14 14 android:paddingTop="10dp">
15 15  
... ... @@ -84,7 +84,7 @@
84 84 android:layout_width="match_parent"
85 85 android:layout_height="match_parent"
86 86 android:layout_gravity="center"
87   - android:background="@drawable/selector_dialog_btn_left"
  87 + android:background="@drawable/selector_xiaojia_dialog_btn_left"
88 88 android:text="取消"
89 89 android:textColor="@color/color_282828"
90 90 android:textSize="17sp" />
... ... @@ -107,7 +107,7 @@
107 107 android:layout_width="match_parent"
108 108 android:layout_height="match_parent"
109 109 android:layout_gravity="center"
110   - android:background="@drawable/selector_dialog_btn_right"
  110 + android:background="@drawable/selector_xiaojia_dialog_btn_right"
111 111 android:text="保存"
112 112 android:textColor="@color/btn_green"
113 113 android:textSize="17sp" />
... ...
module_xiaojiaSoundBox/src/main/res/layout/dialog_select.xml
  View file @fcc065b
... ... @@ -9,7 +9,7 @@
9 9 android:id="@+id/ll_child"
10 10 android:layout_width="match_parent"
11 11 android:layout_height="wrap_content"
12   - android:background="@drawable/free_dialog_bg"
  12 + android:background="@drawable/free_xiaojia_dialog_bg"
13 13 android:orientation="vertical"
14 14 android:paddingTop="10dp">
15 15  
... ... @@ -52,7 +52,7 @@
52 52 android:layout_width="match_parent"
53 53 android:layout_height="match_parent"
54 54 android:layout_gravity="center"
55   - android:background="@drawable/selector_dialog_btn_left"
  55 + android:background="@drawable/selector_xiaojia_dialog_btn_left"
56 56 android:text="否"
57 57 android:textColor="@color/btn_green"
58 58 android:textSize="15sp"
... ... @@ -76,7 +76,7 @@
76 76 android:layout_width="match_parent"
77 77 android:layout_height="match_parent"
78 78 android:layout_gravity="center"
79   - android:background="@drawable/selector_dialog_btn_right"
  79 + android:background="@drawable/selector_xiaojia_dialog_btn_right"
80 80 android:text="否"
81 81 android:textColor="@color/btn_green"
82 82 android:textSize="15sp"
... ...
module_xiaojiaSoundBox/src/main/res/layout/dialog_tip.xml
  View file @fcc065b
... ... @@ -9,7 +9,7 @@
9 9 android:id="@+id/ll_child"
10 10 android:layout_width="match_parent"
11 11 android:layout_height="wrap_content"
12   - android:background="@drawable/free_dialog_bg"
  12 + android:background="@drawable/free_xiaojia_dialog_bg"
13 13 android:orientation="vertical"
14 14 android:paddingTop="10dp">
15 15  
... ... @@ -52,7 +52,7 @@
52 52 android:layout_width="match_parent"
53 53 android:layout_height="match_parent"
54 54 android:layout_gravity="center"
55   - android:background="@drawable/selector_tip_dialog_btn_bottom"
  55 + android:background="@drawable/selector_xiaojia_tip_dialog_btn_bottom"
56 56 android:text="好的"
57 57 android:textColor="@color/btn_green"
58 58 android:textSize="15sp" />
... ...
module_xiaojiaSoundBox/src/main/res/layout/dialog_wifi_pwd.xml
  View file @fcc065b
... ... @@ -9,7 +9,7 @@
9 9 android:id="@+id/ll_child"
10 10 android:layout_width="match_parent"
11 11 android:layout_height="wrap_content"
12   - android:background="@drawable/free_dialog_bg"
  12 + android:background="@drawable/free_xiaojia_dialog_bg"
13 13 android:orientation="vertical"
14 14 android:paddingTop="10dp">
15 15  
... ... @@ -64,7 +64,7 @@
64 64 android:layout_height="13dp"
65 65 android:layout_gravity="center_vertical|right"
66 66 android:layout_marginRight="30dp"
67   - android:background="@drawable/icon_no_see_pwd" />
  67 + android:background="@drawable/icon_xiaojia_no_see_pwd" />
68 68 </FrameLayout>
69 69  
70 70 <View
... ... @@ -91,7 +91,7 @@
91 91 android:layout_width="match_parent"
92 92 android:layout_height="match_parent"
93 93 android:layout_gravity="center"
94   - android:background="@drawable/selector_dialog_btn_left"
  94 + android:background="@drawable/selector_xiaojia_dialog_btn_left"
95 95 android:text="否"
96 96 android:textColor="@color/black"
97 97 android:textSize="15sp"
... ... @@ -115,7 +115,7 @@
115 115 android:layout_width="match_parent"
116 116 android:layout_height="match_parent"
117 117 android:layout_gravity="center"
118   - android:background="@drawable/selector_dialog_btn_right"
  118 + android:background="@drawable/selector_xiaojia_dialog_btn_right"
119 119 android:clickable="false"
120 120 android:text="否"
121 121 android:textColor="@color/line"
... ...
module_xiaojiaSoundBox/src/main/res/layout/fragment_change_device_name.xml
  View file @fcc065b
... ... @@ -48,7 +48,7 @@
48 48 android:layout_width="wrap_content"
49 49 android:layout_height="wrap_content"
50 50 android:layout_marginRight="20dp"
51   - android:background="@drawable/icon_gray_close"
  51 + android:background="@drawable/icon_xiaojia_gray_close"
52 52 android:visibility="invisible" />
53 53 </LinearLayout>
54 54  
... ...
module_xiaojiaSoundBox/src/main/res/layout/fragment_device_detail.xml
  View file @fcc065b
... ... @@ -17,7 +17,7 @@
17 17 android:layout_width="match_parent"
18 18 android:layout_height="90dp"
19 19 android:layout_margin="10dp"
20   - android:background="@drawable/shape_10_radius_white_bg"
  20 + android:background="@drawable/shape_xiaojia_10_radius_white_bg"
21 21 android:clickable="true"
22 22 android:orientation="vertical"
23 23 android:visibility="gone">
... ... @@ -46,8 +46,8 @@
46 46 android:layout_height="wrap_content"
47 47 android:layout_gravity="right"
48 48 android:layout_marginRight="10dp"
49   - app:kswBackDrawable="@drawable/miui_back_drawable"
50   - app:kswThumbDrawable="@drawable/miui_thumb_drawable"
  49 + app:kswBackDrawable="@drawable/miui_xiaojia_back_drawable"
  50 + app:kswThumbDrawable="@drawable/miui_xiaojia_thumb_drawable"
51 51 app:kswThumbHeight="20dp"
52 52 app:kswThumbRangeRatio="2.1"
53 53 app:kswThumbWidth="20dp" />
... ... @@ -76,7 +76,7 @@
76 76 android:layout_width="match_parent"
77 77 android:layout_height="wrap_content"
78 78 android:layout_margin="10dp"
79   - android:background="@drawable/shape_10_radius_white_bg"
  79 + android:background="@drawable/shape_xiaojia_10_radius_white_bg"
80 80 android:orientation="vertical">
81 81 <!--使用者管理-->
82 82 <LinearLayout
... ... @@ -96,7 +96,7 @@
96 96 android:layout_height="29dp"
97 97 android:layout_centerVertical="true"
98 98 android:layout_marginLeft="10dp"
99   - android:background="@drawable/icon_user_manager" />
  99 + android:background="@drawable/icon_xiaojia_user_manager" />
100 100  
101 101 <TextView
102 102 android:layout_width="wrap_content"
... ... @@ -113,7 +113,7 @@
113 113 android:layout_alignParentRight="true"
114 114 android:layout_centerVertical="true"
115 115 android:layout_marginRight="10dp"
116   - android:background="@drawable/icon_item_right_arrow" />
  116 + android:background="@drawable/icon_xiaojia_item_right_arrow" />
117 117 </RelativeLayout>
118 118  
119 119 <View
... ... @@ -138,7 +138,7 @@
138 138 android:layout_height="21dp"
139 139 android:layout_centerVertical="true"
140 140 android:layout_marginLeft="13dp"
141   - android:background="@drawable/icon_device_manager" />
  141 + android:background="@drawable/icon_xiaojia_device_manager" />
142 142  
143 143 <TextView
144 144 android:layout_width="wrap_content"
... ... @@ -155,7 +155,7 @@
155 155 android:layout_centerVertical="true"
156 156 android:layout_marginRight="10dp"
157 157 android:layout_toLeftOf="@id/iv_device_manager_continue"
158   - android:background="@drawable/shape_red_circle"
  158 + android:background="@drawable/shape_xiaojia_red_circle"
159 159 android:visibility="gone" />
160 160  
161 161 <ImageView
... ... @@ -165,7 +165,7 @@
165 165 android:layout_alignParentRight="true"
166 166 android:layout_centerVertical="true"
167 167 android:layout_marginRight="10dp"
168   - android:background="@drawable/icon_item_right_arrow" />
  168 + android:background="@drawable/icon_xiaojia_item_right_arrow" />
169 169 </RelativeLayout>
170 170  
171 171 <View
... ... @@ -187,7 +187,7 @@
187 187 android:layout_height="23dp"
188 188 android:layout_centerVertical="true"
189 189 android:layout_marginLeft="13dp"
190   - android:background="@drawable/icon_device_declare" />
  190 + android:background="@drawable/icon_xiaojia_device_declare" />
191 191  
192 192 <TextView
193 193 android:layout_width="wrap_content"
... ... @@ -204,7 +204,7 @@
204 204 android:layout_alignParentRight="true"
205 205 android:layout_centerVertical="true"
206 206 android:layout_marginRight="10dp"
207   - android:background="@drawable/icon_item_right_arrow" />
  207 + android:background="@drawable/icon_xiaojia_item_right_arrow" />
208 208 </RelativeLayout>
209 209 <!-- -->
210 210 </LinearLayout>
... ...
module_xiaojiaSoundBox/src/main/res/layout/fragment_device_manager.xml
  View file @fcc065b
... ... @@ -38,7 +38,7 @@
38 38 <!-- <TextView-->
39 39 <!-- android:layout_width="match_parent"-->
40 40 <!-- android:layout_height="60dp"-->
41   - <!-- android:background="@drawable/selectable_item_white"-->
  41 + <!-- android:background="@drawable/selectable_xiaojia_item_white"-->
42 42 <!-- android:gravity="center"-->
43 43 <!-- android:text="删除设备"-->
44 44 <!-- android:clickable="true"-->
... ... @@ -74,7 +74,7 @@
74 74 android:layout_height="50dp"
75 75 android:layout_marginTop="10dp"
76 76 android:layout_marginBottom="10dp"
77   - android:background="@drawable/selectable_item_white"
  77 + android:background="@drawable/selectable_xiaojia_item_white"
78 78 android:clickable="true">
79 79  
80 80 <LinearLayout
... ... @@ -120,7 +120,7 @@
120 120 android:layout_width="7dp"
121 121 android:layout_height="13dp"
122 122 android:layout_marginRight="10dp"
123   - android:background="@drawable/icon_item_right_arrow" />
  123 + android:background="@drawable/icon_xiaojia_item_right_arrow" />
124 124  
125 125 </LinearLayout>
126 126  
... ... @@ -132,7 +132,7 @@
132 132 android:layout_height="50dp"
133 133 android:layout_marginTop="10dp"
134 134 android:layout_marginBottom="10dp"
135   - android:background="@drawable/selectable_item_white"
  135 + android:background="@drawable/selectable_xiaojia_item_white"
136 136 android:clickable="true">
137 137  
138 138 <LinearLayout
... ... @@ -176,7 +176,7 @@
176 176 android:layout_width="7dp"
177 177 android:layout_height="13dp"
178 178 android:layout_marginRight="10dp"
179   - android:background="@drawable/icon_item_right_arrow" />
  179 + android:background="@drawable/icon_xiaojia_item_right_arrow" />
180 180  
181 181 </LinearLayout>
182 182  
... ... @@ -188,7 +188,7 @@
188 188 android:layout_height="50dp"
189 189 android:layout_marginTop="10dp"
190 190 android:layout_marginBottom="10dp"
191   - android:background="@drawable/selectable_item_white"
  191 + android:background="@drawable/selectable_xiaojia_item_white"
192 192 android:clickable="true">
193 193  
194 194 <LinearLayout
... ... @@ -233,7 +233,7 @@
233 233 android:layout_width="7dp"
234 234 android:layout_height="13dp"
235 235 android:layout_marginRight="10dp"
236   - android:background="@drawable/icon_item_right_arrow" />
  236 + android:background="@drawable/icon_xiaojia_item_right_arrow" />
237 237  
238 238 </LinearLayout>
239 239  
... ... @@ -245,7 +245,7 @@
245 245 android:layout_height="50dp"
246 246 android:layout_marginTop="10dp"
247 247 android:layout_marginBottom="10dp"
248   - android:background="@drawable/selectable_item_white"
  248 + android:background="@drawable/selectable_xiaojia_item_white"
249 249 android:clickable="true">
250 250  
251 251 <LinearLayout
... ... @@ -290,7 +290,7 @@
290 290 android:layout_width="7dp"
291 291 android:layout_height="13dp"
292 292 android:layout_marginRight="10dp"
293   - android:background="@drawable/icon_item_right_arrow" />
  293 + android:background="@drawable/icon_xiaojia_item_right_arrow" />
294 294  
295 295 </LinearLayout>
296 296  
... ... @@ -303,7 +303,7 @@
303 303 android:layout_width="match_parent"
304 304 android:layout_height="60dp"
305 305 android:layout_alignParentBottom="true"
306   - android:background="@drawable/selectable_item_white"
  306 + android:background="@drawable/selectable_xiaojia_item_white"
307 307 android:clickable="true"
308 308 android:gravity="center"
309 309 android:text="删除设备"
... ...
module_xiaojiaSoundBox/src/main/res/layout/fragment_firmware_update.xml
  View file @fcc065b
... ... @@ -98,7 +98,7 @@
98 98 android:layout_gravity="center"
99 99 android:layout_marginLeft="50dp"
100 100 android:layout_marginBottom="10dp"
101   - android:background="@drawable/shape_red_circle"
  101 + android:background="@drawable/shape_xiaojia_red_circle"
102 102 android:visibility="gone" />
103 103 </FrameLayout>
104 104  
... ...
module_xiaojiaSoundBox/src/main/res/layout/fragment_select_im_friend.xml
  View file @fcc065b
... ... @@ -26,7 +26,7 @@
26 26 android:layout_width="match_parent"
27 27 android:layout_height="40dp"
28 28 android:layout_margin="10dp"
29   - android:background="@drawable/shape_10_radius_white_bg"
  29 + android:background="@drawable/shape_xiaojia_10_radius_white_bg"
30 30 android:gravity="center_vertical">
31 31  
32 32 <ImageView
... ... @@ -34,7 +34,7 @@
34 34 android:layout_height="14dp"
35 35 android:layout_centerVertical="true"
36 36 android:layout_marginLeft="10dp"
37   - android:src="@drawable/icon_search" />
  37 + android:src="@drawable/icon_xiaojia_search" />
38 38  
39 39 <EditText
40 40 android:id="@+id/et_query"
... ... @@ -57,7 +57,7 @@
57 57 android:layout_centerVertical="true"
58 58 android:layout_marginLeft="5dp"
59 59 android:layout_marginRight="10dp"
60   - android:background="@drawable/ic_delete"
  60 + android:background="@drawable/ic_xiaojia_delete"
61 61 android:visibility="gone" />
62 62 </LinearLayout>
63 63  
... ... @@ -77,9 +77,9 @@
77 77 android:layout_height="match_parent"
78 78 android:layout_alignParentRight="true"
79 79 android:layout_gravity="right"
80   - letterBar:lbLetterBarBackground="@drawable/bg_letterbar"
81   - letterBar:lbLetterBarTextColor="@drawable/selector_letterbar_text"
82   - letterBar:lbOverlayBackground="@drawable/bg_overlay"
  80 + letterBar:lbLetterBarBackground="@drawable/bg_xiaojia_letterbar"
  81 + letterBar:lbLetterBarTextColor="@drawable/selector_xiaojia_letterbar_text"
  82 + letterBar:lbOverlayBackground="@drawable/bg_xiaojia_overlay"
83 83 letterBar:lbOverlayTextColor="#FFF"
84 84 letterBar:lbOverlayTextSize="40sp" />
85 85 </FrameLayout>
... ...
module_xiaojiaSoundBox/src/main/res/layout/fragment_set_friend_role.xml
  View file @fcc065b
... ... @@ -47,7 +47,7 @@
47 47 <ImageView
48 48 android:layout_width="25dp"
49 49 android:layout_height="25dp"
50   - android:background="@drawable/icon_set_role_close" />
  50 + android:background="@drawable/icon_xiaojia_set_role_close" />
51 51 </LinearLayout>
52 52 </FrameLayout>
53 53 <!-- -->
... ...
module_xiaojiaSoundBox/src/main/res/layout/fragment_user_manager.xml
  View file @fcc065b
... ... @@ -37,7 +37,7 @@
37 37 <ImageView
38 38 android:layout_width="25dp"
39 39 android:layout_height="25dp"
40   - android:background="@drawable/icon_set_role_close" />
  40 + android:background="@drawable/icon_xiaojia_set_role_close" />
41 41 </LinearLayout>
42 42 </FrameLayout>
43 43  
... ...
module_xiaojiaSoundBox/src/main/res/layout/item_list_menu_sound_box_name.xml
  View file @fcc065b
... ... @@ -7,7 +7,7 @@
7 7 android:layout_marginTop="10dp"
8 8 android:layout_marginBottom="10dp"
9 9 android:id="@+id/ll_root"
10   - android:background="@drawable/selectable_item_white"
  10 + android:background="@drawable/selectable_xiaojia_item_white"
11 11 android:clickable="true">
12 12  
13 13 <LinearLayout
... ... @@ -52,7 +52,7 @@
52 52 android:layout_width="7dp"
53 53 android:layout_height="13dp"
54 54 android:layout_marginRight="10dp"
55   - android:background="@drawable/icon_item_right_arrow" />
  55 + android:background="@drawable/icon_xiaojia_item_right_arrow" />
56 56  
57 57 </LinearLayout>
58 58  
... ...
module_xiaojiaSoundBox/src/main/res/layout/item_list_menu_switch.xml
  View file @fcc065b
... ... @@ -34,8 +34,8 @@
34 34 android:layout_height="wrap_content"
35 35 android:layout_gravity="right"
36 36 android:layout_marginRight="10dp"
37   - app:kswBackDrawable="@drawable/miui_back_drawable"
38   - app:kswThumbDrawable="@drawable/miui_thumb_drawable"
  37 + app:kswBackDrawable="@drawable/miui_xiaojia_back_drawable"
  38 + app:kswThumbDrawable="@drawable/miui_xiaojia_thumb_drawable"
39 39 app:kswThumbHeight="20dp"
40 40 app:kswThumbRangeRatio="2.1"
41 41 app:kswThumbWidth="20dp" />
... ...
module_xiaojiaSoundBox/src/main/res/layout/item_list_set_role_check_box.xml
  View file @fcc065b
... ... @@ -14,13 +14,13 @@
14 14 android:layout_width="61dp"
15 15 android:layout_height="24dp"
16 16 android:layout_margin="10dp"
17   - android:background="@drawable/selector_shape_check_box_bg"
  17 + android:background="@drawable/selector_xiaojia_shape_check_box_bg"
18 18 android:button="@null"
19 19 android:clickable="false"
20 20 android:focusable="false"
21 21 android:gravity="center"
22 22 android:text="爸爸"
23   - android:textColor="@drawable/selector_check_box_text_color"
  23 + android:textColor="@drawable/selector_xiaojia_check_box_text_color"
24 24 android:textSize="13sp" />
25 25 </LinearLayout>
26 26 </layout>
27 27 \ No newline at end of file
... ...
module_xiaojiaSoundBox/src/main/res/layout/item_list_user_host.xml
  View file @fcc065b
... ... @@ -43,7 +43,7 @@
43 43 android:layout_width="wrap_content"
44 44 android:layout_height="wrap_content"
45 45 android:layout_marginLeft="10dp"
46   - android:background="@drawable/shape_green_stroke"
  46 + android:background="@drawable/shape_xiaojia_green_stroke"
47 47 android:ellipsize="end"
48 48 android:maxLength="6"
49 49 android:paddingLeft="5dp"
... ...
module_xiaojiaSoundBox/src/main/res/layout/item_list_user_member.xml
  View file @fcc065b
... ... @@ -47,7 +47,7 @@
47 47 android:layout_width="wrap_content"
48 48 android:layout_height="wrap_content"
49 49 android:layout_marginLeft="10dp"
50   - android:background="@drawable/shape_green_stroke"
  50 + android:background="@drawable/shape_xiaojia_green_stroke"
51 51 android:ellipsize="end"
52 52 android:maxLength="6"
53 53 android:paddingLeft="5dp"
... ...
module_xiaojiaSoundBox/src/main/res/layout/list_item_all_device.xml
  View file @fcc065b
... ... @@ -5,7 +5,7 @@
5 5 <FrameLayout
6 6 android:layout_width="match_parent"
7 7 android:layout_height="120dp"
8   - android:background="@drawable/round_rectangle_bg">
  8 + android:background="@drawable/round_xiaojia_rectangle_bg">
9 9  
10 10 <RelativeLayout
11 11 android:id="@+id/rl_root"
... ... @@ -62,7 +62,7 @@
62 62 android:layout_alignParentRight="true"
63 63 android:layout_centerVertical="true"
64 64 android:layout_marginRight="20dp"
65   - android:background="@drawable/icon_item_right_arrow" />
  65 + android:background="@drawable/icon_xiaojia_item_right_arrow" />
66 66  
67 67 </RelativeLayout>
68 68 <!-- -->
... ... @@ -76,7 +76,7 @@
76 76 <ImageView
77 77 android:layout_width="16dp"
78 78 android:layout_height="16dp"
79   - android:background="@drawable/icon_item_add" />
  79 + android:background="@drawable/icon_xiaojia_item_add" />
80 80  
81 81 <TextView
82 82 android:layout_width="wrap_content"
... ...
module_xiaojiaSoundBox/src/main/res/layout/list_item_bluetooth_device.xml
  View file @fcc065b
... ... @@ -6,7 +6,7 @@
6 6 android:id="@+id/ll_root"
7 7 android:layout_width="match_parent"
8 8 android:layout_height="120dp"
9   - android:background="@drawable/round_rectangle_bg"
  9 + android:background="@drawable/round_xiaojia_rectangle_bg"
10 10 android:clickable="true"
11 11 android:focusable="true"
12 12 android:gravity="center_vertical"
... ...
module_xiaojiaSoundBox/src/main/res/layout/list_item_wifi1.xml
  View file @fcc065b
... ... @@ -6,7 +6,7 @@
6 6 android:id="@+id/rl_root"
7 7 android:layout_width="match_parent"
8 8 android:layout_height="60dp"
9   - android:background="@drawable/selectable_item_white"
  9 + android:background="@drawable/selectable_xiaojia_item_white"
10 10 android:clickable="true"
11 11 android:focusable="true"
12 12 android:minHeight="50dp"
... ...
module_xiaojiaSoundBox/src/main/res/layout/pop_item_menu.xml
  View file @fcc065b
... ... @@ -5,7 +5,7 @@
5 5 android:id="@+id/ll_root"
6 6 android:layout_width="match_parent"
7 7 android:layout_height="wrap_content"
8   - android:background="@drawable/selectable_pop_item_background"
  8 + android:background="@drawable/selectable_xiaojia_pop_item_background"
9 9 android:clickable="true"
10 10 android:gravity="center_vertical"
11 11 android:minWidth="100dp"
... ...
module_xiaojiaSoundBox/src/main/res/layout/pop_menu.xml
  View file @fcc065b
... ... @@ -9,7 +9,7 @@
9 9 android:layout_width="20dp"
10 10 android:layout_height="20dp"
11 11 android:layout_marginLeft="2dp"
12   - android:background="@drawable/layer_tran" />
  12 + android:background="@drawable/layer_xiaojia_tran" />
13 13  
14 14 <android.support.v7.widget.RecyclerView
15 15 android:id="@+id/rv_list"
... ...
module_xiaojiaSoundBox/src/main/res/values/styles.xml
  View file @fcc065b
... ... @@ -13,7 +13,7 @@
13 13 <style name="CustomCheckboxTheme" parent="@android:style/Widget.CompoundButton.CheckBox">
14 14 <item name="android:button">@null</item>
15 15 <item name="android:maxHeight">21dp</item>
16   - <item name="android:background">@drawable/selector_checkbox_no_default</item>
  16 + <item name="android:background">@drawable/selector_xiaojia_checkbox_no_default</item>
17 17 </style>
18 18  
19 19 <style name="CustomCheckboxHasDefault" parent="@android:style/Widget.CompoundButton.CheckBox">
... ... @@ -23,7 +23,7 @@
23 23 </style>
24 24 <!-- switch-->
25 25 <style name="SwitchButtonMD" tools:ignore="ResourceName">
26   - <item name="kswThumbDrawable">@drawable/ksw_md_thumb</item>
  26 + <item name="kswThumbDrawable">@drawable/ksw_xiaojia_md_thumb</item>
27 27 <item name="kswBackColor">@color/ksw_md_back_color</item>
28 28 <item name="kswThumbRangeRatio">1.45</item>
29 29 <item name="kswThumbMarginLeft">-16dp</item>
... ...