From a145cbca133a5981f3de75e3d10ec98641ce1571 Mon Sep 17 00:00:00 2001
From: "MSI\\wei" <861739889@qq.com>
Date: Sat, 12 Aug 2017 01:08:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PersonalCenter/.idea/modules.xml                   |  1 +
 .../activity/ElectronicCardEditInfoActivity.java   | 14 ++---
 .../hjx/personalcenter/activity/MainActivity.java  |  2 +-
 .../layout/activity_electronic_look_cardinfo.xml   |  4 +-
 .../res/layout/activity_electroniccard_info.xml    | 62 ++++++++++++++--------
 .../com/bigkoo/pickerview/view/BasePickerView.java | 12 +++--
 .../src/main/res/drawable/corcle_black_bg.xml      | 13 +++++
 .../src/main/res/layout/layout_basepickerview.xml  | 11 ++--
 .../src/main/res/layout/pickerview_time.xml        |  4 +-
 .../pickerview/src/main/res/values/colors.xml      |  3 +-
 10 files changed, 83 insertions(+), 43 deletions(-)
 create mode 100644 PersonalCenter/pickerview/src/main/res/drawable/corcle_black_bg.xml

diff --git a/PersonalCenter/.idea/modules.xml b/PersonalCenter/.idea/modules.xml
index 753efba..cae0244 100644
--- a/PersonalCenter/.idea/modules.xml
+++ b/PersonalCenter/.idea/modules.xml
@@ -6,6 +6,7 @@
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/circledialog/circledialog.iml" filepath="$PROJECT_DIR$/circledialog/circledialog.iml" />
       <module fileurl="file://$PROJECT_DIR$/pickerview/pickerview.iml" filepath="$PROJECT_DIR$/pickerview/pickerview.iml" />
+      <module fileurl="file://$PROJECT_DIR$/pickerview/pickerview.iml" filepath="$PROJECT_DIR$/pickerview/pickerview.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardEditInfoActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardEditInfoActivity.java
index 31657d6..c2bc9cf 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardEditInfoActivity.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardEditInfoActivity.java
@@ -3,7 +3,9 @@ package com.hjx.personalcenter.activity;
 import android.app.Activity;
 import android.graphics.Color;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -52,16 +54,16 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC
             //因为系统Calendar的月份是从0-11的,所以如果是调用Calendar的set方法来设置时间,月份的范围也要是从0-11
             Calendar selectedDate = Calendar.getInstance();
             Calendar startDate = Calendar.getInstance();
-            startDate.set(2013, 0, 23);
+            startDate.set(1900, 1, 1);
             Calendar endDate = Calendar.getInstance();
-            endDate.set(2019, 11, 28);
+            endDate.set(2100, 1, 1);
             //时间选择器
             pvTime = new TimePickerView.Builder(this, new TimePickerView.OnTimeSelectListener() {
                 @Override
                 public void onTimeSelect(Date date, View v) {//选中事件回调
                     // 这里回调过来的v,就是show()方法里面所添加的 View 参数，如果show的时候没有添加参数，v则为null
                 /*btn_Time.setText(getTime(date));*/
-                    Button btn = (Button) v;
+                    TextView btn = (TextView) v;
                     btn.setText(getTime(date));
                 }
             })
@@ -73,12 +75,12 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC
                     .setContentSize(21)
                     .setDate(selectedDate)
                     .setRangDate(startDate, endDate)
-                    .setBackgroundId(0x00FFFFFF) //设置外部遮罩颜色
+                    .setBackgroundId(0x80000000) //设置外部遮罩颜色
                     .setDecorView(null)
                     .build();
     }
     private String getTime(Date date) {//可根据需要自行截取数据显示
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         return format.format(date);
     }
 
