1.修复当被绑定的View parent是LinearLayout并且使用了weight属性时内容视图weight属性无效问题.

2.优化绑定流程,使其可以绑定任何视图为内容视图而不会导致View原属性改变.

Author: FengChenSunshine

README.md

@@ -53,7 +53,7 @@
 **step two ：**
 
     dependencies {
-            implementation 'com.github.FengChenSunshine:UiStatus:1.0.4'
+            implementation 'com.github.FengChenSunshine:UiStatus:1.0.5'
     }
 ### 2.全局配置
     UiStatus库不提供任何状态的视图，完全由开发者自己自定义提供。
@@ -157,6 +157,12 @@
 
 ## 8.版本说明
 
+### 1.0.5
+
+    1.修复当被绑定的View parent是LinearLayout并且使用了weight属性时内容视图weight属性无效问题.
+    
+    2.优化绑定流程,使其可以绑定任何视图为内容视图而不会导致View原属性改变.
+
 ### 1.0.4
 
    新增:
@@ -192,7 +198,7 @@
 ## 10.最后，喜欢的话可以点个赞哦！！！
 
 ## 11.我的开源库链接
-   1.[![](https://img.shields.io/badge/UiStatus-1.0.4-brightgreen.svg)](https://github.com/FengChenSunshine/UiStatus)是我的另一个开源库：一个简单且强大的Ui状态视图控制库！喜欢的可以看看，欢迎start！！！
+   1.[![](https://img.shields.io/badge/UiStatus-1.0.5-brightgreen.svg)](https://github.com/FengChenSunshine/UiStatus)是我的另一个开源库：一个简单且强大的Ui状态视图控制库！喜欢的可以看看，欢迎start！！！
 
    2.[![](https://img.shields.io/badge/SupportWidget-1.0.0-brightgreen.svg)](https://github.com/FengChenSunshine/SupportWidget)是我的另一个开源库：一个追求简单够用且强大的UI组件库！喜欢的可以看看，欢迎start！！！
 

app/build.gradle

@@ -29,6 +29,6 @@ dependencies {
     implementation project (':uistatus')
 //    implementation 'com.fengchen:ui-status:1.0.0'
 //    implementation 'com.github.DuanLu1112:UiStatusStatus:1.0.0'
-//    implementation 'com.github.FengChenSunshine:UiStatus:1.0.3'
+//    implementation 'com.github.FengChenSunshine:UiStatus:1.0.4'
 
 }

app/src/main/java/com/fengchen/uistatus/demo/HomeActivity.java

@@ -39,6 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.btn_example_elfin_cancel).setOnClickListener(this);
         findViewById(R.id.btn_example_widget_bottom_floor).setOnClickListener(this);
         findViewById(R.id.btn_example_widget_float).setOnClickListener(this);
+        findViewById(R.id.btn_test_weight).setOnClickListener(this);
 
         mUiStatusController = UiStatusController.get().bind(this);
         mUiStatusController.changeUiStatusIgnore(UiStatus.CONTENT);
@@ -91,6 +92,10 @@ public void onClick(View v) {
                     mUiStatusController.showWidget(UiStatus.WIDGET_FLOAT);
                 }
                 break;
+            case R.id.btn_test_weight:
+                Intent intent = ShellActivity.navigation(this, 2);
+                startActivity(intent);
+                break;
         }
     }
 }

app/src/main/java/com/fengchen/uistatus/demo/ShellActivity.java

@@ -1,5 +1,7 @@
 package com.fengchen.uistatus.demo;
 
+import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
@@ -15,15 +17,30 @@
  */
 public class ShellActivity extends AppCompatActivity {
 
+    public static Intent navigation(Context context, int type) {
+        Intent intent = new Intent(context, ShellActivity.class);
+        intent.putExtra("type", type);
+        return intent;
+    }
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_shell);
         Toolbar toolbar = findViewById(R.id.toolbar);
         toolbar.setTitle("Fragment 示例");
 
-        getSupportFragmentManager().beginTransaction()
-                .replace(R.id.fl_container, new ExampleFragment())
-                .commit();
+        Intent intent = getIntent();
+        int type = intent.getIntExtra("type", 1);
+        if (1 == type) {
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.fl_container, new ExampleFragment())
+                    .commit();
+        } else if (2 == type) {
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.fl_container, new TestWeightFragment())
+                    .commit();
+        }
     }
