Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature

WeiChat/src/main/res/layout/activity_data_form_field.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/white">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -45,17 +46,18 @@
                 android:id="@+id/asset_grid"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:clipToPadding="false"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingBottom="20dp"
                 android:background="#faf9f9"
+                android:clipToPadding="false"
                 android:columnWidth="90dip"
                 android:horizontalSpacing="15dip"
-                android:verticalSpacing="10dip"
                 android:listSelector="@color/light_grey"
                 android:numColumns="auto_fit"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
                 android:scrollbars="none"
-                 />
+                android:verticalSpacing="10dip"
+                />
 
             <LinearLayout
                 android:id="@+id/ll_hide"
@@ -85,16 +87,18 @@
                 android:id="@+id/asset_grid_delete"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:paddingBottom="20dp"
                 android:background="#faf9f9"
                 android:clipToPadding="false"
                 android:columnWidth="90dip"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
                 android:horizontalSpacing="15dip"
                 android:listSelector="@color/light_grey"
                 android:numColumns="auto_fit"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
                 android:scrollbars="none"
                 android:verticalSpacing="10dip" />
+
         </LinearLayout>
     </ScrollView>
 

WeiChat/src/main/res/layout/grid_item_simpletext.xml

@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
+
     <TextView
         android:id="@+id/tv_field"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_centerInParent="true"
+        android:background="@drawable/shape_button_fields"
+        android:ellipsize="end"
         android:gravity="center"
-        android:textSize="13sp"
+        android:maxLines="2"
         android:minWidth="90dp"
         android:paddingBottom="8dp"
         android:paddingLeft="15dp"
         android:paddingRight="15dp"
         android:paddingTop="8dp"
-        android:background="@drawable/shape_button_fields"
-        android:text="字段名字:你好" />
-</RelativeLayout>
+        android:text="字段名字:你好"
+        android:textSize="13sp" />
+</LinearLayout>

app_core/common/src/main/java/com/core/widget/view/selectcalendar/bean/Data.java

