提交类型 修复bug

提交内容   处理首页显示图标错乱的问题

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -315,12 +315,13 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
     }
 
     private void startAnimator(View view) {
-        if (view != null && main_tab_three == view) {
-            delay();
-        } else {
-            view.startAnimation(getImgAnimation(view));
-
-        }
+//        if (view != null && main_tab_three == view) {
+//            delay();
+//        } else {
+//            view.startAnimation(getImgAnimation(view));
+//
+//        }
+        view.startAnimation(getImgAnimation(view));
     }
 
     /**

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/EasyFragment.java

@@ -6,6 +6,9 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -66,7 +69,25 @@ public abstract class EasyFragment extends Fragment {
         onCreateView(savedInstanceState, createView);
         return mRootView;
     }
-
+    private MenuItem.OnMenuItemClickListener omOnMenuItemClickListener= new MenuItem.OnMenuItemClickListener() {
+        @Override
+        public boolean onMenuItemClick(MenuItem menuItem) {
+            onOptionsItemSelected(menuItem);
+            return false;
+        }
+    };
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (menu!=null){
+            for (int i=0;i<menu.size();i++){
+                MenuItem item = menu.getItem(i);
+                if (item!=null){
+                    item.setOnMenuItemClickListener(omOnMenuItemClickListener);
+                }
+            }
+        }
+        super.onCreateOptionsMenu(menu, inflater);
+    }
     public View findViewById(int id) {
         if (mRootView != null) {
             return mRootView.findViewById(id);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorkPlatFragment.java

@@ -24,6 +24,7 @@ import com.core.api.wxapi.ApiUtils;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.fragment.BaseMVPFragment;
+import com.core.net.http.http.OAHttpHelper;
 import com.core.utils.StatusBarUtil;
 import com.me.network.app.base.HttpParams;
 import com.me.network.app.http.Method;
@@ -209,15 +210,29 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
 
     }
 
-    @Override
-    protected void initDatas() {
+    private Runnable uiRunnable = new Runnable() {
+        @Override
+        public void run() {
+            doInUi();
+        }
+    };
+
+    private void doInUi() {
         getLocalMenu();
-//        if (isFirstLoad) {
         loadOrdersCaller();
-//        }
         obtainCityIndustryService();
     }
 
+    @Override
+    protected void initDatas() {
+        if (isFirstLoad) {
+            doInUi();
+        } else {
+            OAHttpHelper.getInstance().postDelayed(uiRunnable, 250);
+        }
+
+    }
+
     private void getLocalMenu() {
         String role = com.core.utils.CommonUtil.getUserRole();
         String userId = MyApplication.getInstance().mLoginUser.getUserId();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskActivity.java

@@ -15,6 +15,7 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
@@ -171,6 +172,7 @@ public class TaskActivity extends SupportToolBarActivity implements OnClickListe
         }
 
     };
+    private ViewGroup topFl;
 
     private void doClassifyAllList(List<AllProcess> allList) {
         if (mCurrentPage == 1) {
@@ -178,12 +180,15 @@ public class TaskActivity extends SupportToolBarActivity implements OnClickListe
             if (!ListUtils.isEmpty(waitList)) waitList.clear();
             if (!ListUtils.isEmpty(doneList)) doneList.clear();
             if (!ListUtils.isEmpty(isendList)) isendList.clear();
-            ToastUtil.showToast(this, R.string.common_refresh_finish, tabGroup);
+            ToastUtil.showToast(this, R.string.common_refresh_finish, topFl);
         } else {
-            ToastUtil.showToast(this, R.string.common_up_finish, tabGroup);
+            ToastUtil.showToast(this, R.string.common_up_finish, topFl);
         }
         listview_main.onRefreshComplete();
-        if (ListUtils.isEmpty(allList)) return;
+        if (ListUtils.isEmpty(allList)) {
+            mEmptyLayout.showEmpty();
+            return;
+        }
         for (int i = 0; i < allList.size(); i++) {
             // 待处理
             if ((login_Name.equals(allList.get(i).getDealpersoncode()) &&
@@ -433,6 +438,7 @@ public class TaskActivity extends SupportToolBarActivity implements OnClickListe
         findViewById(R.id.backImg).setOnClickListener(this);
         findViewById(R.id.addImg).setOnClickListener(this);
         tabGroup = findViewById(R.id.tabGroup);
+        topFl = findViewById(R.id.topFl);
         final View todoLine = findViewById(R.id.todoLine);
         final View doneDealLine = findViewById(R.id.doneDealLine);
         final View byMeLine = findViewById(R.id.byMeLine);

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bg_main"
+    android:background="@color/base_bg"
     android:orientation="vertical">
 
     <com.core.widget.VoiceSearchView
@@ -24,9 +24,8 @@
         android:id="@+id/lv_sale_list"
         style="@style/ListViewdoc"
         android:layout_below="@id/voiceSearchView"
-        android:background="@color/Transpant"
-        android:divider="@drawable/bg_bar"
         android:layerType="software"
+        android:background="@color/base_bg"
         android:scrollingCache="false" />
 
     <com.github.clans.fab.FloatingActionButton

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

@@ -15,11 +15,10 @@
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:layout_gravity="center_vertical|left"
-        android:layout_margin="5dp"
         app:color_checked="#149A45" />
 
     <LinearLayout style="@style/LinearLayout_vertical"
-        android:layout_margin="3dp"
+        android:layout_gravity="center_vertical|left"
         android:layout_height="wrap_content">
 
         <TextView
@@ -28,9 +27,7 @@
             android:layout_marginLeft="10dp"
             android:textSize="16sp"
             android:layout_gravity="center_vertical"
-            android:gravity="center"
             android:textColor="@color/black"
-            android:text="xxxx商机库"
             style="@style/TextView_VerticalCenter" />
 
         <TextView

WeiChat/src/main/res/values/colors.xml

@@ -40,7 +40,7 @@
     <color name="item_text">#cca0a0a0</color>
     <color name="item_line">#ebe9e9</color>
     <color name="antionbarcolor">#646464</color>
-    <color name="base_bg">#FFEBE9E9</color>
+    <color name="base_bg">#f2f2f2</color>
     <color name="antionbaritemcolor">#a3b2cf</color>
     <color name="wirtehine">#a3b2cf</color>
     <color name="text_main">#3c3c3c</color>
@@ -314,7 +314,7 @@
     <color name="me_menu_item_press">#DFDEDE</color>
     <color name="bg_underlying">#ebe9e9</color>
     <color name="orange_text">#f17e21</color>
-    <color name="oa_bg">#EBE9E9</color>
+    <color name="oa_bg">#f2f2f2</color>
     <color name="oa_item_bg">#f9f9f9</color>
     <color name="colorPrimary">#3F51B5</color>
     <color name="colorPrimaryDark">#303F9F</color>

WeiChat/src/main/res/values/strings.xml

@@ -86,7 +86,7 @@
     <string name="crm_customer_visit">客户拜访</string>
     <string name="crm_waller">荣誉墙</string>
     <!--View empty-->
-    <string name="empty_message">暂无记录</string>
+    <string name="empty_message">暂无数据</string>
     <string name="loading_message">请等待！</string>
     <string name="error_message">很抱歉! 系统发现未知错误</string>
     <string name="empty_button">再次尝试</string>

app_core/common/src/main/java/com/core/base/BaseToolBarActivity.java

@@ -20,6 +20,7 @@ import android.widget.TextView;
 
 import com.common.LogUtil;
 import com.core.app.R;
+import com.core.utils.CommonUtil;
 import com.core.utils.StatusBarUtil;
 import com.core.utils.ToastUtil;
 
@@ -47,6 +48,12 @@ public class BaseToolBarActivity extends AppCompatActivity {
         }
     }
 
+    @Override
+    protected void onPause() {
+        CommonUtil.closeKeybord(this);
+        super.onPause();
+    }
+
     public CharSequence getToolBarTitle() {
         if (commonTitleTv != null && !TextUtils.isEmpty(commonTitleTv.getText())) {
             return commonTitleTv.getText();

app_core/common/src/main/java/com/core/base/fragment/BaseMVPFragment.java

@@ -10,6 +10,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.common.LogUtil;
 import com.core.app.R;
 import com.core.base.presenter.BasePresenter;
 import com.core.base.view.BaseView;
@@ -75,6 +76,7 @@ public abstract class BaseMVPFragment<T extends BasePresenter> extends Fragment
 
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        LogUtil.i("onViewCreated");
         super.onViewCreated(view, savedInstanceState);
         if (mPresenter != null) {
             mPresenter.attachView(this);

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -52,7 +52,6 @@ import com.core.dao.DBManager;
 import com.core.dao.SignAutoLogDao;
 import com.core.interfac.OnVoiceCompleteListener;
 import com.core.model.EmployeesEntity;
-import com.core.net.http.http.OAHttpHelper;
 import com.core.xmpp.model.SignAutoLogEntity;
 import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.iflytek.cloud.RecognizerResult;
@@ -888,27 +887,23 @@ public class CommonUtil {
         }
 
     }
+
     /**
      * 关闭软键盘
      *
-     * @param mContext  上下文
+     * @param mContext 上下文
      */
