From e54c424ab126459baa3a0de75830591a9d62e614 Mon Sep 17 00:00:00 2001
From: "MSI\\wei" <861739889@qq.com>
Date: Thu, 10 Aug 2017 22:32:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AF=B9=E8=AF=9D=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PersonalCenter/.idea/gradle.xml                    |  3 +-
 PersonalCenter/.idea/misc.xml                      | 58 +++++++++++++++-------
 PersonalCenter/.idea/modules.xml                   |  2 -
 PersonalCenter/app/src/main/AndroidManifest.xml    |  2 +-
 .../customdialog/ElectronicCardDialog.java         |  4 ++
 .../personalcenter/customdialog/ListDialog.java    |  4 ++
 .../app/src/main/res/drawable/corcle_white_bg.xml  | 10 ++--
 .../res/layout/custom_adilog_electroniccard.xml    | 13 ++---
 .../app/src/main/res/layout/custom_adilog_list.xml |  4 +-
 9 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/PersonalCenter/.idea/gradle.xml b/PersonalCenter/.idea/gradle.xml
index fdabd41..ac1f3b2 100644
--- a/PersonalCenter/.idea/gradle.xml
+++ b/PersonalCenter/.idea/gradle.xml
@@ -3,8 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.14.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/PersonalCenter/.idea/misc.xml b/PersonalCenter/.idea/misc.xml
index cca2cda..d4f4821 100644
--- a/PersonalCenter/.idea/misc.xml
+++ b/PersonalCenter/.idea/misc.xml
@@ -27,6 +27,46 @@
       </value>
     </option>
   </component>
+  <component name="ProjectInspectionProfilesVisibleTreeState">
+    <entry key="Project Default">
+      <profile-state>
+        <expanded-state>
+          <State>
+            <id />
+          </State>
+          <State>
+            <id>Class structureJava</id>
+          </State>
+          <State>
+            <id>Code maturity issuesJava</id>
+          </State>
+          <State>
+            <id>Java</id>
+          </State>
+          <State>
+            <id>Java language level migration aidsJava</id>
+          </State>
+          <State>
+            <id>Javadoc issuesJava</id>
+          </State>
+          <State>
+            <id>Performance issuesJava</id>
+          </State>
+          <State>
+            <id>TestNGJava</id>
+          </State>
+          <State>
+            <id>Threading issuesJava</id>
+          </State>
+        </expanded-state>
+        <selected-state>
+          <State>
+            <id>Android</id>
+          </State>
+        </selected-state>
+      </profile-state>
+    </entry>
+  </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
     <OptionsSetting value="true" id="Remove" />
@@ -37,26 +77,10 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
 </project>
\ No newline at end of file
diff --git a/PersonalCenter/.idea/modules.xml b/PersonalCenter/.idea/modules.xml
index db85330..3ef048e 100644
--- a/PersonalCenter/.idea/modules.xml
+++ b/PersonalCenter/.idea/modules.xml
@@ -3,8 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/PersonalCenter.iml" filepath="$PROJECT_DIR$/PersonalCenter.iml" />
-      <module fileurl="file://$PROJECT_DIR$/PersonalCenter.iml" filepath="$PROJECT_DIR$/PersonalCenter.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <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" />
     </modules>
diff --git a/PersonalCenter/app/src/main/AndroidManifest.xml b/PersonalCenter/app/src/main/AndroidManifest.xml
index 7f16265..ba1df0b 100644
--- a/PersonalCenter/app/src/main/AndroidManifest.xml
+++ b/PersonalCenter/app/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/Theme.AppCompat.NoActionBar">
+        android:theme="@style/Theme.AppCompat.Light.NoActionBar">
         <activity
             android:name=".activity.MainActivity"
             android:launchMode="singleTask"
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ElectronicCardDialog.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ElectronicCardDialog.java
index dcf7f38..55fb526 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ElectronicCardDialog.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ElectronicCardDialog.java
@@ -2,7 +2,9 @@ package com.hjx.personalcenter.customdialog;
 
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -23,6 +25,8 @@ public class ElectronicCardDialog extends BaseCircleDialog {
         dialogFragment.setCanceledOnTouchOutside(true);
         dialogFragment.setRadius(CircleDimen.RADIUS);
         dialogFragment.setWidth(0.8f);
+        dialogFragment.setGravity(Gravity.CENTER);
+        dialogFragment.setBackgroundColor(Color.WHITE);
         return dialogFragment;
     }
     @Override
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ListDialog.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ListDialog.java
index 0ac9347..210b5ce 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ListDialog.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ListDialog.java
@@ -1,7 +1,9 @@
 package com.hjx.personalcenter.customdialog;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -30,6 +32,8 @@ public class ListDialog extends BaseCircleDialog implements AdapterView.OnItemCl
         dialogFragment.setCanceledOnTouchOutside(true);
         dialogFragment.setRadius(CircleDimen.RADIUS);
         dialogFragment.setWidth(0.5f);
