BWPB3
/
ytzh_Android_ZhongHui
9
0
Fork 0
Code Issues 0 Pull Requests 0 Activity
Browse Source

冲突解决

master
lh 8 years ago
parent
29f8a44e4d 6b5e16cf18
commit
7b9c813bcb
6 changed files with 162 additions and 2 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      .idea/misc.xml
  2. +1
    -1
      .idea/modules.xml
  3. +2
    -0
      app/src/main/java/com/qhclh/ytzh/me/MeFragment.java
  4. +1
    -0
      app/src/main/java/com/qhclh/ytzh/me/MineInfoActivity.java
  5. +2
    -0
      app/src/main/java/com/qhclh/ytzh/me/SettingActivity.java
  6. +155
    -0
      app/src/main/res/layout/activity_mine_info.xml

+ 1
- 1
.idea/misc.xml View File

@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<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">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">


+ 1
- 1
.idea/modules.xml View File

@ -2,9 +2,9 @@
<project version="4"> <project version="4">
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/Ytzh_Android.iml" filepath="$PROJECT_DIR$/Ytzh_Android.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$/jsonrpc/jsonrpc.iml" filepath="$PROJECT_DIR$/jsonrpc/jsonrpc.iml" /> <module fileurl="file://$PROJECT_DIR$/jsonrpc/jsonrpc.iml" filepath="$PROJECT_DIR$/jsonrpc/jsonrpc.iml" />
<module fileurl="file://$PROJECT_DIR$/ytzh_Android.iml" filepath="$PROJECT_DIR$/ytzh_Android.iml" />
</modules> </modules>
</component> </component>
</project> </project>

+ 2
- 0
app/src/main/java/com/qhclh/ytzh/me/MeFragment.java View File

@ -19,6 +19,8 @@ import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import butterknife.Unbinder; import butterknife.Unbinder;
import static com.umeng.analytics.pro.x.R;
/** /**
* Created by 青花瓷 on 2017/11/28. * Created by 青花瓷 on 2017/11/28.
*/ */


+ 1
- 0
app/src/main/java/com/qhclh/ytzh/me/MineInfoActivity.java View File

@ -34,6 +34,7 @@ import butterknife.OnClick;
import static com.qhclh.ytzh.utils.DateUtils.PATTERN_TRANSVERSE; import static com.qhclh.ytzh.utils.DateUtils.PATTERN_TRANSVERSE;
import static com.qhclh.ytzh.utils.DateUtils.format; import static com.qhclh.ytzh.utils.DateUtils.format;
import static com.umeng.analytics.pro.x.R;
public class MineInfoActivity extends BaseActivity { public class MineInfoActivity extends BaseActivity {
/** /**


+ 2
- 0
app/src/main/java/com/qhclh/ytzh/me/SettingActivity.java View File

@ -15,6 +15,8 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import static com.umeng.analytics.pro.x.R;
public class SettingActivity extends BaseActivity { public class SettingActivity extends BaseActivity {
@BindView(R.id.tv_phoneNumber) @BindView(R.id.tv_phoneNumber)


+ 155
- 0
app/src/main/res/layout/activity_mine_info.xml View File

@ -0,0 +1,155 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/greyf4f4f4"
android:orientation="vertical">
<include layout="@layout/include_tool_bar"></include>
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardElevation="@dimen/cardview_compat_inset_shadow">
<LinearLayout
android:id="@+id/ly_personPicture"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="12dp">
<TextView
android:id="@+id/textView"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="center_vertical"
android:text="设置头像"
android:textSize="@dimen/text_size_18" />
<com.qhclh.ytzh.utils.widget.XCRoundImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:layout_marginRight="20dp"
android:src="@mipmap/ic_launcher" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/more_icon"/>
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
app:cardElevation="@dimen/cardview_compat_inset_shadow">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ly_phoneNumber"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_phoneNumber_title"
android:layout_width="0dp"
android:layout_weight="1.5"
android:layout_height="47dp"
android:gravity="center_vertical"
android:paddingLeft="12dp"
android:text="我的手机"
android:textSize="@dimen/text_size_18" />
<TextView
android:id="@+id/tv_phoneNumber"
android:layout_width="0dp"
android:layout_height="47dp"
android:layout_gravity="right"
android:layout_weight="3"
android:drawablePadding="10dp"
android:drawableRight="@drawable/more_icon"
android:gravity="right|center_vertical"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="2px"
android:background="#dbdbdb" />
<LinearLayout
android:id="@+id/ly_sex"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_sex_title"
android:layout_width="0dp"
android:layout_weight="1.5"
android:layout_height="47dp"
android:gravity="center_vertical"
android:paddingLeft="12dp"
android:text="性别"
android:textSize="@dimen/text_size_18" />
<TextView
android:id="@+id/tv_sex"
android:layout_width="0dp"
android:layout_weight="3"
android:layout_height="47dp"
android:drawablePadding="10dp"
android:layout_gravity="right"
android:gravity="right|center_vertical"
android:drawableRight="@drawable/more_icon"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="2px"
android:background="#dbdbdb" />
<LinearLayout
android:id="@+id/ly_birthday"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_birthday_title"
android:layout_width="0dp"
android:layout_weight="1.5"
android:layout_height="47dp"
android:gravity="center_vertical"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:text="生日"
android:textSize="@dimen/text_size_18" />
<TextView
android:id="@+id/tv_birthday"
android:layout_width="0dp"
android:layout_weight="3"
android:layout_height="47dp"
android:drawablePadding="10dp"
android:drawableRight="@drawable/more_icon"
android:gravity="right|center_vertical"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:textSize="@dimen/text_size_18" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>

Write Preview
Loading…
Cancel
Save