@@ -86,7 +88,7 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC
     public void onClick(View v) {
         switch (v.getId()){
             case R.id.lineL_buy_time:
-                pvTime.show(v);//弹出时间选择器，传递参数过去，回调的时候则可以绑定此view
+                pvTime.show(tv_buy_time);//弹出时间选择器，传递参数过去，回调的时候则可以绑定此view
                 break;
         }
 
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java
index 5049259..776fb37 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java
@@ -18,7 +18,7 @@ public class MainActivity extends AppCompatActivity {
         ssss.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent(MainActivity.this,RegisterInfoActivity.class);
+                Intent intent = new Intent(MainActivity.this,ElectronicCardEditInfoActivity.class);
                 startActivity(intent);
             }
         });
diff --git a/PersonalCenter/app/src/main/res/layout/activity_electronic_look_cardinfo.xml b/PersonalCenter/app/src/main/res/layout/activity_electronic_look_cardinfo.xml
index dea449c..5d4ce3c 100644
--- a/PersonalCenter/app/src/main/res/layout/activity_electronic_look_cardinfo.xml
+++ b/PersonalCenter/app/src/main/res/layout/activity_electronic_look_cardinfo.xml
@@ -144,7 +144,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="18dp"
-                    android:background="@drawable/corcle_blue_bg"
+                    android:background="@drawable/corcle_black_bg"
                     android:text="修改"
                     android:paddingLeft="5dp"
                     android:paddingRight="5dp"
@@ -290,7 +290,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="18dp"
-                    android:background="@drawable/corcle_blue_bg"
+                    android:background="@drawable/corcle_black_bg"
                     android:text="修改"
                     android:paddingLeft="5dp"
                     android:paddingRight="5dp"
diff --git a/PersonalCenter/app/src/main/res/layout/activity_electroniccard_info.xml b/PersonalCenter/app/src/main/res/layout/activity_electroniccard_info.xml
index aad8f19..24930b7 100644
--- a/PersonalCenter/app/src/main/res/layout/activity_electroniccard_info.xml
+++ b/PersonalCenter/app/src/main/res/layout/activity_electroniccard_info.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/card_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -36,11 +37,13 @@
         android:layout_gravity="center"
         android:layout_marginTop="20dp"
         android:src="@mipmap/change_info_icon" />
+
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
         android:orientation="horizontal">
+
         <View
             android:layout_width="450dp"
             android:layout_height="0.7dp"
@@ -48,13 +51,14 @@
             android:background="@color/electronic_text">
 
         </View>
+
         <View
-        android:layout_width="400dp"
-        android:layout_height="0.7dp"
-        android:layout_marginLeft="80dp"
-        android:background="@color/electronic_text">
+            android:layout_width="400dp"
+            android:layout_height="0.7dp"
+            android:layout_marginLeft="80dp"
+            android:background="@color/electronic_text">
 
-    </View>
+        </View>
 
 
     </LinearLayout>
@@ -75,16 +79,16 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="客户姓名"
-                android:textColor="@color/btn_text_color"
+                android:textColor="@color/pickerview_wheelview_textcolor_center"
                 android:textSize="22sp" />
 
             <EditText
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@null"
                 android:layout_marginLeft="50dp"
-                android:textColor="@color/electronic_text"
+                android:background="@null"
                 android:hint="请输入"
+                android:textColor="@color/electronic_text"
                 android:textSize="22sp" />
 
         </LinearLayout>
@@ -99,14 +103,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="购买地址"
-                android:textColor="@color/btn_text_color"
+                android:textColor="@color/pickerview_wheelview_textcolor_center"
                 android:textSize="22sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="请选择地区"
                 android:layout_marginLeft="60dp"
+                android:text="请选择地区"
                 android:textColor="@color/btn_text_color"
                 android:textSize="22sp" />
 
@@ -120,10 +124,12 @@
         </LinearLayout>
 
     </LinearLayout>
+
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
+
         <View
             android:layout_width="450dp"
             android:layout_height="0.7dp"
@@ -131,6 +137,7 @@
             android:background="@color/electronic_text">
 
         </View>
+
         <View
             android:layout_width="400dp"
             android:layout_height="0.7dp"
