bug修改

app/src/main/java/com/kuxuan/moneynote/common/Constant.java

@@ -9,8 +9,8 @@ public class Constant {
     //手机号正则，11位手机号
     public static final String REGEX_MOBILE = "[1][3,4,5,7,8][0-9]{9}$";
     //测试接口
-//    public static final String BASE_URL = "http://bill.quyaqu.com/api/";
-    public static final String BASE_URL = "http://api.money.quyaqu.com/api/";
+    public static final String BASE_URL = "http://bill.quyaqu.com/api/";
+//    public static final String BASE_URL = "http://api.money.quyaqu.com/api/";
     public static final String MD5 = "b4b80c2676828f1df375684100f56d48";
 
     public static class UserInfo{

app/src/main/java/com/kuxuan/moneynote/ui/activitys/CatrogyDetialActivity.java

@@ -17,6 +17,8 @@ public class CatrogyDetialActivity extends BaseFragmentActivity {
     public static final String CATROGY_ID = "catrogy_id";
     public static final String CHARTTYPE = "charttype";
     public static final String MONEY_TYPE = "money_type";
+    public static final String TITLE = "title";
+    public static final String RADIO_TYPE = "radio_type";
 
     @Override
     public int getLayout() {
@@ -26,7 +28,7 @@ public class CatrogyDetialActivity extends BaseFragmentActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ReportSingleFragment reportFragment = ReportSingleFragment.getInstanceForPage(getIntent().getIntExtra(CATROGY_ID, -1), getIntent().getIntExtra(CHARTTYPE, ChartLayout.LINE),getIntent().getIntExtra(MONEY_TYPE,2));
+        ReportSingleFragment reportFragment = ReportSingleFragment.getInstanceForPage(getIntent().getIntExtra(CATROGY_ID, -1), getIntent().getIntExtra(CHARTTYPE, ChartLayout.LINE),getIntent().getIntExtra(MONEY_TYPE,2),getIntent().getStringExtra(TITLE),getIntent().getIntExtra(RADIO_TYPE,1));
         getSupportFragmentManager().beginTransaction().add(R.id.fragment_reportchart_content, reportFragment).commit();
         getSupportFragmentManager().beginTransaction().show(reportFragment).commit();
     }

app/src/main/java/com/kuxuan/moneynote/ui/activitys/register/RegisterSecondActivity.java

@@ -114,7 +114,10 @@ public class RegisterSecondActivity extends BaseActivity {
         String a = String.valueOf(time);
        String phone =  phone_text.getText().toString().replaceAll("-", "");
         Log.e(TAG,MD5+phone_text.getText().toString()+a);
-        RetrofitClient.getApiService().sendCode(phone, code_type,a,Md5Util.md5(Constant.MD5+phone_text.getText().toString().replaceAll("-", "")+a),"1").subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new MyObsever<BaseJson<Object>>() {
+        int verfy = 0;
+        if(!isFindPwd)
+            verfy = 1;
+        RetrofitClient.getApiService().sendCode(phone, code_type,a,Md5Util.md5(Constant.MD5+phone_text.getText().toString().replaceAll("-", "")+a),verfy+"").subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new MyObsever<BaseJson<Object>>() {
             @Override
             public void onError(ExceptionHandle.ResponeThrowable e) {
                 closeProgressDialog();
@@ -200,7 +203,10 @@ public class RegisterSecondActivity extends BaseActivity {
      */
     private void validateCode() {
         showProgressDialog(getResources().getString(R.string.code_validate));
-        RetrofitClient.getApiService().validateCode(phone_text.getText().toString().replaceAll("-", ""), code_edit.getText().toString(),"1").subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new MyObsever<BaseJson<Object>>() {
+        int verfy = 0;
+        if(!isFindPwd)
+            verfy = 1;
+        RetrofitClient.getApiService().validateCode(phone_text.getText().toString().replaceAll("-", ""), code_edit.getText().toString(),verfy+"").subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new MyObsever<BaseJson<Object>>() {
             @Override
             public void onError(ExceptionHandle.ResponeThrowable e) {
                 closeProgressDialog();

app/src/main/java/com/kuxuan/moneynote/ui/activitys/reportchart/ReportChartActivity.java

@@ -17,6 +17,8 @@ public class ReportChartActivity extends BaseFragmentActivity {
     public static final String CATROGY_ID = "catrogy_id";
     public static final String CHARTTYPE = "charttype";
     public static final String MONEY_TYPE = "money_type";
+    public static final String TITLE = "title";
+    public static final String RADIO_TYPE = "radio_type";
 
 
     @Override
@@ -30,8 +32,10 @@ public class ReportChartActivity extends BaseFragmentActivity {
         int id = getIntent().getIntExtra(CATROGY_ID, -1);
         int type = getIntent().getIntExtra(CHARTTYPE, ChartLayout.LINE);
         int money_type = getIntent().getIntExtra(MONEY_TYPE, 2);
+        int radio_type = getIntent().getIntExtra(RADIO_TYPE, 1);
+        String title = getIntent().getStringExtra(TITLE);
         ReportSingleFragment reportFragment;
-        reportFragment = ReportSingleFragment.getInstanceForPage(id, type,money_type);
+        reportFragment = ReportSingleFragment.getInstanceForPage(id, type,money_type,title,radio_type);
         getSupportFragmentManager().beginTransaction().add(R.id.fragment_reportchart_content, reportFragment).commit();
         getSupportFragmentManager().beginTransaction().show(reportFragment).commit();
     }

app/src/main/java/com/kuxuan/moneynote/ui/fragments/details/DetialFragment.java

@@ -70,6 +70,9 @@ public class DetialFragment extends MVPFragment<DetialPresent, DetialModel> impl
         mPresenter.initListener(fragmentDetialMonth);
         initMiluView();
         checkNet();
+//        TextSetUtil.setTextForMoey("12321312312321312321", fragmentDetialMoneyin);
+//        TextSetUtil.setTextForMoey("12321312312321312321", fragmentDetialMoneyout);
+
 
     }
 

app/src/main/java/com/kuxuan/moneynote/ui/fragments/reportsingle/ReportSingleContract.java

@@ -85,7 +85,7 @@ void goToEdit(TypeDataJson typeDataJson);
         abstract boolean jugeNeedGetData(int type, int statis_type);
 
 
-        abstract void refreshTabLayout(TabLayout tabLayout, int type, ArrayList<ChartData> datas);
+        abstract void refreshTabLayout(TabLayout tabLayout, int type,String title, ArrayList<ChartData> datas);
 
         abstract void clearMap();
 

app/src/main/java/com/kuxuan/moneynote/ui/fragments/reportsingle/ReportSingleFragment.java

@@ -89,6 +89,20 @@ public class ReportSingleFragment extends MVPFragment<ReportSinglePresent, Repor
      */
     public static final String MONEY_TYPE = "money_tpe";
 
+
+    /**
+     * 约定的点击
+     */
+    public static final String TITLE = "title";
+
+    /**
+     * 约定的年月日
+     */
+    public static final String RADIOGROUP_TYPE = "radiogroup_type";
+
+    private int radio_type = 1;
+    private String title_text = "";
+
     public static ReportSingleFragment getInstanceForPage() {
         Bundle bundle = new Bundle();
         bundle.putInt("type", ChartLayout.YUANHUAN);
@@ -122,6 +136,18 @@ public class ReportSingleFragment extends MVPFragment<ReportSinglePresent, Repor
         return reportFragment;
     }
 
+    public static ReportSingleFragment getInstanceForPage(int category_id, int chartType, int money_type, String title,int radio_type) {
+        Bundle bundle = new Bundle();
+        bundle.putInt("type", chartType);
+        bundle.putInt(CATEGORY_ID, category_id);
+        bundle.putInt(MONEY_TYPE, money_type);
+        bundle.putInt(RADIOGROUP_TYPE, radio_type);
+        bundle.putString(TITLE, title);
+        ReportSingleFragment reportFragment = new ReportSingleFragment();
+        reportFragment.setArguments(bundle);
+        return reportFragment;
+    }
+
     private int chartType = ChartLayout.LINE;
 
     /**
@@ -142,7 +168,9 @@ public class ReportSingleFragment extends MVPFragment<ReportSinglePresent, Repor
                     if (chartType == ChartLayout.LINE) {
                         Intent intent = new Intent(getActivity(), ReportChartActivity.class);
                         intent.putExtra(ReportChartActivity.CATROGY_ID, category_id);
-                        intent.putExtra(CatrogyDetialActivity.MONEY_TYPE, mType);
+                        intent.putExtra(ReportChartActivity.MONEY_TYPE, mType);
+                        intent.putExtra(ReportChartActivity.TITLE, title_text);
+                        intent.putExtra(ReportChartActivity.RADIO_TYPE, radio_type);
                         intent.putExtra(ReportChartActivity.CHARTTYPE, ChartLayout.YUANHUAN);
                         startActivity(intent);
                     }
@@ -167,6 +195,8 @@ public class ReportSingleFragment extends MVPFragment<ReportSinglePresent, Repor
             }
             //默认支出
             mType = getArguments().getInt(MONEY_TYPE, 2);
+            title_text = getArguments().getString(TITLE, "");
+            radio_type = getArguments().getInt(RADIOGROUP_TYPE,1);
         }
         if (mType == 2) {
             getTitleView().setTitle("支出");
@@ -186,7 +216,7 @@ public class ReportSingleFragment extends MVPFragment<ReportSinglePresent, Repor
             }
         });
 
-        mPresenter.init(getActivity(), chartType, category_id, mType);
+        mPresenter.init(getActivity(), chartType, category_id, mType,radio_type);
         mPresenter.initRecyclerView(getActivity(), mRecyclerView);
         mPresenter.initRadioGroup(activityBaobiaoRadiogroup);
         mPresenter.initTabLayout(getActivity(), fragmentReportTablayout);
@@ -196,13 +226,15 @@ public class ReportSingleFragment extends MVPFragment<ReportSinglePresent, Repor
         checkNet();
 
     }
-    private void checkNet(){
+
+    private void checkNet() {
         boolean networkAvailable = NetWorkUtil.isNetworkAvailable(getActivity());
         if (networkAvailable)
             mPresenter.loginCheck();
         else
             multipleStatusView.showNoNetwork();
     }
+
     /**
      * 初始化多布局
      */
@@ -279,6 +311,7 @@ public class ReportSingleFragment extends MVPFragment<ReportSinglePresent, Repor
     public void showNoData() {
         nodata_layout.setVisibility(View.VISIBLE);
         data_laout.setVisibility(View.GONE);
+        fragmentReportTablayout.setVisibility(View.GONE);
     }
 
     @Override
@@ -299,6 +332,7 @@ public class ReportSingleFragment extends MVPFragment<ReportSinglePresent, Repor
     @Override
     public void showData() {
         data_laout.setVisibility(View.VISIBLE);
+        fragmentReportTablayout.setVisibility(View.VISIBLE);
         nodata_layout.setVisibility(View.GONE);
 
     }
@@ -418,7 +452,7 @@ public class ReportSingleFragment extends MVPFragment<ReportSinglePresent, Repor
 //获取到数据
         //维度标识1代表周，2代表月，3代表年
         int type = mPresenter.getType();
-        mPresenter.refreshTabLayout(fragmentReportTablayout, type, chartDatas);
+        mPresenter.refreshTabLayout(fragmentReportTablayout, type, title_text, chartDatas);
     }
 
     @Override
@@ -432,7 +466,9 @@ public class ReportSingleFragment extends MVPFragment<ReportSinglePresent, Repor
     public void goToCatrogyDetial(int catrogy_id) {
         Intent itnent = new Intent(getActivity(), CatrogyDetialActivity.class);
         itnent.putExtra(CatrogyDetialActivity.CATROGY_ID, catrogy_id);
+        itnent.putExtra(CatrogyDetialActivity.TITLE, mPresenter.getTitle_text());
         itnent.putExtra(CatrogyDetialActivity.MONEY_TYPE, mType);
+        itnent.putExtra(CatrogyDetialActivity.RADIO_TYPE, mPresenter.getType());
         startActivity(itnent);
     }
 

app/src/main/java/com/kuxuan/moneynote/ui/fragments/reportsingle/ReportSinglePresent.java

@@ -8,6 +8,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
+import android.widget.RadioButton;
 import android.widget.RadioGroup;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -57,6 +58,9 @@ public class ReportSinglePresent extends ReportSingleContract.RepPresent {
      */
     private int charType = ChartLayout.LINE;
 
+
+    private String title_text;
+
     /**
      * tab当前的pos
      */
@@ -86,13 +90,21 @@ public class ReportSinglePresent extends ReportSingleContract.RepPresent {
     private WeakHashMap<Integer, ArrayList<ChartData>> mapLists;
 
 
-    public void init(Context context, int charType, int catrogy_id, int money_type) {
+    public void init(Context context, int charType, int catrogy_id, int money_type, int radio_type) {
         mActivity = (FragmentActivity) context;
         this.charType = charType;
         this.catrogy_id = catrogy_id;
         this.moneyType = money_type;
+        this.type = radio_type;
     }
 
+    public String getTitle_text() {
+        return title_text;
+    }
+
+    public void setTitle_text(String title_text) {
+        this.title_text = title_text;
+    }
 
     @Override
     void initRadioGroup(RadioGroup radioGroup) {
@@ -121,6 +133,8 @@ public class ReportSinglePresent extends ReportSingleContract.RepPresent {
                 view.getRadioData(type);
             }
         });
+      RadioButton radioButton = (RadioButton) radioGroup.getChildAt(type-1);
+        radioButton.setChecked(true);
     }
 
     private TabLayoutOpertor opertor;
@@ -132,6 +146,7 @@ public class ReportSinglePresent extends ReportSingleContract.RepPresent {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
                 tabCurrentPosition = tab.getPosition();
+                title_text = tab.getText().toString();
                 DayJson tag = (DayJson) tab.getTag();
                 ChartData data = tag.getData();
                 if (data.isTrueData()) {
@@ -233,7 +248,7 @@ public class ReportSinglePresent extends ReportSingleContract.RepPresent {
     }
 
     @Override
-    void refreshTabLayout(TabLayout tabLayout, int type, ArrayList<ChartData> datas) {
+    void refreshTabLayout(TabLayout tabLayout, int type, String title, ArrayList<ChartData> datas) {
         //获取得到的
 
         if (datas.size() == 0) {
@@ -243,23 +258,33 @@ public class ReportSinglePresent extends ReportSingleContract.RepPresent {
             view.showContentLayout();
         }
         //防止刷新后会为0的情况
-        int currentPos = tabCurrentPosition;
+//        int currentPos = tabCurrentPosition;
         tabLayout.removeAllTabs();
+        int currentPos = -1;
+        int count = 0;
         for (int i = datas.size() - 1; i >= 0; i--) {
             DayJson dayJson = new DayJson();
+            if (title.equals(datas.get(i).getTime())) {
+                currentPos = count;
+            }
+
             dayJson.setData(datas.get(i));
             datas.get(i).setTrueData(true);
             TabLayout.Tab tab = tabLayout.newTab().setText(datas.get(i).getTime());
             tab.setTag(dayJson);
             tabLayout.addTab(tab);
+            count++;
         }
-        if (datas.size() != 0) {
-            if (currentPos < datas.size())
-                tabLayout.getTabAt(currentPos).select();
-            else {
-                tabLayout.getTabAt(datas.size() - 1).select();
-            }
-        }
+//        if (datas.size() != 0) {
+//            if (currentPos < datas.size())
+//                tabLayout.getTabAt(currentPos).select();
+//            else {
+        if (currentPos != -1)
+            tabLayout.getTabAt(currentPos).select();
+        else
+            tabLayout.getTabAt(datas.size() - 1).select();
+//            }
+//        }
     }
 
 

app/src/main/res/layout/activity_update.xml

@@ -210,8 +210,9 @@
         android:layout_marginRight="20dp"
         android:enabled="false"
         android:layout_marginTop="40dp"
-        android:background="@color/bg_title_gray"
+        android:background="@drawable/bg_orange_btn"
         android:text="@string/sure"
+        style="?android:attr/borderlessButtonStyle"
         android:textColor="@color/first_text"
         android:textSize="@dimen/text_big_size" />
 </LinearLayout>

app/src/main/res/layout/fragment_mine.xml

@@ -153,6 +153,7 @@
                         android:layout_weight="1"
                         android:gravity="center_horizontal"
                         android:lines="1"
+                        android:text="23213213123213213213213"
                         android:textColor="@color/first_text" />
 
                     <TextView
@@ -161,7 +162,9 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="center_horizontal"
-                        android:lines="1"
+                        android:singleLine="true"
+                        android:ellipsize="end"
+                        android:text="23213213123213213213213"
                         android:textColor="@color/first_text" />
 
                     <TextView
@@ -171,6 +174,7 @@
                         android:layout_weight="1"
                         android:gravity="center_horizontal"
                         android:lines="1"
+                        android:text="23213213123213213213213"
                         android:textColor="@color/first_text" />
                 </LinearLayout>
 

app/src/main/res/layout/item_detial_layout.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/item_detial_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:id="@+id/item_detial_layout"
     android:background="@android:color/white"
     android:orientation="vertical">
 
@@ -41,8 +41,8 @@
         android:id="@+id/item_detial_view1"
         android:layout_width="match_parent"
         android:layout_height="1px"
-        android:visibility="gone"
-        android:background="@color/split_line_color" />
+        android:background="@color/split_line_color"
+        android:visibility="gone" />
 
 
     <LinearLayout
@@ -58,12 +58,14 @@
             android:layout_width="38dp"
             android:layout_height="38dp"
             android:layout_marginLeft="2dp"
+            android:layout_gravity="center_vertical"
             android:src="@mipmap/category_e_donate_s" />
 
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:paddingLeft="15dp"
             android:paddingRight="10dp">
 
@@ -77,9 +79,9 @@
                     android:id="@+id/item_detial_name_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="居家"
-                    android:singleLine="true"
                     android:ellipsize="end"
+                    android:singleLine="true"
+                    android:text="居家"
                     android:textColor="@android:color/black"
                     android:textSize="@dimen/text_normal_size" />
 
@@ -94,17 +96,16 @@
 
             </RelativeLayout>
 
-            <View
-                android:id="@+id/item_detial_view2"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_alignParentBottom="true"
-                android:background="@color/split_line_color" />
-
 
         </RelativeLayout>
 
 
     </LinearLayout>
 
+    <View
+        android:id="@+id/item_detial_view2"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginLeft="50dp"
+        android:background="@color/split_line_color" />
 </LinearLayout>

app/src/main/res/layout/item_find_layout.xml

@@ -7,9 +7,9 @@
 
     <ImageView
         android:id="@+id/item_find_imageView"
-        android:layout_width="35dp"
+        android:layout_width="40px"
         android:layout_gravity="center_horizontal"
-        android:layout_height="35dp"
+        android:layout_height="40px"
         />
 
 
@@ -19,6 +19,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
+        android:textSize="12px"
         android:layout_gravity="center_horizontal"
         android:text="理财"/>
 </LinearLayout>

app/src/main/res/layout/item_report_layout.xml

@@ -9,9 +9,14 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="5dp"
+
         android:orientation="horizontal"
-        android:paddingTop="5dp">
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:paddingBottom="3dp"
+        android:paddingTop="5dp"
+
+        >
 
 
         <ImageView
@@ -25,16 +30,16 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:paddingRight="10dp"
-            android:paddingLeft="10dp">
+            android:layout_height="wrap_content"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:paddingBottom="5dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                >
 
                 <RelativeLayout
                     android:layout_width="match_parent"
@@ -44,8 +49,8 @@
                         android:id="@+id/item_report_name_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="居家"
                         android:drawablePadding="3dp"
+                        android:text="居家"
                         android:textColor="@android:color/black"
                         android:textSize="@dimen/text_normal_size" />
 
@@ -62,7 +67,6 @@
                 </RelativeLayout>
 
 
-
                 <ProgressBar
                     android:id="@+id/item_report_progressbar"
                     style="?android:attr/progressBarStyleHorizontal"
@@ -71,31 +75,28 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginTop="5dp"
                     android:max="100"
-                    android:progressDrawable="@drawable/progress_bar_drawable"
-                    android:progress="10" />
+                    android:progress="10"
+                    android:progressDrawable="@drawable/progress_bar_drawable" />
+
                 <TextView
                     android:id="@+id/item_report_time_text"
                     android:layout_width="wrap_content"
-                    android:paddingRight="10dp"
-                    android:visibility="visible"
+                    android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
+                    android:paddingRight="10dp"
                     android:text="2017-2123-23"
-                    android:layout_height="wrap_content"
                     android:textColor="#c1c1c1"
-                    android:textSize="@dimen/text_small_size"/>
+                    android:textSize="@dimen/text_small_size"
+                    android:visibility="visible" />
             </LinearLayout>
-
-            <View
-                android:id="@+id/item_detial_view2"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_alignParentBottom="true"
-                android:background="@color/split_line_color" />
-
-
         </RelativeLayout>
-
-
     </LinearLayout>
 
+    <View
+        android:id="@+id/item_detial_view2"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_alignParentBottom="true"
+        android:layout_marginLeft="50dp"
+        android:background="@color/split_line_color" />
 </LinearLayout>