hjx-app / PresonalCenter

Browse Code »

Commit e54c424ab126459baa3a0de75830591a9d62e614

Authored by xiongwei 2017-08-10 22:32:33 +0800

1 parent c55b3db1a7

Exists in master

完善对话框

Showing 9 changed files with 63 additions and 37 deletions Show diff stats

PersonalCenter/.idea/gradle.xml

Diff comments View file @e54c424

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <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$" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/circledialog" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
 </project>

PersonalCenter/.idea/misc.xml

Diff comments View file @e54c424

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
         <list size="4">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
         <list size="4">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
         </list>
       </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" />
     <OptionsSetting value="true" id="Checkout" />
     <OptionsSetting value="true" id="Update" />
     <OptionsSetting value="true" id="Status" />
     <OptionsSetting value="true" id="Edit" />
     <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">

PersonalCenter/.idea/modules.xml

Diff comments View file @e54c424

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <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>
   </component>
 </project>

PersonalCenter/app/src/main/AndroidManifest.xml

Diff comments View file @e54c424

1	<?xml version="1.0" encoding="utf-8"?>	1	<?xml version="1.0" encoding="utf-8"?>
2	<manifest xmlns:android="http://schemas.android.com/apk/res/android"	2	<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3	package="com.hjx.personalcenter">	3	package="com.hjx.personalcenter">
4		4
5	<application	5	<application
6	android:allowBackup="true"	6	android:allowBackup="true"
7	android:icon="@mipmap/ic_launcher"	7	android:icon="@mipmap/ic_launcher"
8	android:label="@string/app_name"	8	android:label="@string/app_name"
9	android:supportsRtl="true"	9	android:supportsRtl="true"
10	android:theme="@style/Theme.AppCompat.NoActionBar">	10	android:theme="@style/Theme.AppCompat.Light.NoActionBar">
11	<activity	11	<activity
12	android:name=".activity.MainActivity"	12	android:name=".activity.MainActivity"
13	android:launchMode="singleTask"	13	android:launchMode="singleTask"
14	android:screenOrientation="landscape">	14	android:screenOrientation="landscape">
15	<intent-filter>	15	<intent-filter>
16	<action android:name="android.intent.action.MAIN" />	16	<action android:name="android.intent.action.MAIN" />
17		17
18	<category android:name="android.intent.category.LAUNCHER" />	18	<category android:name="android.intent.category.LAUNCHER" />
19	</intent-filter>	19	</intent-filter>
20	</activity>	20	</activity>
21	<activity	21	<activity
22	android:name=".activity.LoginAndRegisterActivity"	22	android:name=".activity.LoginAndRegisterActivity"
23	android:launchMode="singleTask"	23	android:launchMode="singleTask"
24	android:screenOrientation="landscape">	24	android:screenOrientation="landscape">
25		25
26	</activity>	26	</activity>
27	<activity	27	<activity
28	android:name=".activity.ForgotPasswordActivity"	28	android:name=".activity.ForgotPasswordActivity"
29	android:launchMode="singleTask"	29	android:launchMode="singleTask"
30	android:screenOrientation="landscape">	30	android:screenOrientation="landscape">
31		31
32	</activity>	32	</activity>
33	<activity	33	<activity
34	android:name=".activity.ChangePasswordActivity"	34	android:name=".activity.ChangePasswordActivity"
35	android:launchMode="singleTask"	35	android:launchMode="singleTask"
36	android:screenOrientation="landscape">	36	android:screenOrientation="landscape">
37		37
38	</activity>	38	</activity>
39	<activity	39	<activity
40	android:name=".activity.RegisterInfoActivity"	40	android:name=".activity.RegisterInfoActivity"
41	android:launchMode="singleTask"	41	android:launchMode="singleTask"
42	android:screenOrientation="landscape">	42	android:screenOrientation="landscape">
43		43
44	</activity>	44	</activity>
45	<activity	45	<activity
46	android:name=".activity.ElectronicCardValidationActivity"	46	android:name=".activity.ElectronicCardValidationActivity"
47	android:launchMode="singleTask"	47	android:launchMode="singleTask"
48	android:screenOrientation="landscape">	48	android:screenOrientation="landscape">
49		49
50	</activity>	50	</activity>
51	<activity	51	<activity
52	android:name=".activity.ChangeBangDingActivity"	52	android:name=".activity.ChangeBangDingActivity"
53	android:launchMode="singleTask"	53	android:launchMode="singleTask"
54	android:screenOrientation="landscape">	54	android:screenOrientation="landscape">
55		55
56	</activity>	56	</activity>
57	<activity	57	<activity
58	android:name=".activity.ChangeElectronicCardInfoActivity"	58	android:name=".activity.ChangeElectronicCardInfoActivity"
59	android:launchMode="singleTask"	59	android:launchMode="singleTask"
60	android:screenOrientation="landscape">	60	android:screenOrientation="landscape">
61		61
62	</activity>	62	</activity>
63	<activity	63	<activity
64	android:name=".activity.ChangeEletronicCardPhone"	64	android:name=".activity.ChangeEletronicCardPhone"
65	android:launchMode="singleTask"	65	android:launchMode="singleTask"
66	android:screenOrientation="landscape">	66	android:screenOrientation="landscape">
67		67
68	</activity>	68	</activity>
69	<activity	69	<activity
70	android:name=".activity.ChoiseTextBookActivity"	70	android:name=".activity.ChoiseTextBookActivity"
71	android:launchMode="singleTask"	71	android:launchMode="singleTask"
72	android:screenOrientation="landscape">	72	android:screenOrientation="landscape">
73		73
74	</activity>	74	</activity>
75	<activity	75	<activity
76	android:name=".activity.TheStartPageActivity"	76	android:name=".activity.TheStartPageActivity"
77	android:launchMode="singleTask"	77	android:launchMode="singleTask"
78	android:screenOrientation="landscape">	78	android:screenOrientation="landscape">
79		79
80	</activity>	80	</activity>
81	</application>	81	</application>
82		82
83	</manifest>	83	</manifest>

PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ElectronicCardDialog.java

Diff comments View file @e54c424

 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;
 import com.hjx.personalcenter.R;
 import com.hjx.personalcenter.activity.TheStartPageActivity;
 import com.mylhyl.circledialog.BaseCircleDialog;
 import com.mylhyl.circledialog.res.values.CircleDimen;
 /**
  * Created by h on 2017/8/10.
  */
 public class ElectronicCardDialog extends BaseCircleDialog {
     public static ElectronicCardDialog getInstance() {
         ElectronicCardDialog dialogFragment = new ElectronicCardDialog();
         dialogFragment.setCanceledBack(true);
         dialogFragment.setCanceledOnTouchOutside(true);
         dialogFragment.setRadius(CircleDimen.RADIUS);
         dialogFragment.setWidth(0.8f);
+        dialogFragment.setGravity(Gravity.CENTER);
+        dialogFragment.setBackgroundColor(Color.WHITE);
         return dialogFragment;
     }
     @Override
     public View createView(Context context, LayoutInflater inflater, ViewGroup container) {
         return inflater.inflate(R.layout.custom_adilog_electroniccard, container, false);
     }
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         getView().findViewById(R.id.fill_card).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent();
                 intent.setClass(getActivity(),TheStartPageActivity.class);
                 startActivity(intent);
                 getActivity().overridePendingTransition(R.anim.rightin, R.anim.rightout);
             }
         });
     }
 }

PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ListDialog.java

