1 修改分享页面样式

YangShuai
1 parent e5e8362a
Showing 5 changed files with 39 additions and 35 deletions
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/MainActivity.java
config.gradle
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/DeviceManagerFragmentView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/DeviceManagerFragment.java
module_xiaojiaSoundBox/src/main/res/layout/activity_share_friend.xml
@@ -35,13 +35,13 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         binding = DataBindingUtil.setContentView(this, R.layout.activity_speaker_main);
-        XiaoJIaCommInfo.setUserId(this, "10514333".trim());
-        XiaoJIaCommInfo.setUserPhone(this, "18301489586".trim());
+//        XiaoJIaCommInfo.setUserId(this, "10514333".trim());
+//        XiaoJIaCommInfo.setUserPhone(this, "18301489586".trim());
         XiaoJIaCommInfo.setUserIcon(this,"123456");
         XiaoJIaCommInfo.setUserNickName(this,"我的昵称");
-//        XiaoJIaCommInfo.setUserId(this, "10535072".trim());
-//        XiaoJIaCommInfo.setUserPhone(this, "15532913679".trim());
+        XiaoJIaCommInfo.setUserId(this, "358200".trim());
+        XiaoJIaCommInfo.setUserPhone(this, "10000000051".trim());
 //        XiaoJIaCommInfo.setUserId(this, "10513196");
 //        XiaoJIaCommInfo.setUserPhone(this, "15010140838");
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.3.3",
+            version: "0.3.5",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -102,14 +102,7 @@ public class DeviceManagerFragmentView implements MvpView {
             @Override
             public void onClick(View view) {
                 if (currentUser.getIsMaster() == FamilyListBean.THE_HOST) {
-                    //判断GPS是否打开
-                    boolean isOpenGPS = CheckUtil.isOPenGps(getContext());
-                    if (!isOpenGPS) {
-                        CheckUtil.openGPS(getContext());
-                    } else {
-                        //判断蓝牙是否打开
-                        getPermissionsWithTip();
-                    }
+                    BlueToothStep2Activity.startActivity(getContext());
                 } else {
                     AlertUtil.showDeftToast(getContext(), getContext().getResources().getString(R.string.change_device_no_pression_tip));
                 }
@@ -29,7 +29,7 @@ import org.greenrobot.eventbus.ThreadMode;
 public class DeviceManagerFragment extends MvpBindingFragment<DeviceManagerFragmentView, DeviceManagerFragmentPresenter, Object, FragmentDeviceManagerBinding> {
     private FamilyListBean.UsersBeanX.DeviceListBean currentDeviceInfo;
-    public static DeviceManagerFragment newInstance(FamilyListBean.UsersBeanX currentUser,FamilyListBean.UsersBeanX.DeviceListBean currentDeviceInfo) {
+    public static DeviceManagerFragment newInstance(FamilyListBean.UsersBeanX currentUser, FamilyListBean.UsersBeanX.DeviceListBean currentDeviceInfo) {
         DeviceManagerFragment fragment = new DeviceManagerFragment();
         Bundle bundle = new Bundle();
         bundle.putSerializable("currentDeviceInfo", currentDeviceInfo);
@@ -58,9 +58,9 @@ public class DeviceManagerFragment extends MvpBindingFragment&lt;DeviceManagerFragm
         if (null != getMvpView()) {
             if (null != getArguments()) {
                 currentDeviceInfo = (FamilyListBean.UsersBeanX.DeviceListBean) getArguments().getSerializable("currentDeviceInfo");
-                FamilyListBean.UsersBeanX currentUser= (FamilyListBean.UsersBeanX) getArguments().getSerializable("currentUser");
-                if (null != currentDeviceInfo && !TextUtils.isEmpty(currentDeviceInfo.getMcid())&&null!=currentUser) {
-                    getMvpView().initView(currentUser,currentDeviceInfo);
+                FamilyListBean.UsersBeanX currentUser = (FamilyListBean.UsersBeanX) getArguments().getSerializable("currentUser");
+                if (null != currentDeviceInfo && !TextUtils.isEmpty(currentDeviceInfo.getMcid()) && null != currentUser) {
+                    getMvpView().initView(currentUser, currentDeviceInfo);
                     getPresenter().getDeviceDetailMsg(getActivity(), currentDeviceInfo.getMcid());
                 }
             }
@@ -87,6 +87,15 @@ public class DeviceManagerFragment extends MvpBindingFragment&lt;DeviceManagerFragm
                 getActivity().finish();
             }
         }
+        //配网成功
+        else if (EventMsg.CONFIG_NET_SUCCESS == msg.getEventType()) {
+            if (null != getMvpView()) {
+                if (null != currentDeviceInfo && !TextUtils.isEmpty(currentDeviceInfo.getMcid())) {
+                    getPresenter().getDeviceDetailMsg(getActivity(), currentDeviceInfo.getMcid());
+
+                }
+            }
+        }
     }
     private void initTopBar() {
@@ -105,9 +114,9 @@ public class DeviceManagerFragment extends MvpBindingFragment&lt;DeviceManagerFragm
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (null==getMvpView()){
+        if (null == getMvpView()) {
             return;
         }
-        getMvpView().onRequestPermissionsResult(requestCode,permissions,grantResults);
+        getMvpView().onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
 }
@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     android:background="@color/white"
+    android:orientation="vertical"
     tools:context=".ui.activity.ShareFriendActivity">
@@ -29,7 +29,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
-            android:layout_margin="20dp"
+            android:layout_marginTop="20dp"
             android:orientation="vertical">
             <LinearLayout
@@ -71,14 +71,16 @@
                 android:layout_marginTop="15dp"
                 android:text="@string/scanto_get_invite"
                 android:textColor="@color/color_fff"
-                android:textSize="15sp" />
+                android:textSize="20sp"
+                android:textStyle="bold" />
             <ImageView
                 android:id="@+id/erweima"
                 android:layout_width="150dp"
                 android:layout_height="150dp"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="15dp" />
+                android:layout_marginTop="15dp"
+                android:scaleType="fitXY" />
             <LinearLayout
                 android:layout_width="match_parent"
@@ -88,13 +90,13 @@
                 android:gravity="center">
                 <TextView
-                    android:layout_width="15dp"
-                    android:layout_height="15dp"
+                    android:layout_width="17dp"
+                    android:layout_height="17dp"
                     android:background="@drawable/shape_xiaojia_green_circle"
                     android:gravity="center"
                     android:text="1"
                     android:textColor="@color/white"
-                    android:textSize="11sp"
+                    android:textSize="13sp"
                     android:textStyle="bold" />
                 <TextView
@@ -104,17 +106,17 @@
                     android:layout_marginRight="5dp"
                     android:text="下载网家家  >"
                     android:textColor="@color/color_282828"
-                    android:textSize="12sp"
+                    android:textSize="13sp"
                     android:textStyle="bold" />
                 <TextView
-                    android:layout_width="15dp"
-                    android:layout_height="15dp"
+                    android:layout_width="17dp"
+                    android:layout_height="17dp"
                     android:background="@drawable/shape_xiaojia_green_circle"
                     android:gravity="center"
                     android:text="2"
                     android:textColor="@color/white"
-                    android:textSize="11sp"
+                    android:textSize="13sp"
                     android:textStyle="bold" />
                 <TextView
@@ -124,17 +126,17 @@
                     android:layout_marginRight="5dp"
                     android:text="注册/登录  >"
                     android:textColor="@color/color_282828"
-                    android:textSize="12sp"
+                    android:textSize="13sp"
                     android:textStyle="bold" />
                 <TextView
-                    android:layout_width="15dp"
-                    android:layout_height="15dp"
+                    android:layout_width="17dp"
+                    android:layout_height="17dp"
                     android:background="@drawable/shape_xiaojia_green_circle"
                     android:gravity="center"
                     android:text="3"
                     android:textColor="@color/white"
-                    android:textSize="11sp"
+                    android:textSize="13sp"
                     android:textStyle="bold" />
                 <TextView
@@ -144,7 +146,7 @@
                     android:layout_marginRight="5dp"
                     android:text="扫码绑定"
                     android:textColor="@color/color_282828"
-                    android:textSize="12sp"
+                    android:textSize="13sp"
                     android:textStyle="bold" />
             </LinearLayout>