@@ -15,6 +15,7 @@ public class Data implements Parcelable {
     private int groupId;//组ID---控件需要用到
     private String group;//组名----多组的情况
     private boolean isSelected;
+    private boolean isForm;//是否是主表
     private int detno;//编号
     private String readonly;//是否只读
     private String allowblank;//是否允许为空
@@ -28,6 +29,7 @@ public class Data implements Parcelable {
     private String displayValue;//下拉字段隐藏的值
     private String field;//字段名
     private String formStoreKey;//formstore key 上传需要用到的key
+    private String gridCaller;//从表caller
     private int fdid;
     private boolean isEditing = true;//是否正在编辑
     private String maxlength;//最大长度
@@ -67,6 +69,14 @@ public class Data implements Parcelable {
         this.isSelected = isSelected;
     }
 
+    public boolean isForm() {
+        return isForm;
+    }
+
+    public void setForm(boolean form) {
+        isForm = form;
+    }
+
     public String getType() {
         return type;
     }
@@ -108,7 +118,7 @@ public class Data implements Parcelable {
     }
 
     public String getName() {
-        return name==null?"":name;
+        return name == null ? "" : name;
     }
 
     public void setName(String name) {
@@ -147,6 +157,14 @@ public class Data implements Parcelable {
         this.formStoreKey = formStoreKey;
     }
 
+    public String getGridCaller() {
+        return gridCaller;
+    }
+
+    public void setGridCaller(String gridCaller) {
+        this.gridCaller = gridCaller;
+    }
+
     public int getFdid() {
         return fdid;
     }

app_core/common/src/main/res/layout/activity_data_form_field.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/white">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -45,17 +46,18 @@
                 android:id="@+id/asset_grid"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:clipToPadding="false"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingBottom="20dp"
                 android:background="#faf9f9"
+                android:clipToPadding="false"
                 android:columnWidth="90dip"
                 android:horizontalSpacing="15dip"
-                android:verticalSpacing="10dip"
                 android:listSelector="@color/light_grey"
                 android:numColumns="auto_fit"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
                 android:scrollbars="none"
-                 />
+                android:verticalSpacing="10dip"
+                />
 
             <LinearLayout
                 android:id="@+id/ll_hide"
@@ -85,16 +87,18 @@
                 android:id="@+id/asset_grid_delete"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:paddingBottom="20dp"
                 android:background="#faf9f9"
                 android:clipToPadding="false"
                 android:columnWidth="90dip"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
                 android:horizontalSpacing="15dip"
                 android:listSelector="@color/light_grey"
                 android:numColumns="auto_fit"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
                 android:scrollbars="none"
                 android:verticalSpacing="10dip" />
+
         </LinearLayout>
     </ScrollView>
 

app_core/common/src/main/res/layout/grid_item_simpletext.xml

@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:minHeight="?android:attr/listPreferredItemHeight"
+              android:orientation="vertical">
+
     <TextView
         android:id="@+id/tv_field"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:gravity="center"
-        android:singleLine="true"
-        android:ellipsize="end"
         android:background="@drawable/shape_button_fields"
-        android:textSize="13sp"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:maxLines="2"
         android:minWidth="90dp"
         android:paddingBottom="8dp"
         android:paddingLeft="15dp"
         android:paddingRight="15dp"
         android:paddingTop="8dp"
-        android:text="字段名字:你好" />
-</RelativeLayout>
+        android:text="字段名字:你好"
+        android:textSize="13sp" />
+</LinearLayout>

app_modular/apputils/src/main/res/layout/activity_simple_web.xml

@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rl_root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.modular.apputils.activity.SimpleWebActivity">
+<RelativeLayout android:id="@+id/rl_root"
+                xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:context="com.modular.apputils.activity.SimpleWebActivity">
+
     <com.tencent.smtt.sdk.WebView
         android:id="@+id/mSimpleWebView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/linen" />
+        android:background="@color/linen"
+        android:layerType="software" />
 </RelativeLayout>

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/DataFormDetailActivity.java

@@ -189,6 +189,17 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                 data.setMaxlength(String.valueOf(items.getIntValue("fd_maxlength")));
                                 data.setFdid(items.getIntValue("fd_id"));
                                 data.setValue(items.getString("fd_value"));
+
+                                String dg_findfunctionname = items.getString("dg_findfunctionname");
+                                if (!TextUtils.isEmpty(dg_findfunctionname)) {
+                                    try {
+                                        String[] split = dg_findfunctionname.split("\\|");
+                                        data.setGridCaller(split[0]);
+                                        data.setFormStoreKey(split[1]);
+                                    } catch (Exception e) {
+
+                                    }
+                                }
                                 //TODO
                                 String fd_defaultvalue = JSONUtil.getText(items, "fd_defaultvalue");
                                 if (TextUtils.isEmpty(data.getValue()) && !TextUtils.isEmpty(fd_defaultvalue)) {
@@ -305,6 +316,17 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                         data.setFdid(items.getIntValue("gd_id"));
                                         data.setValue(items.getString("dg_value"));
 
+                                        String dg_findfunctionname = items.getString("dg_findfunctionname");
+                                        if (!TextUtils.isEmpty(dg_findfunctionname)) {
+                                            try {
+                                                String[] split = dg_findfunctionname.split("\\|");
+                                                data.setGridCaller(split[0]);
+                                                data.setFormStoreKey(split[1]);
+                                            } catch (Exception e) {
+
+                                            }
+                                        }
+
                                         if (!TextUtils.isEmpty(data.getType()) && data.getType().equals("D")) {
                                             data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
                                         }
@@ -408,6 +430,17 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                     data.setAllowblank(items.getString("dg_logictype"));
                                     data.setReadonly(items.getString("dg_editable"));
 
+                                    String dg_findfunctionname = items.getString("dg_findfunctionname");
+                                    if (!TextUtils.isEmpty(dg_findfunctionname)) {
+                                        try {
+                                            String[] split = dg_findfunctionname.split("\\|");
+                                            data.setGridCaller(split[0]);
+                                            data.setFormStoreKey(split[1]);
+                                        } catch (Exception e) {
+
+                                        }
+                                    }
+
                                     data.setValue(items.getString("dg_value"));
                                     if (d_startDate.equals(items.getString("dg_field"))) {
                                         if (StringUtil.isEmpty(items.getString("dg_value"))) {
@@ -902,6 +935,11 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
             for (int i = 0; i < mdata.size(); i++) {
                 groupIndex.add(index);
                 Data gData = new Data();
+                if (i == 0) {
+                    gData.setForm(true);
+                } else {
+                    gData.setForm(false);
+                }
                 gData.setGroup(mdata.get(i).getName());
                 gData.setGroupId(mdata.get(i).getId());
                 int size = mdata.get(i).getDatas().size();
@@ -1016,6 +1054,11 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
             for (int i = 0; i < mdata.size(); i++) {
                 groupIndex.add(index);
                 Data gData = new Data();
+                if (i == 0) {
+                    gData.setForm(true);
+                } else {
+                    gData.setForm(false);
+                }
                 gData.setGroup(mdata.get(i).getName());
                 gData.setGroupId(mdata.get(i).getId());
                 int size = mdata.get(i).getDatas().size();
@@ -1182,9 +1225,16 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                             if (data.getType().equals("SF")
                                     || data.getType().equals("DF")) {
                                 LogUtil.d(TAG, "GroupId:" + data.getGroupId());
+                                String gridCaller = "";
+                                if (data.isForm()) {
+                                    gridCaller = "";
+                                } else {
+                                    gridCaller = data.getGridCaller();
+                                }
                                 startActivityForResult(new Intent(ct, SelectNetAcitivty.class)
                                                 .putExtra("fieldKey", data.getField())
                                                 .putExtra("caller", caller)
+                                                .putExtra("gCaller", gridCaller)
                                                 .putExtra("isDevice", false)
                                                 .putExtra("device", data.getName().equals("设备编号"))
                                                 .putExtra("isForm", true)

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/adapter/StickyGridAdapter.java

@@ -10,8 +10,8 @@ import android.widget.TextView;
 
 import com.common.data.StringUtil;
 import com.core.app.R;
-import com.tonicartos.widget.stickygridheaders.StickyGridHeadersSimpleAdapter;
 import com.core.widget.view.selectcalendar.bean.Data;
+import com.tonicartos.widget.stickygridheaders.StickyGridHeadersSimpleAdapter;
 
 import java.util.List;
 
@@ -26,32 +26,33 @@ public class StickyGridAdapter extends BaseAdapter implements
     private LayoutInflater mInflater;
     private GridView mGridView;
 
-    public StickyGridAdapter(Context context, List<Data> hasHeaderIdList, GridView mGridView  ) {
+    public StickyGridAdapter(Context context, List<Data> hasHeaderIdList, GridView mGridView) {
         mInflater = LayoutInflater.from(context);
         this.mGridView = mGridView;
         this.hasHeaderIdList = hasHeaderIdList;
     }
-    
+
     @Override
     public long getHeaderId(int i) {
         return hasHeaderIdList.get(i).getGroupId();
     }
-    
+
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         ViewHolder mViewHolder;
         if (convertView == null) {
             mViewHolder = new ViewHolder();
             convertView = mInflater.inflate(R.layout.grid_item_simpletext, parent, false);
-            mViewHolder.mfield= (TextView) convertView.findViewById(R.id.tv_field);
+            mViewHolder.mfield = (TextView) convertView.findViewById(R.id.tv_field);
             convertView.setTag(mViewHolder);
-            
+
         } else {
             mViewHolder = (ViewHolder) convertView.getTag();
         }
-        if (hasHeaderIdList.get(position).isSelected()){
+
+        if (hasHeaderIdList.get(position).isSelected()) {
             mViewHolder.mfield.setSelected(true);
-        }else{
+        } else {
             mViewHolder.mfield.setSelected(false);
         }
         mViewHolder.mfield.setText(hasHeaderIdList.get(position).getName());
@@ -65,21 +66,21 @@ public class StickyGridAdapter extends BaseAdapter implements
         if (convertView == null) {
             mHeaderHolder = new HeaderViewHolder();
             convertView = mInflater.inflate(R.layout.grid_item_header, parent, false);
-            mHeaderHolder.mTextView= (TextView) convertView.findViewById(R.id.tv_name);
-            mHeaderHolder.mDesc=(TextView)convertView.findViewById(R.id.tv_desc);
+            mHeaderHolder.mTextView = (TextView) convertView.findViewById(R.id.tv_name);
+            mHeaderHolder.mDesc = (TextView) convertView.findViewById(R.id.tv_desc);
             convertView.setTag(mHeaderHolder);
-            
+
         } else {
             mHeaderHolder = (HeaderViewHolder) convertView.getTag();
         }
-        if (StringUtil.isEmpty(hasHeaderIdList.get(i).getGroup())){
+        if (StringUtil.isEmpty(hasHeaderIdList.get(i).getGroup())) {
             mHeaderHolder.mTextView.setText("基本资料");
             mHeaderHolder.mDesc.setVisibility(View.GONE);
-        }else{
+        } else {
             mHeaderHolder.mTextView.setText(hasHeaderIdList.get(i).getGroup());
             mHeaderHolder.mDesc.setVisibility(View.GONE);
         }
-        
+
         return convertView;
     }
 
@@ -100,10 +101,10 @@ public class StickyGridAdapter extends BaseAdapter implements
     }
 
 
-   
-
     public static class ViewHolder {
         public TextView mfield;
+
+
     }
 
     public static class HeaderViewHolder {

app_modular/appworks/src/main/res/layout/activity_public_inquiry_quote.xml

@@ -1,60 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<android.support.v4.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
-    android:focusable="true"
-    android:focusableInTouchMode="true"
-    android:orientation="vertical">
+    android:background="@color/white">
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/public_inquiry_quote_data_rv"
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:cacheColorHint="#00000000"
-        android:overScrollMode="never"
-        android:scrollbars="none" />
+        android:background="@color/white"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical">
 
-    <RadioGroup
-        android:id="@+id/public_inquiry_quote_tab_rg"
-        android:layout_width="match_parent"
-        android:layout_height="42dp"
-        android:orientation="horizontal">
-
-        <RadioButton
-            android:id="@+id/public_inquiry_quote_current_rb"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="@drawable/selector_public_inquiry_quote_bg"
-            android:button="@null"
-            android:checked="true"
-            android:gravity="center"
-            android:text="@string/quote_current_model"
-            android:textColor="@color/color_public_inquiry_quote"
-            android:textSize="14sp"
-            />
-
-        <RadioButton
-            android:id="@+id/public_inquiry_quote_replace_rb"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="@drawable/selector_public_inquiry_quote_bg"
-            android:button="@null"
-            android:gravity="center"
-            android:text="@string/quote_replace_model"
-            android:textColor="@color/color_public_inquiry_quote"
-            android:textSize="14sp"
-            />
-    </RadioGroup>
-
-    <android.support.v4.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#f2f3f7">
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/public_inquiry_quote_data_rv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:cacheColorHint="#00000000"
+            android:overScrollMode="never"
+            android:scrollbars="none" />
+
+        <RadioGroup
+            android:id="@+id/public_inquiry_quote_tab_rg"
+            android:layout_width="match_parent"
+            android:layout_height="42dp"
+            android:orientation="horizontal">
+
+            <RadioButton
+                android:id="@+id/public_inquiry_quote_current_rb"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/selector_public_inquiry_quote_bg"
+                android:button="@null"
+                android:checked="true"
+                android:gravity="center"
+                android:text="@string/quote_current_model"
+                android:textColor="@color/color_public_inquiry_quote"
+                android:textSize="14sp"
+                />
+
+            <RadioButton
+                android:id="@+id/public_inquiry_quote_replace_rb"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/selector_public_inquiry_quote_bg"
+                android:button="@null"
+                android:gravity="center"
+                android:text="@string/quote_replace_model"
+                android:textColor="@color/color_public_inquiry_quote"
+                android:textSize="14sp"
+                />
+        </RadioGroup>
+
+        <!--<android.support.v4.widget.NestedScrollView-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="match_parent"-->
+        <!--android:background="#f2f3f7">-->
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -164,7 +171,10 @@
                     android:id="@+id/public_inquiry_quote_current_quote_btn"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_margin="16dp"
+                    android:layout_marginBottom="42dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginTop="16dp"
                     android:background="@drawable/bg_bule_btn"
                     android:padding="8dp"
                     android:text="@string/str_quote_price"
@@ -277,7 +287,10 @@
                     android:id="@+id/public_inquiry_quote_replace_quote_btn"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_margin="16dp"
+                    android:layout_marginBottom="42dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginTop="16dp"
                     android:background="@drawable/bg_bule_btn"
                     android:padding="8dp"
                     android:text="@string/str_quote_price"
@@ -286,5 +299,6 @@
                     android:visibility="gone" />
             </LinearLayout>
         </FrameLayout>
-    </android.support.v4.widget.NestedScrollView>
-</LinearLayout>
+        <!--</android.support.v4.widget.NestedScrollView>-->
+    </LinearLayout>
+</android.support.v4.widget.NestedScrollView>