提交类型 新功能修改

提交内容  修改待办工作界面

WeiChat/src/main/AndroidManifest.xml

@@ -654,7 +654,8 @@
         <activity android:name="com.uas.appme.other.activity.UpdateSingleTextActivity" />
         <activity android:name="com.uas.appme.other.activity.UpdateSexActivity" />
 
-        <activity android:name=".ui.erp.activity.oa.OAActivity">
+        <activity android:name=".ui.erp.activity.oa.OAActivity"
+            android:theme="@style/MainBaseTheme">
             <intent-filter>
                 <action android:name="com.modular.work.OAActivity" />
                 <category android:name="android.intent.category.DEFAULT" />

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

@@ -295,22 +295,21 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
                 if (mMessageFragment == null) {
                     mMessageFragment = new MessageFragment();
                 }
-                startAnimator(main_tab_one);
                 changeFragment(mMessageFragment, TAG_MESSAGE);//消息
                 updateMessageTitle();
+                startAnimator(main_tab_one);
             } else if (checkedId == R.id.main_tab_two) {
                 if (mBusinessCircleFragment == null) {
                     mBusinessCircleFragment = new ContactsFragment();
                 }
-                startAnimator(main_tab_two);
+
                 changeFragment(mBusinessCircleFragment, TAG_BusinessCircle);//发现
                 setTitle(getString(R.string.contact_title));
-
+                startAnimator(main_tab_two);
             } else if (checkedId == R.id.main_tab_three) {  //点击工作选项
                 if (mWorksFragment == null) {
                     mWorksFragment = new WorkPlatFragment();
                 }
-                startAnimator(main_tab_three);
                 changeFragment(mWorksFragment, TAG_NEARBY);
                 String role = com.core.utils.CommonUtil.getUserRole();
                 if (role.equals("2")) {
@@ -319,17 +318,17 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
                 } else {
                     setTitle(getString(R.string.work_title));
                 }
-                //TODO 当前隐藏新功能提醒红点
                 main_tab_three_tv.setVisibility(View.INVISIBLE);
                 PreferenceUtils.putInt(MainActivity.NEW_FUNCTION_NOTICE, 1);
+                startAnimator(main_tab_three);
             } else if (checkedId == R.id.main_tab_five) {
                 if (mMeFragment == null) {
                     mMeFragment = new MeFragment();
                 }
-                startAnimator(main_tab_five);
                 CommonUtil.setSharedPreferences(ct, com.core.app.Constants.NEW_ME_TAG, true);
                 changeFragment(mMeFragment, TAG_ME);//我
                 setTitle(R.string.me);
+                startAnimator(main_tab_five);
             }
         }
     };

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAActivity.java

@@ -44,7 +44,7 @@ import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConfig;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.model.Employees;
 import com.core.net.http.ViewUtil;
 import com.core.net.http.http.OAHttpHelper;
@@ -102,7 +102,7 @@ import static com.xzjmyk.pm.activity.view.crouton.Crouton.makeText;
 /**
  * Created by pengminggong on 2016/9/27.
  */
-public class OAActivity extends BaseActivity implements View.OnClickListener, WorkDailyAddActivity.OnFinishOa, OnHttpResultListener {
+public class OAActivity extends SupportToolBarActivity implements View.OnClickListener, WorkDailyAddActivity.OnFinishOa, OnHttpResultListener {
     private final int LOAD_ORDERSCALL = 0x768;//获取动态caller
     private final int LOAD_SUBORDINATE = 0x767;//获取下属数据
     private final int LOAD_MENU_DATA = 0x766;//获取菜单数据
@@ -451,11 +451,9 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
             subord_log.setText(getString(R.string.Subordinates_visit));
             my_log.setText(getString(R.string.my_visit));
         } else {
-//            title = getString(R.string.work_oa);
-            title = getString(R.string.work_calender);
+            title = getString(R.string.oamain_title);
         }
-        getSupportActionBar().setTitle(title);
-
+        setTitle(title);
         setDateTag(new Date());
         if (!isB2b) {
             loadSubordinate();
@@ -473,7 +471,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
         CommonInterface.getInstance().judgeManager(null);
         CommonInterface.getInstance().getOutSetInfo(null);
 
-        doShowSpecialView();//TODO 红点啥的和版本新功能有关的都写在这里吧
+        doShowSpecialView();
         //获取动态表单caller
 //        loadOrdersCall();
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -140,7 +140,7 @@ public class MessageFragment extends SupportToolBarFragment implements IMessageV
         super.onResume();
         presenter.loadData();
         if (PreferenceUtils.getBoolean("hasAutoSign", false)) {
-            mSignRefreshLayout.setSignShow(true);
+            setSignViewData(true);
             PreferenceUtils.putBoolean("hasAutoSign", false);
         }
     }
@@ -218,7 +218,7 @@ public class MessageFragment extends SupportToolBarFragment implements IMessageV
         }
     }
 
