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

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

@@ -0,0 +1,20 @@
+package com.xzjmyk.pm.activity.ui.erp.activity;
+
+import android.os.Bundle;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+/**
+ * Created by RaoMeng on 2017/8/3.
+ * 选择查询业务页面
+ */
+public class DataInquiryActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_data_inquiry);
+        getSupportActionBar().setTitle(R.string.select_query_service);
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.xzjmyk.pm.activity.ui.erp.activity;
+
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+
+/**
+ * Created by RaoMeng on 2017/8/3.
+ * 数据查询列表页面
+ */
+public class DataInquiryListActivity extends BaseActivity {
+    private VoiceSearchView mVoiceSearchView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_data_inquiry_list);
+
+        View view = LayoutInflater.from(ct).inflate(R.layout.action_data_inquiry_list, null);
+        ActionBar bar = this.getSupportActionBar();
+        bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+        mVoiceSearchView = (VoiceSearchView) view.findViewById(R.id.data_inquiry_searchview);
+        bar.setCustomView(view);
+    }
+
+
+}

WeiChat/src/main/res/drawable/shape_item_data_inquiry_blue.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+
+    <solid android:color="@color/LightBlue"/>
+
+    <size
+        android:width="20dp"
+        android:height="20dp"/>
+</shape>

WeiChat/src/main/res/drawable/shape_item_data_inquiry_green.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+
+    <solid android:color="@color/light_green"/>
+
+    <size
+        android:width="20dp"
+        android:height="20dp"/>
+</shape>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/data_inquiry_searchview"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+</com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView>

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

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="match_parent"
+              android:background="@color/bg_underlying"
+              android:orientation="vertical"
+              android:padding="@dimen/activity_vertical_margin">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="30dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:maxLines="1"
+            android:text="------------------------------------------"
+            android:textColor="@color/titleBlue"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:gravity="center"
+            android:singleLine="true"
+            android:text="@string/common_service_query"
+            android:textColor="@color/titleBlue"
+            android:textSize="16sp"/>
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:maxLines="1"
+            android:text="------------------------------------------"
+            android:textColor="@color/titleBlue"/>
+    </LinearLayout>
+
+    <com.xzjmyk.pm.activity.view.MyGridView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:numColumns="3"
+        android:scrollbars="none"
+        />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="30dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:maxLines="1"
+            android:text="------------------------------------------"
+            android:textColor="@color/titleBlue"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:gravity="center"
+            android:singleLine="true"
+            android:text="@string/more_queries"
+            android:textColor="@color/titleBlue"
+            android:textSize="16sp"/>
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:maxLines="1"
+            android:text="------------------------------------------"
+            android:textColor="@color/titleBlue"/>
+    </LinearLayout>
+
+</LinearLayout>

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

@@ -0,0 +1,37 @@
+<?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="match_parent"
+                android:orientation="vertical">
+
+    <ListView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.xzjmyk.pm.activity.view.MyGridView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:numColumns="2"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:gravity="center"
+            android:text="清空历史记录"
+            android:textColor="@color/LightBlue"
+            android:padding="10dp"
+            android:textSize="16sp"/>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#40000000"
+            />
+    </LinearLayout>
+</RelativeLayout>

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
+
+    <TextView
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:background="@drawable/shape_item_data_inquiry_blue"
+        android:gravity="center"
+        android:textColor="@color/white"
+        android:textSize="18sp"
+        tools:text="物"
+        />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="6dp"
+        android:gravity="center"
+        android:textSize="14sp"
+        tools:text="物料资料"
+        />
+</LinearLayout>

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

@@ -1420,4 +1420,10 @@
     <string name = "to_login"> existing account? Login </string>
     <string name = "input_phone_number"> Please enter the phone number </string>
     <string name = "input_name"> Please enter a name </string>
+
+
+    <!--工作->数据查询-->
+    <string name="common_service_query">常用业务查询</string>
+    <string name="more_queries">更多查询</string>
+    <string name="select_query_service">选择查询业务</string>
 </resources>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -1532,4 +1532,10 @@
     <string name="to_login">已有账户？登录</string>
     <string name="input_phone_number">请输入手机号</string>
     <string name="input_name">请输入姓名</string>
+
+
+    <!--工作->数据查询-->
+    <string name="common_service_query">常用业务查询</string>
+    <string name="more_queries">更多查询</string>
+    <string name="select_query_service">选择查询业务</string>
 </resources>

WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -821,7 +821,7 @@
     <string name="mark_unread">標為已讀</string>
     <string name="msg_subscribe_data">查看企業數據</string>
     <!--通讯录-->
-     <string name="contact_title">通訊錄</string>
+    <string name="contact_title">通訊錄</string>
     <string name="contact_company">企業架構</string>
     <string name="contact_business">商務群</string>
     <string name="contact_friend">UU好友</string>
@@ -1521,4 +1521,10 @@
     <string name="to_login">已有賬戶？登錄</string>
     <string name="input_phone_number">請輸入手機號</string>
     <string name="input_name">請輸入姓名</string>
+
+
+    <!--工作-数据查询-->
+    <string name="common_service_query">常用业务查询</string>
+    <string name="more_queries">更多查询</string>
+    <string name="select_query_service">选择查询业务</string>
 </resources>

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

@@ -1864,6 +1864,9 @@
     <string name="to_login">已有账户？登录</string>
     <string name="input_phone_number">请输入手机号</string>
     <string name="input_name">请输入姓名</string>
-    
-    
+
+    <!--工作->数据查询-->
+    <string name="common_service_query">常用业务查询</string>
+    <string name="more_queries">更多查询</string>
+    <string name="select_query_service">选择查询业务</string>
 </resources>