Diff comments View file @e54c424

 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;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.Toast;
 import com.hjx.personalcenter.R;
 import com.mylhyl.circledialog.BaseCircleDialog;
 import com.mylhyl.circledialog.res.values.CircleDimen;
 import java.util.ArrayList;
 /**自定义列表对话框
  * Created by h on 2017/8/10.
  */
 public class ListDialog extends BaseCircleDialog implements AdapterView.OnItemClickListener {
     ArrayAdapter listadapter;
     ListView listView;
     ArrayList<String> data = new ArrayList<>();
     public static ListDialog getInstance() {
         ListDialog dialogFragment = new ListDialog();
         dialogFragment.setCanceledBack(true);
         dialogFragment.setCanceledOnTouchOutside(true);
         dialogFragment.setRadius(CircleDimen.RADIUS);
         dialogFragment.setWidth(0.5f);
+        dialogFragment.setGravity(Gravity.CENTER);
+        dialogFragment.setBackgroundColor(Color.WHITE);
         return dialogFragment;
     }
     @Override
     public View createView(Context context, LayoutInflater inflater, ViewGroup container) {
         return inflater.inflate(R.layout.custom_adilog_list, container, false);
     }
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         listView = (ListView) getView().findViewById(R.id.listadapter);
         for (int i=0;i<=50;i++){
             data.add("sss"+i);
         }
         listadapter = new ArrayAdapter(getActivity(),R.layout.custom_adilog_list_item,R.id.list_items,data);
         listView.setAdapter(listadapter);
         listView.setOnItemClickListener(this);
     }
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         Toast.makeText(getActivity(),"你点击了第"+position+"个",Toast.LENGTH_LONG).show();
         dismiss();
     }
 }

PersonalCenter/app/src/main/res/drawable/corcle_white_bg.xml

Diff comments View file @e54c424

1	<?xml version="1.0" encoding="utf-8"?>	1	<?xml version="1.0" encoding="utf-8"?>
2	<shape xmlns:android="http://schemas.android.com/apk/res/android"	2	<shape xmlns:android="http://schemas.android.com/apk/res/android"
3	android:shape="rectangle">	3	android:shape="rectangle">
4	<solid	4	<solid
5	android:color="@color/white"/>	5	android:color="@color/colorAccent"/>
6	<corners	6	<corners
7	android:bottomLeftRadius="100dp"	7	android:bottomLeftRadius="20dp"
8	android:topLeftRadius="100dp"	8	android:topLeftRadius="20dp"
9	android:bottomRightRadius="100dp"	9	android:bottomRightRadius="20dp"
10	android:topRightRadius="100dp"/>	10	android:topRightRadius="20dp"/>
11	<stroke android:width="1dp"	11	<stroke android:width="1dp"
12	android:color="@color/cutoff_line"/>	12	android:color="@color/cutoff_line"/>
13	</shape>	13	</shape>

PersonalCenter/app/src/main/res/layout/custom_adilog_electroniccard.xml

Diff comments View file @e54c424

 <?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:orientation="vertical"
-    android:layout_height="match_parent"
+    android:layout_width="match_parent"
-    android:background="@android:color/white">
+    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
             android:id="@+id/cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
             android:padding="20dp"
             android:src="@mipmap/cancel_fork" />
     </RelativeLayout>
     <RelativeLayout
         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"
         android:src="@mipmap/electroniccard"
         android:layout_height="wrap_content" />
     </RelativeLayout>
     <LinearLayout
         android:orientation="vertical"
-        android:background="@android:color/white"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
     <TextView
         android:layout_gravity="center"
         android:layout_marginTop="30dp"
         android:textSize="15sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/electronic_card"
         android:text="@string/electronic_card1"/>
     <TextView
         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"/>
     <View
         android:layout_marginTop="20dp"
         android:layout_width="match_parent"
         android:background="@color/login_edittext_hint"
         android:layout_height="0.7dp">
     </View>
     <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"
         android:textColor="@color/login_text_black"
         android:text="@string/string_electroniccard_info_fill"/>
     </LinearLayout>
     <LinearLayout
         android:orientation="vertical"
-        android:background="@android:color/white"
         android:layout_width="match_parent"
         android:layout_height="30dp">
     </LinearLayout>

PersonalCenter/app/src/main/res/layout/custom_adilog_list.xml

Diff comments View file @e54c424

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
     <RelativeLayout
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:color/white"
         android:minHeight="70dp" >
         <ImageView
             android:id="@+id/cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
             android:padding="20dp"
             android:src="@mipmap/cancel_fork" />
         <TextView
             android:id="@+id/menu_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:padding="20dp"
             android:text="选年级"
             android:textColor="@android:color/black"
             android:textSize="22sp" />
     </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>