-    private void setSignViewData(boolean show) {
+    private void setSignViewData(boolean muchShow) {
         if (mContext != null && mContext.progressDialog != null) {
             mContext.progressDialog.dismiss();
         }
@@ -243,7 +243,7 @@ public class MessageFragment extends SupportToolBarFragment implements IMessageV
                 }
             }
             mSignRefreshLayout.setTag(work);
-            mSignRefreshLayout.setSignShow(show);
+            mSignRefreshLayout.setSignShow(muchShow);
         } else {
             ToastUtil.showToast(ct, "未找到班次！！", getContentView());
         }

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

@@ -1,39 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
     <LinearLayout
         android:id="@+id/ll_moment"
-        android:background="@color/white"
+        style="@style/LinearLayout_horizontal"
         android:layout_height="wrap_content"
+        android:background="@color/white"
         android:maxHeight="180dp"
-        android:minHeight="50dp"
-        style="@style/LinearLayout_horizontal">
+        android:minHeight="50dp">
+
         <TextView
             android:id="@+id/tv_less_key"
             style="@style/TextView_Basic"
-            android:layout_margin="10dp"
             android:layout_width="60dp"
-            android:textSize="14sp"
-            android:textColor="@color/text_main"
             android:layout_gravity="center_vertical"
-            android:text="商机阶段商机阶段阶段:" />
-<!--android:background="@drawable/shape_from_edit"-->
+            android:layout_marginBottom="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="3dp"
+            android:layout_marginTop="10dp"
+            android:text="商机阶段商机阶段阶段:"
+            android:textColor="@color/text_main"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/muchInputTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="*"
+            android:textColor="@color/red"
+            android:visibility="gone" />
+
         <EditText
             android:id="@+id/tv_less_value"
             style="@style/TextView_Basic"
-            android:maxWidth="260dp"
-            android:minWidth="240dp"
-            android:maxHeight="150dp"
-            android:textSize="14sp"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_gravity="center_vertical"
-            android:layout_width="match_parent"
+            android:layout_marginLeft="@dimen/padding"
+            android:layout_weight="1"
             android:background="@drawable/shape_from_edit"
             android:gravity="right|center"
+            android:hint="@string/common_input"
+            android:maxHeight="150dp"
+            android:maxWidth="260dp"
+            android:minWidth="240dp"
             android:padding="5dp"
+            android:textSize="14sp" />
+
+        <ImageView
+            android:id="@+id/selectIv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:layout_marginRight="10dp"
-            android:hint="@string/common_input" />
+            android:src="@drawable/oa_next"
+            android:visibility="gone" />
     </LinearLayout>
 </LinearLayout>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri May 11 08:43:40 CST 2018
+#Fri May 11 18:03:13 CST 2018
 debugName=164
-versionName=638
+versionName=639
 debugCode=164
-versionCode=178
+versionCode=179

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

@@ -1,39 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
     <LinearLayout
         android:id="@+id/ll_moment"
-        android:background="@color/white"
+        style="@style/LinearLayout_horizontal"
         android:layout_height="wrap_content"
+        android:background="@color/white"
         android:maxHeight="180dp"
-        android:minHeight="50dp"
-        style="@style/LinearLayout_horizontal">
+        android:minHeight="50dp">
+
         <TextView
             android:id="@+id/tv_less_key"
             style="@style/TextView_Basic"
-            android:layout_margin="10dp"
             android:layout_width="60dp"
-            android:textSize="14sp"
-            android:textColor="@color/text_main"
             android:layout_gravity="center_vertical"
-            android:text="商机阶段商机阶段阶段:" />
-<!--android:background="@drawable/shape_from_edit"-->
+            android:layout_marginBottom="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="3dp"
+            android:layout_marginTop="10dp"
+            android:text="商机阶段商机阶段阶段:"
+            android:textColor="@color/text_main"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/muchInputTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="*"
+            android:textColor="@color/red"
+            android:visibility="gone" />
+
         <EditText
             android:id="@+id/tv_less_value"
             style="@style/TextView_Basic"