-    public static void closeKeybord( final Activity mContext) {
-
+    public static void closeKeybord(final Activity mContext) {
         if (mContext != null) {
-            LogUtil.i("gong","closeKeybord");
-            OAHttpHelper.getInstance().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    InputMethodManager imm = (InputMethodManager) mContext
-                            .getSystemService(Context.INPUT_METHOD_SERVICE);
-                    LogUtil.i("gong", "closeKeybord  showshow");
-                    imm.hideSoftInputFromWindow(mContext.getWindow().getDecorView().getWindowToken(), 0);
+            InputMethodManager imm = (InputMethodManager) mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
+            if (imm.isActive() && mContext.getCurrentFocus() != null) {
+                if (mContext.getCurrentFocus().getWindowToken() != null) {
+                    imm.hideSoftInputFromWindow(mContext.getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
                 }
-            }, 100);
+            }
         }
-
     }
+
     public static boolean isBiteman() {
         String baseUrl = getSharedPreferences(MyApplication.getInstance(), "erp_base");
         return !StringUtil.isEmpty(baseUrl) && baseUrl.contains("http://202.104.151.184:8099/ERP/");

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

@@ -186,11 +186,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
-                android:background="#ebe9e9"
                 android:divider="@color/white"
                 android:dividerHeight="0dp"
                 android:focusableInTouchMode="false"
-                android:visibility="visible"></com.core.widget.MyListView>
+                android:visibility="visible"/>
 
         </LinearLayout>
 

app_core/common/src/main/res/values/strings.xml

@@ -86,7 +86,7 @@
     <string name="crm_customer_visit">客户拜访</string>
     <string name="crm_waller">荣誉墙</string>
     <!--View empty-->
-    <string name="empty_message">暂无记录</string>
+    <string name="empty_message">暂无数据</string>
     <string name="loading_message">请等待！</string>
     <string name="error_message">很抱歉! 系统发现未知错误</string>
     <string name="empty_button">再次尝试</string>
@@ -586,7 +586,7 @@
     <string name="common_save_failed">保存失败</string>
     <string name="common_save_success">保存成功</string>
 
-    <string name="common_list_empty">暂无记录</string>
+    <string name="common_list_empty">暂无数据</string>
 
     <!-- end公用部分-->
 

app_core/common/src/main/res/values/styles.xml

@@ -1353,5 +1353,6 @@
         <item name="styleLoadingLayout">@style/LoadingLayoutStyle</item>
         <item name="android:homeAsUpIndicator">@drawable/actionbar_up_indicator</item>
         <item name="actionMenuTextColor">#ffffff</item>
+        <item name="android:windowBackground">@color/base_bg</item>
     </style>
 </resources>

app_modular/appme/src/main/res/values-en/strings.xml

@@ -86,7 +86,7 @@
     <string name="crm_customer_visit">客户拜访</string>
     <string name="crm_waller">荣誉墙</string>
     <!--View empty-->
-    <string name="empty_message">暂无记录</string>
+    <string name="empty_message">暂无数据</string>
     <string name="loading_message">请等待！</string>
     <string name="error_message">很抱歉! 系统发现未知错误</string>
     <string name="empty_button">再次尝试</string>
@@ -586,7 +586,7 @@
     <string name="common_save_failed">保存失败</string>
     <string name="common_save_success">保存成功</string>
 
-    <string name="common_list_empty">暂无记录</string>
+    <string name="common_list_empty">暂无数据</string>
 
     <!-- end公用部分-->
 

app_modular/appme/src/main/res/values/strings.xml

@@ -86,7 +86,7 @@
     <string name="crm_customer_visit">客户拜访</string>
     <string name="crm_waller">荣誉墙</string>
     <!--View empty-->
-    <string name="empty_message">暂无记录</string>
+    <string name="empty_message">暂无数据</string>
     <string name="loading_message">请等待！</string>
     <string name="error_message">很抱歉! 系统发现未知错误</string>
     <string name="empty_button">再次尝试</string>
@@ -586,7 +586,7 @@
     <string name="common_save_failed">保存失败</string>
     <string name="common_save_success">保存成功</string>
 
-    <string name="common_list_empty">暂无记录</string>
+    <string name="common_list_empty">暂无数据</string>
 
     <!-- end公用部分-->
 

app_modular/appmessages/src/main/java/com/modular/appmessages/fragment/ApprovalListFragment.java

@@ -226,6 +226,7 @@ public class ApprovalListFragment extends ViewPagerLazyFragment implements OnSma
                     e.setImid(JSONUtil.getText(object, "EM_IMID"));
                     e.setDealResult(JSONUtil.getText(object, "JN_DEALRESULT"));
                     e.setNodeDealMan(JSONUtil.getText(object, "JP_NODEDEALMANNAME"));
+                    e.setLauncherCode(JSONUtil.getText(object, "JP_LAUNCHERID"));
                     e.setOperatedDescription(JSONUtil.getText(object, "JN_OPERATEDDESCRIPTION"));
                     approvalLists.add(setSubTitle(e));
                 }