+
 }

app/src/main/java/com/fengchen/uistatus/demo/TestWeightFragment.java

@@ -0,0 +1,39 @@
+package com.fengchen.uistatus.demo;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.fengchen.uistatus.UiStatusController;
+import com.fengchen.uistatus.annotation.UiStatus;
+
+/********************************
+ * @name TestWeightFragment.
+ * @author 段露.
+ * @company 浙江托普云农科技股份有限公司.
+ * @createDate 2020/3/30 9:45.
+ * @updateDate 2020/3/30 9:45.
+ * @version V1.0.0
+ * @describe .
+ ********************************/
+public class TestWeightFragment extends Fragment {
+    private UiStatusController mUiStatusController;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View rootView = inflater.inflate(R.layout.fragment_test_weight, container, false);
+        TextView tvTestWeight = rootView.findViewById(R.id.tv_test_weight);
+        ViewGroup.LayoutParams lp = tvTestWeight.getLayoutParams();
+        mUiStatusController = UiStatusController.get();
+        mUiStatusController.bind(tvTestWeight);
+        mUiStatusController.changeUiStatusIgnore(UiStatus.CONTENT);
+        return rootView;
+    }
+
+}

app/src/main/res/layout/activity_home.xml

@@ -88,6 +88,15 @@
             android:layout_marginTop="10dp"
             android:layout_marginEnd="50dp"
             android:text="Float" />
+
+        <Button
+            android:id="@+id/btn_test_weight"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="50dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="50dp"
+            android:text="Test Weight" />
     </LinearLayout>
 
 </LinearLayout>

app/src/main/res/layout/fragment_test_weight.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#f40"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/tv_test_weight"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_gravity="center"
+        android:layout_weight="1"
+        android:background="#00ffcc"
+        android:gravity="center"
+        android:text="我是设置的weight"
+        android:textSize="24sp" />
+
+</LinearLayout>

uistatus/build.gradle

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode 5
-        versionName "1.0.4"
+        versionCode 6
+        versionName "1.0.5"
     }
 
     buildTypes {

uistatus/config-aar.gradle

@@ -5,7 +5,7 @@ apply plugin: 'maven'
 ext {
     PUBLISH_GROUP_ID = project.properties.get("publishGroupId")
     PUBLISH_ARTIFACT_ID = "ui-status"
-    PUBLISH_VERSION = "1.0.0"
+    PUBLISH_VERSION = "1.0.5"
     PUBLISH_PATH = project.properties.get("publishRootPath") + "/UiStatus"
 }
 //3.配置maven输出路径及信息

uistatus/src/main/java/com/fengchen/uistatus/utils/BindHelp.java

@@ -56,10 +56,14 @@ public static UiStatusLayout bindFragmentView(@NonNull View fragmentView) {
 
     private static UiStatusLayout _bind(Object target, ViewGroup parentView, int index) {
         View contentView = parentView.getChildAt(index);
+        //临时保存下lp,否则在创建UiStatusLayout时添加了contentView导致后面再通过getLayoutParams方法获取到的lp已经被改变.
+        ViewGroup.LayoutParams lp = contentView.getLayoutParams();
+
         parentView.removeViewAt(index);
+
         UiStatusLayout uiStatusLayout = createUiStatusLayout(target, contentView);
 
-        parentView.addView(uiStatusLayout, index, contentView.getLayoutParams());
+        parentView.addView(uiStatusLayout, index, lp);
 
         //fix github issues bug #7.
         //因为UiStatusLayout设置的lp是ContentView的,