Merge branch 'developer' of ssh://10.10.100.21/source/uu-android into feature

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Jun 17 18:31:03 CST 2019
-debugName=972
+#Mon Jun 24 18:00:46 CST 2019
+debugName=989
 versionName=686
-debugCode=972
+debugCode=989
 versionCode=241

app_modular/apputils/src/main/java/com/modular/apputils/activity/BillInputActivity.java

@@ -12,13 +12,11 @@ import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
-import android.widget.TableLayout;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;

app_modular/apputils/src/main/java/com/modular/apputils/adapter/BillAdapter.java

@@ -18,6 +18,7 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
 import com.common.data.ListUtils;
 import com.core.widget.listener.EditChangeListener;
@@ -118,6 +119,7 @@ public class BillAdapter extends RecyclerView.Adapter<BillAdapter.BaseViewHolder
             mShowBillModels = new ArrayList<>();
         } else {
             mShowBillModels.clear();
+            //notifyDataSetChanged();
         }
         if (mFormBillModels == null) {
             mFormBillModels = new ArrayList<>();
@@ -134,7 +136,7 @@ public class BillAdapter extends RecyclerView.Adapter<BillAdapter.BaseViewHolder
         } else {
             mAllBillModels.clear();
         }
-
+        
         for (int i = 0; i < mBillGroupModels.size(); i++) {
             BillGroupModel e = mBillGroupModels.get(i);
             if (e != null) {
@@ -156,10 +158,10 @@ public class BillAdapter extends RecyclerView.Adapter<BillAdapter.BaseViewHolder
                             mShowBillModels.add(mTitleBillModel);
                         }
                         mShowBillModels.addAll(e.getShowBillFields());
-
                         if (!e.isForm() && e.isLastInType()) {
                             mShowBillModels.add(getAddModel(i));
                         }
+     
                     }
 
                     if (e.getUpdateBillFields() != null && !e.getUpdateBillFields().isEmpty()) {
@@ -648,9 +650,13 @@ public class BillAdapter extends RecyclerView.Adapter<BillAdapter.BaseViewHolder
     }
 
     private void switchTabData(int tabPosition) {
+        LogUtil.d("tab_1","tabPosition:"+tabPosition);
+        notifyDataSetChanged();
         mTabPosition = tabPosition;
+        LogUtil.d("tab_1","tabPosition:"+tabPosition+" mTabIndex:"+mTabIndex);
         if (mTabIndex >= 0 && mShowBillModels != null && mShowBillModels.size() > mTabIndex) {
             BillGroupModel.BillModel model = mShowBillModels.get(mTabIndex);
+            LogUtil.d("tab_1","model:"+JSON.toJSONString(model));
             if (model != null) {
                 List<BillGroupModel.GridTab> tabList = model.getTabList();
                 int tabGroupIndex = model.getGroupIndex();
@@ -663,9 +669,10 @@ public class BillAdapter extends RecyclerView.Adapter<BillAdapter.BaseViewHolder
                 BillGroupModel.GridTab gridTab = tabList.get(mTabPosition);
                 if (gridTab != null) {
                     List<BillGroupModel> tabGroupModels = gridTab.getBillGroupModels();
-
+                    LogUtil.prinlnLongMsg("tab_1", JSON.toJSONString(tabGroupModels));
                     newGroupModels.addAll(tabGroupModels);
                 }
+               
                 setBillGroupModels(newGroupModels);
                 notifyDataSetChanged();
             }