+        dialogFragment.setGravity(Gravity.CENTER);
+        dialogFragment.setBackgroundColor(Color.WHITE);
         return dialogFragment;
     }
     @Override
diff --git a/PersonalCenter/app/src/main/res/drawable/corcle_white_bg.xml b/PersonalCenter/app/src/main/res/drawable/corcle_white_bg.xml
index e6ff951..de3f65b 100644
--- a/PersonalCenter/app/src/main/res/drawable/corcle_white_bg.xml
+++ b/PersonalCenter/app/src/main/res/drawable/corcle_white_bg.xml
@@ -2,12 +2,12 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid
-        android:color="@color/white"/>
+        android:color="@color/colorAccent"/>
     <corners
-        android:bottomLeftRadius="100dp"
-        android:topLeftRadius="100dp"
-        android:bottomRightRadius="100dp"
-        android:topRightRadius="100dp"/>
+        android:bottomLeftRadius="20dp"
+        android:topLeftRadius="20dp"
+        android:bottomRightRadius="20dp"
+        android:topRightRadius="20dp"/>
     <stroke android:width="1dp"
         android:color="@color/cutoff_line"/>
 </shape>
\ No newline at end of file
diff --git a/PersonalCenter/app/src/main/res/layout/custom_adilog_electroniccard.xml b/PersonalCenter/app/src/main/res/layout/custom_adilog_electroniccard.xml
index 08f4fa1..84f4c7c 100644
--- a/PersonalCenter/app/src/main/res/layout/custom_adilog_electroniccard.xml
+++ b/PersonalCenter/app/src/main/res/layout/custom_adilog_electroniccard.xml
@@ -1,13 +1,12 @@
 <?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:background="@android:color/white">
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="600dp">
     <RelativeLayout
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:color/white"
         android:minHeight="70dp" >
 
         <ImageView
@@ -24,7 +23,6 @@
         android:gravity="center"
         android:layout_gravity="clip_horizontal"
         android:layout_width="match_parent"
-        android:background="@android:color/white"
         android:layout_height="wrap_content">
     <ImageView
         android:layout_width="wrap_content"
@@ -33,7 +31,6 @@
     </RelativeLayout>
     <LinearLayout
         android:orientation="vertical"
-        android:background="@android:color/white"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
     <TextView
@@ -48,6 +45,7 @@
         android:layout_gravity="center"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
         android:textSize="15sp"
         android:textColor="@color/electronic_card"
         android:text="@string/electronic_card2"/>
@@ -62,7 +60,7 @@
     <TextView
         android:id="@+id/fill_card"
         android:layout_gravity="center"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="30dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="15sp"
@@ -72,7 +70,6 @@
     </LinearLayout>
     <LinearLayout
         android:orientation="vertical"
-        android:background="@android:color/white"
         android:layout_width="match_parent"
         android:layout_height="30dp">
     </LinearLayout>
diff --git a/PersonalCenter/app/src/main/res/layout/custom_adilog_list.xml b/PersonalCenter/app/src/main/res/layout/custom_adilog_list.xml
index 87ec8b1..f0b7715 100644
--- a/PersonalCenter/app/src/main/res/layout/custom_adilog_list.xml
+++ b/PersonalCenter/app/src/main/res/layout/custom_adilog_list.xml
@@ -8,7 +8,6 @@
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:color/white"
         android:minHeight="70dp" >
 
         <ImageView
@@ -32,9 +31,8 @@
     </RelativeLayout>
     <ListView
         android:id="@+id/listadapter"
-        android:background="@android:color/white"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="400dp">
 
     </ListView>
 </LinearLayout>
-- 
1.9.0