-            android:maxWidth="260dp"
-            android:minWidth="240dp"
-            android:maxHeight="150dp"
-            android:textSize="14sp"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_gravity="center_vertical"
-            android:layout_width="match_parent"
+            android:layout_marginLeft="@dimen/padding"
+            android:layout_weight="1"
             android:background="@drawable/shape_from_edit"
             android:gravity="right|center"
+            android:hint="@string/common_input"
+            android:maxHeight="150dp"
+            android:maxWidth="260dp"
+            android:minWidth="240dp"
             android:padding="5dp"
+            android:textSize="14sp" />
+
+        <ImageView
+            android:id="@+id/selectIv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:layout_marginRight="10dp"
-            android:hint="@string/common_input" />
+            android:src="@drawable/oa_next"
+            android:visibility="gone" />
     </LinearLayout>
 </LinearLayout>

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

@@ -358,7 +358,8 @@
                 <!--end 年月日布局-->
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="28dp"
+                    android:gravity="center"
                     android:orientation="horizontal">
 
                     <TextView

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceDataFormAddActivity.java

@@ -22,6 +22,7 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -36,9 +37,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.RegexUtil;
 import com.common.data.StringUtil;
-import com.common.data.TextUtil;
 import com.core.app.Constants;
-import com.core.base.BaseActivity;
 import com.core.base.SupportToolBarActivity;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
@@ -1022,6 +1021,8 @@ public class DeviceDataFormAddActivity extends SupportToolBarActivity implements
                         model.text = (TextView) convertView.findViewById(R.id.tv_less_key);
                         model.editText = (EditText) convertView.findViewById(R.id.tv_less_value);
                         model.ll_moment = (LinearLayout) convertView.findViewById(R.id.ll_moment);
+//                        model.selectIv = convertView.findViewById(R.id.selectIv);
+//                        model.muchInputTv = convertView.findViewById(R.id.muchInputTv);
                         model.editText.setBackgroundResource(R.color.transparent);
                         convertView.setTag(model);
                     } else {
@@ -1036,8 +1037,10 @@ public class DeviceDataFormAddActivity extends SupportToolBarActivity implements
                     model.text.setText(data.getName());
                     if ("F".equals(data.getReadonly()) || "necessaryField".equals(data.getReadonly())) {
                         model.editText.setHint("请输入(必填)");
+                        model.muchInputTv.setVisibility(View.VISIBLE);
                     } else {
                         model.editText.setHint("请输入");
+                        model.muchInputTv.setVisibility(View.GONE);
                     }
                     if (data.getType().equals("D") ||
                             data.getType().equals("C") ||
@@ -1281,7 +1284,9 @@ public class DeviceDataFormAddActivity extends SupportToolBarActivity implements
 
         class ViewModel {
             TextView text;
+            TextView muchInputTv;
             EditText editText;
+            ImageView selectIv;
             LinearLayout ll_moment;
         }
     }

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceManageActivity.java

@@ -36,7 +36,7 @@ public class DeviceManageActivity extends SupportToolBarActivity {
     }
 
     private void initView() {
-        contantRv = (RecyclerView) findViewById(R.id.contantRv);
+        contantRv =findViewById(R.id.contantRv);
         contantRv.setLayoutManager(new GridLayoutManager(ct, 4));
         List<DeviceManage> models = new ArrayList<>();
         //扫一扫
@@ -51,7 +51,7 @@ public class DeviceManageActivity extends SupportToolBarActivity {
         models.add(new DeviceManage(6, R.drawable.icon_fault_inspection, StringUtil.getMessage(R.string.text_fault_inspection)).setCazz(DeviceDataFormAddActivity.class).addString("caller", "DeviceChange!Inspect"));
         //周期盘点
         models.add(new DeviceManage(7, R.drawable.icon_cycle_count, StringUtil.getMessage(R.string.text_cycle_count)).setCazz(DeviceCycleCountActivity.class));
-        models.add(new DeviceManage(8, R.drawable.icon_device_query, StringUtil.getMessage(R.string.text_device_query_match)).setCazz(DeviceMatchActivity.class));
+        models.add(new DeviceManage(8, R.drawable.icon_device_match, StringUtil.getMessage(R.string.text_device_query_match)).setCazz(DeviceMatchActivity.class));
         DeviceManageAdapter adapter = new DeviceManageAdapter(this, models);
         contantRv.setAdapter(adapter);
         adapter.setItemClickListener(new DeviceManageAdapter.ItemClickListener() {

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

@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/base_bg"
+    android:background="#f2f2f2"
+    android:paddingTop="@dimen/padding"
     tools:context="com.uas.appworks.CRM.erp.activity.DeviceManageActivity">
 
     <android.support.v7.widget.RecyclerView