@@ -158,14 +165,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="客户地址"
-                android:textColor="@color/btn_text_color"
+                android:textColor="@color/pickerview_wheelview_textcolor_center"
                 android:textSize="22sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="请选择地区"
                 android:layout_marginLeft="50dp"
+                android:text="请选择地区"
                 android:textSize="22sp" />
 
             <ImageView
@@ -184,12 +191,14 @@
             android:layout_height="80dp"
             android:layout_marginLeft="200dp"
             android:gravity="center_vertical">
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="        "
                 android:textColor="@color/white"
                 android:textSize="22sp" />
+
             <EditText
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -201,11 +210,13 @@
         </LinearLayout>
 
     </LinearLayout>
+
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
 
         android:orientation="horizontal">
+
         <View
             android:layout_width="450dp"
             android:layout_height="0.7dp"
@@ -213,6 +224,7 @@
             android:background="@color/electronic_text">
 
         </View>
+
         <View
             android:layout_width="400dp"
             android:layout_height="0.7dp"
@@ -233,8 +245,9 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="80dp"
-            android:gravity="center_vertical"
-            android:layout_marginLeft="200dp">
+            android:layout_marginLeft="200dp"
+            android:gravity="center_vertical">
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -262,25 +275,27 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="本地售后电话"
-                android:textColor="@color/btn_text_color"
+                android:textColor="@color/pickerview_wheelview_textcolor_center"
                 android:textSize="22sp" />
 
             <EditText
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:hint="请输入"
-                android:background="@null"
                 android:layout_marginLeft="25dp"
+                android:background="@null"
+                android:hint="请输入"
                 android:textColor="@color/btn_text_color"
                 android:textSize="22sp" />
         </LinearLayout>
 
     </LinearLayout>
+
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
 
         android:orientation="horizontal">
+
         <View
             android:layout_width="450dp"
             android:layout_height="0.7dp"
@@ -288,6 +303,7 @@
             android:background="@color/electronic_text">
 
         </View>
+
         <View
             android:layout_width="400dp"
             android:layout_height="0.7dp"
@@ -316,16 +332,17 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="购买时间"
-                android:textColor="@color/btn_text_color"
+                android:textColor="@color/pickerview_wheelview_textcolor_center"
                 android:textSize="22sp" />
 
             <TextView
                 android:id="@+id/tv_buy_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:hint="请选择时间"
                 android:layout_marginLeft="50dp"
+                android:hint="请选择时间"
                 android:textSize="22sp" />
+
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -337,11 +354,13 @@
         </LinearLayout>
 
     </LinearLayout>
+
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
 
         android:orientation="horizontal">
+
         <View
             android:layout_width="450dp"
             android:layout_height="0.7dp"
@@ -352,12 +371,13 @@
 
 
     </LinearLayout>
+
     <Button
+        android:id="@+id/btn_ok"
+        style="@style/button_login_register_style"
         android:layout_marginLeft="200dp"
         android:layout_marginRight="200dp"
         android:layout_marginTop="80dp"
-        android:id="@+id/btn_ok"
-        style="@style/button_login_register_style"
         android:text="@string/string_regist_next" />
 
 
diff --git a/PersonalCenter/pickerview/src/main/java/com/bigkoo/pickerview/view/BasePickerView.java b/PersonalCenter/pickerview/src/main/java/com/bigkoo/pickerview/view/BasePickerView.java
index 3af05db..1ba4538 100644
--- a/PersonalCenter/pickerview/src/main/java/com/bigkoo/pickerview/view/BasePickerView.java
+++ b/PersonalCenter/pickerview/src/main/java/com/bigkoo/pickerview/view/BasePickerView.java
@@ -25,9 +25,8 @@ import com.bigkoo.pickerview.utils.PickerViewAnimateUtil;
  */
 public class BasePickerView {
     private final FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.BOTTOM
+            ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER
     );
-
     private Context context;
     protected ViewGroup contentContainer;
     public ViewGroup decorView;//显示pickerview的根View,默认是activity的根view
@@ -93,15 +92,18 @@ public class BasePickerView {
             }
             //将控件添加到decorView中
             rootView = (ViewGroup) layoutInflater.inflate(R.layout.layout_basepickerview, decorView, false);