@@ -234,6 +235,7 @@ public class ApprovalListFragment extends ViewPagerLazyFragment implements OnSma
         }
     }
 
+
     private ApprovalList setSubTitle(ApprovalList e) {
         String jpStatus = "等待我审批";
         int statusColor = R.color.approvaling;
@@ -289,7 +291,7 @@ public class ApprovalListFragment extends ViewPagerLazyFragment implements OnSma
             if (mUpdateNumListener != null) {
                 mUpdateNumListener.update(ListUtils.getSize(approvalLists));
             }
-            if (!ListUtils.isEmpty(approvalLists)){
+            if (!ListUtils.isEmpty(approvalLists)) {
                 Collections.sort(approvalLists, mComparator);
             }
         }

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

@@ -14,6 +14,9 @@ import android.widget.TextView;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
+import com.core.utils.CommonUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.modular.apputils.R;
 import com.modular.apputils.model.ApprovalList;
@@ -29,6 +32,7 @@ public class ApprovalListAdapter extends RecyclerView.Adapter<ApprovalListAdapte
     private List<ApprovalList> showModels;
     private List<ApprovalList> allModels;
     private int tabItem;
+    private String whichsys ;
 
     public ApprovalListAdapter(Context ct, int tabItem, List<ApprovalList> approvalLists, OnItemClickListener mOnItemClickListener) {
         this.ct = ct;
@@ -36,6 +40,7 @@ public class ApprovalListAdapter extends RecyclerView.Adapter<ApprovalListAdapte
         this.mOnItemClickListener = mOnItemClickListener;
         this.allModels = approvalLists;
         this.showModels = this.allModels;
+        whichsys = CommonUtil.getSharedPreferences(ct, "erp_master");
     }
 
     public void setApprovalLists(List<ApprovalList> approvalLists) {
@@ -71,6 +76,11 @@ public class ApprovalListAdapter extends RecyclerView.Adapter<ApprovalListAdapte
         viewHolder.itemView.setTag(model);
         viewHolder.itemView.setOnClickListener(mOnClickListener);
         if (viewHolder.headImage.getVisibility() == View.VISIBLE) {
+            String imid=model.getImid();
+            if (TextUtils.isEmpty(imid)){
+                imid=getImId(model.getLauncherCode());
+                model.setImid(imid);
+            }
             if (!StringUtil.isEmpty(model.getImid())) {
                 AvatarHelper.getInstance().displayCircular(model.getImid(), viewHolder.headImage, true, false);//显示圆角图片
             } else {
@@ -147,4 +157,20 @@ public class ApprovalListAdapter extends RecyclerView.Adapter<ApprovalListAdapte
             }
         }
     }
+    private String getImId(String em_code) {
+        if (!TextUtils.isEmpty(em_code))try {
+            String[] selectionArgs = {em_code == null ? "" : em_code, whichsys};
+            String selection = "em_code=? and whichsys=? ";
+            //获取数据库数据
+            EmployeesEntity bean = DBManager.getInstance().selectForEmployee(selectionArgs, selection);
+            if (bean != null) {
+                String imId = String.valueOf(bean.getEm_IMID());
+                return imId;
+            } else {
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
 }

app_modular/apputils/src/main/java/com/modular/apputils/model/ApprovalList.java

@@ -11,6 +11,7 @@ public class ApprovalList {
     private String name;//审批名称
     private String status;//状态
     private String launcherName;//发起人名称
+    private String launcherCode;//发起人名称
     private String nodeDealMan;//节点处理人
     private long dealTime;//处理时间
     private String dealResult;//处理结果
@@ -46,6 +47,14 @@ public class ApprovalList {
         return imid;
     }
 
+    public String getLauncherCode() {
+        return launcherCode;
+    }
+
+    public void setLauncherCode(String launcherCode) {
+        this.launcherCode = launcherCode;
+    }
+
     public void setImid(String imid) {
         this.imid = imid;
     }

app_modular/apputils/src/main/java/com/modular/apputils/utils/SignUtils.java

@@ -43,6 +43,8 @@ public class SignUtils implements OnHttpResultListener {
     private final int SIGNING = 11;
     private SignListener mSignListener;
 
+    private long lastTime = 0;
+
     public SignUtils(SignListener mSignListener) {
         this.mSignListener = mSignListener;
     }
@@ -53,6 +55,13 @@ public class SignUtils implements OnHttpResultListener {
 
 
     public void sign(final boolean isB2b, WorkModel model) {
+        if (System.currentTimeMillis() - lastTime < 10000) {
+            if (this.mSignListener !=null){
+                this.mSignListener.sign(false,"");
+            }
+            return;
+        }
+        lastTime = System.currentTimeMillis();
         final float dis = isSubmitAble();
         if (dis > 0) {
             final Bundle bundle = new Bundle();

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

@@ -10,94 +10,101 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize" />
 
-    <com.xzjmyk.pm.activity.view.DivideRadioGroup
-        android:id="@+id/tabGroup"
+    <FrameLayout
+        android:id="@+id/topFl"
         android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="@color/white"
-        android:orientation="horizontal">
-
-        <FrameLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <View
-                android:id="@+id/todoLine"
-                android:layout_width="match_parent"
-                android:layout_height="4dp"
-                android:layout_gravity="bottom"
-                android:layout_marginLeft="@dimen/padding"
-                android:layout_marginRight="@dimen/padding"
-                android:background="#1084D1" />
-
-            <RadioButton
-                android:id="@+id/todoRb"
-                android:layout_width="match_parent"
+        android:layout_height="40dp">
+        <com.xzjmyk.pm.activity.view.DivideRadioGroup
+            android:id="@+id/tabGroup"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:background="@color/white"
+            android:orientation="horizontal">
+
+            <FrameLayout
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:button="@null"
-                android:checked="true"
-                android:gravity="center"
-                android:text="@string/task_wait_todo"
-                style="@style/IMTabButton"
-                />
-
-        </FrameLayout>
-
-        <FrameLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <View
-                android:id="@+id/doneDealLine"
-                android:layout_width="match_parent"
-                android:layout_height="4dp"
-                android:layout_gravity="bottom"
-                android:layout_marginLeft="@dimen/padding"
-                android:layout_marginRight="@dimen/padding"
-                android:background="#1084D1"
-                android:visibility="gone" />
-
-            <RadioButton
-                android:id="@+id/doneDealRb"
-                android:layout_width="match_parent"
+                android:layout_weight="1">
+
+                <View
+                    android:id="@+id/todoLine"
+                    android:layout_width="match_parent"
+                    android:layout_height="4dp"
+                    android:layout_gravity="bottom"
+                    android:layout_marginLeft="@dimen/padding"
+                    android:layout_marginRight="@dimen/padding"
+                    android:background="#1084D1" />
+
+                <RadioButton
+                    android:id="@+id/todoRb"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:button="@null"
+                    android:checked="true"
+                    android:gravity="center"
+                    android:text="@string/task_wait_todo"
+                    style="@style/IMTabButton"
+                    />
+
+            </FrameLayout>
+
+            <FrameLayout
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:button="@null"
-                style="@style/IMTabButton"
-                android:gravity="center"
-                android:text="@string/task_done_deal" />
-        </FrameLayout>
-
-
-        <FrameLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <View
-                android:id="@+id/byMeLine"
-                android:layout_width="match_parent"
-                android:layout_height="4dp"
-                android:layout_gravity="bottom"
-                android:layout_marginLeft="@dimen/padding"
-                android:layout_marginRight="@dimen/padding"
-                android:background="#1084D1"
-                android:visibility="gone" />
-
-            <RadioButton
-                android:id="@+id/byMeRb"
-                android:layout_width="match_parent"
+                android:layout_weight="1">
+
+                <View
+                    android:id="@+id/doneDealLine"
+                    android:layout_width="match_parent"
+                    android:layout_height="4dp"
+                    android:layout_gravity="bottom"
+                    android:layout_marginLeft="@dimen/padding"
+                    android:layout_marginRight="@dimen/padding"
+                    android:background="#1084D1"
+                    android:visibility="gone" />
+
+                <RadioButton
+                    android:id="@+id/doneDealRb"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:button="@null"
+                    style="@style/IMTabButton"
+                    android:gravity="center"
+                    android:text="@string/task_done_deal" />
+            </FrameLayout>
+
+
+            <FrameLayout
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:button="@null"
-                android:gravity="center"
-                android:text="@string/task_request_me"
-                style="@style/IMTabButton" />
-        </FrameLayout>
-
-    </com.xzjmyk.pm.activity.view.DivideRadioGroup>
+                android:layout_weight="1">
+
+                <View
+                    android:id="@+id/byMeLine"
+                    android:layout_width="match_parent"
+                    android:layout_height="4dp"
+                    android:layout_gravity="bottom"
+                    android:layout_marginLeft="@dimen/padding"
+                    android:layout_marginRight="@dimen/padding"
+                    android:background="#1084D1"
+                    android:visibility="gone" />
+
+                <RadioButton
+                    android:id="@+id/byMeRb"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:text="@string/task_request_me"
+                    style="@style/IMTabButton" />
+            </FrameLayout>
+
+        </com.xzjmyk.pm.activity.view.DivideRadioGroup>
+
+    </FrameLayout>
+
 
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/listview_schedult"

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

@@ -1510,9 +1510,13 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
+
     @Override
     protected void onDestroy() {
-        CommonUtil.closeKeybord(this);
         super.onDestroy();
     }
 

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

@@ -490,7 +490,6 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
 
     @Override
     protected void onDestroy() {
-        CommonUtil.closeKeybord(this);
         super.onDestroy();
         unregisterReceiver(sBroadcast);
     }

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/BusinessTravelActivity.java

@@ -97,6 +97,7 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
         LogUtil.i("BusinessTravelActivity");
         mRefreshLayout = findViewById(R.id.mRefreshLayout);
         leaderLL = findViewById(R.id.leaderLL);
+        leaderLL.setVisibility(View.GONE);
         clickTrain = findViewById(R.id.clickTrain);
         clickAir = findViewById(R.id.clickAir);
         clickHotel = findViewById(R.id.clickHotel);

app_third/recyclerlibrary/src/main/res/layout/common_empty_view.xml

@@ -23,7 +23,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="90dp"
-            android:text="数据为空"
+            android:text="暂无数据"
             android:textSize="14sp"
             android:textColor="?attr/editTextColor" />
     </LinearLayout>