-            rootView.setLayoutParams(new FrameLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT
-            ));
+            FrameLayout.LayoutParams rootparams = new FrameLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, Gravity.CENTER
+            );
+            rootView.setLayoutParams(rootparams);
             if (backgroudId != 0) {
                 rootView.setBackgroundColor(backgroudId);
             }
             // rootView.setBackgroundColor(ContextCompat.getColor(context,backgroudId));
             //这个是真正要加载时间选取器的父布局
             contentContainer = (ViewGroup) rootView.findViewById(R.id.content_container);
+            params.leftMargin = 500;
+            params.rightMargin= 500;
             contentContainer.setLayoutParams(params);
         }
         setKeyBackCancelable(true);
diff --git a/PersonalCenter/pickerview/src/main/res/drawable/corcle_black_bg.xml b/PersonalCenter/pickerview/src/main/res/drawable/corcle_black_bg.xml
new file mode 100644
index 0000000..f3052bf
--- /dev/null
+++ b/PersonalCenter/pickerview/src/main/res/drawable/corcle_black_bg.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid
+        android:color="@color/white"/>
+    <corners
+        android:bottomLeftRadius="20dp"
+        android:topLeftRadius="20dp"
+        android:bottomRightRadius="20dp"
+        android:topRightRadius="20dp"/>
+    <stroke android:width="1dp"
+        android:color="@color/login_edittext_hint"/>
+</shape>
\ No newline at end of file
diff --git a/PersonalCenter/pickerview/src/main/res/layout/layout_basepickerview.xml b/PersonalCenter/pickerview/src/main/res/layout/layout_basepickerview.xml
index adbae30..9033f76 100644
--- a/PersonalCenter/pickerview/src/main/res/layout/layout_basepickerview.xml
+++ b/PersonalCenter/pickerview/src/main/res/layout/layout_basepickerview.xml
@@ -2,13 +2,16 @@
 <FrameLayout
     android:id="@+id/outmost_container"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clickable="true"
-    android:background="@color/pickerview_bgColor_overlay">
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/corcle_black_bg"
+    android:padding="20dp"
+    android:clickable="true">
 
     <FrameLayout
         android:id="@+id/content_container"
+        android:padding="20dp"
+        android:background="@drawable/corcle_black_bg"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
     </FrameLayout>
diff --git a/PersonalCenter/pickerview/src/main/res/layout/pickerview_time.xml b/PersonalCenter/pickerview/src/main/res/layout/pickerview_time.xml
index 9cb3348..c3424c0 100644
--- a/PersonalCenter/pickerview/src/main/res/layout/pickerview_time.xml
+++ b/PersonalCenter/pickerview/src/main/res/layout/pickerview_time.xml
@@ -2,15 +2,13 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@color/pickerview_bgColor_default"
     android:orientation="vertical">
 
 
     <LinearLayout
         android:id="@+id/timepicker"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@android:color/white"
         android:orientation="horizontal">
 
         <com.bigkoo.pickerview.lib.WheelView
diff --git a/PersonalCenter/pickerview/src/main/res/values/colors.xml b/PersonalCenter/pickerview/src/main/res/values/colors.xml
index cdc3058..9ca652c 100644
--- a/PersonalCenter/pickerview/src/main/res/values/colors.xml
+++ b/PersonalCenter/pickerview/src/main/res/values/colors.xml
@@ -3,7 +3,8 @@
     <color name="pickerview_timebtn_nor">#057dff</color>
     <color name="pickerview_timebtn_pre">#c2daf5</color>
     <color name="pickerview_bg_topbar">#f5f5f5</color>
-
+    <color name="white">#ffffffff</color>
+    <color name="login_edittext_hint">#afafaf</color>
     <color name="pickerview_topbar_title">#000000</color>
     <color name="pickerview_wheelview_textcolor_out">#a8a8a8</color>
     <color name="pickerview_wheelview_textcolor_center">#2a2a2a</color>
-- 
1.9.0