d

app/src/main/AndroidManifest.xml

@@ -58,7 +58,9 @@
         <!-- 找回密码 -->
         <activity
             android:name=".main.activity.MainActivity"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:theme="@style/DefaultCityPickerTheme"
+            >
 
             <!-- <intent-filter> -->
             <!-- <action android:name="android.intent.action.MAIN" /> -->

app/src/main/assets/1.json

@@ -1 +0,0 @@
-{"v":"5.7.1","fr":120,"ip":0,"op":96,"w":500,"h":500,"nm":"合成 1","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"形状图层 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[248,274,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-90,-28],[-21,38],[101,-105]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.149019607843,0.501960784314,0.921568627451,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":33,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[72,72],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"形状 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0],"y":[0.982]},"o":{"x":[0.333],"y":[0]},"t":191,"s":[0]},{"t":230,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":191,"op":231,"st":-69,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"形状图层 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[251.5,256.5,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[321,321],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.149019607843,0.501960784314,0.921568627451,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":15,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-1.5,-6.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[15]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":46,"s":[25]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":96,"s":[15]},{"t":191,"s":[100]}],"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":96,"s":[360]},{"t":191,"s":[720]}],"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"形状图层 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[251.5,256.5,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[321,321],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.686274509804,0.686274509804,0.686274509804,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":15,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-1.5,-6.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"完整动画","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,0],"ix":2},"a":{"a":0,"k":[250,250,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":500,"h":500,"ip":0,"op":96,"st":0,"bm":0}],"markers":[]}

app/src/main/java/com/fenghoo/seven/main/activity/mvp/presenterImpl/LoginPasswordPresenterImpl.java

@@ -74,7 +74,7 @@ public class LoginPasswordPresenterImpl extends MvpBasePresenter<LoginPasswordCo
                 if (getView() == null) {
                     return;
                 }
-         //       getView().dismissProgressDialog();
+                getView().dismissProgressDialog();
                 if(data.getSuccess()==0){
                     mModel.setLogin(true);
                     mModel.saveUserInfo(data);
@@ -82,7 +82,7 @@ public class LoginPasswordPresenterImpl extends MvpBasePresenter<LoginPasswordCo
                     //记住密码
 //                boolean savePassword = getView().isSavePassword();
 //                mModel.savePassword(savePassword ? mobile : null, savePassword ? passWord : null);
-           //         getView().startActivity(MainActivity.class);
+                    getView().startActivity(MainActivity.class);
                 }else {
                     getView().toast(data.getMsg());
                     getView().showphoneright();

app/src/main/java/com/fenghoo/seven/main/find/FindFragment.java

@@ -2,18 +2,28 @@ package com.fenghoo.seven.main.find;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.fenghoo.seven.R;
 import com.fenghoo.seven.main.find.ui.FindFragmenttwo;
 import com.fenghoo.seven.main.kehu.activity.ShowAty;
 import com.fenghoo.seven.test.BaseFragment;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.zaaach.citypicker.CityPicker;
+import com.zaaach.citypicker.adapter.OnPickListener;
+import com.zaaach.citypicker.model.City;
+import com.zaaach.citypicker.model.HotCity;
+import com.zaaach.citypicker.model.LocateState;
+import com.zaaach.citypicker.model.LocatedCity;
+
+import java.util.List;
 
 /**
  * 发现
@@ -27,6 +37,10 @@ public class FindFragment extends BaseFragment {
     private LinearLayout dianyuanbuju;
     private TextView marking_fragment;
 
+    private List<HotCity> hotCities;
+    private int anim;
+    private boolean enable;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -83,8 +97,47 @@ public class FindFragment extends BaseFragment {
         marking_fragment.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-               // ShowAty.CloundSolutionActivity(getActivity());
-                ShowAty.MainActivitytwot(getActivity());
+              //  ShowAty.CloundSolutionActivity(getActivity());
+               // ShowAty.MainActivitytwot(getActivity());
+
+
+
+                CityPicker.from(getActivity())
+                        .enableAnimation(enable)
+                        .setAnimationStyle(anim)
+                        .setLocatedCity(null)
+                        .setHotCities(hotCities)
+                        .setOnPickListener(new OnPickListener() {
+                            @Override
+                            public void onPick(int position, City data) {
+                                //     mDangqianchengshi.setText(String.format("当前城市：%s，%s", data.getName(), data.getCode()));
+                                marking_fragment.setText(String.format(data.getName()));
+                                Toast.makeText(
+                                        getActivity().getApplicationContext(),
+                                        String.format("点击的数据：%s，%s", data.getName(), data.getCode()),
+                                        Toast.LENGTH_SHORT)
+                                        .show();
+                            }
+
+                            @Override
+                            public void onCancel() {
+                                Toast.makeText(getActivity().getApplicationContext(), "取消选择", Toast.LENGTH_SHORT).show();
+                            }
+
+                            @Override
+                            public void onLocate() {
+                                //开始定位，这里模拟一下定位
+//                                new Handler().postDelayed(new Runnable() {
+//                                    @Override
+//                                    public void run() {
+//                                        CityPicker.from(getActivity()).locateComplete(new LocatedCity(city, province, adCode), LocateState.SUCCESS);
+//                                    }
+//                                }, 3000);
+
+
+                            }
+                        })
+                        .show();
             }
         });
     }

app/src/main/java/com/fenghoo/seven/main/kehu/activity/DesignActivity.java

@@ -67,6 +67,7 @@ public class DesignActivity extends BaseTreeActivity<CommitDesignContract.View,
     private List<DbRecordBeanData> dataBean;
     private TextView btn_add,btn_commit;
     private RecyclerView mLabelRvList;
+    private RelativeLayout rl_des;
     private DesignAdapter adapter;
     private List<PhotoeditorBean> photoeditor = new ArrayList<>();
     private List<industryBean.ResultBean.DataBean> industryData;
@@ -82,6 +83,7 @@ public class DesignActivity extends BaseTreeActivity<CommitDesignContract.View,
         mTitleBar = (TitleBar) findViewById(R.id.title_bar);
         mTitleBar.setTitle("客户分配");
         btn_add = (TextView) findViewById(R.id.btn_add);
+        rl_des = (RelativeLayout) findViewById(R.id.rl_des);
         btn_commit = (TextView) findViewById(R.id.btn_commit);
 
         //第一部分的数据
@@ -150,6 +152,7 @@ public class DesignActivity extends BaseTreeActivity<CommitDesignContract.View,
     @Override
     protected void initEvent() {
         btn_add.setOnClickListener(this);
+        rl_des.setOnClickListener(this);
         btn_commit.setOnClickListener(this);
     }
 
@@ -197,7 +200,7 @@ public class DesignActivity extends BaseTreeActivity<CommitDesignContract.View,
                 String strtext = gson.toJson(contents);
                 getPresenter().commitdesign(strtext);
                 break;
-            case R.id.btn_add://添加图文编辑
+            case R.id.rl_des://添加图文编辑
                 PhotoeditorBean photoeditorBean = new PhotoeditorBean();
                 photoeditorBean.setCity("");
                 photoeditorBean.setCustomer_id("");

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

@@ -30,6 +30,7 @@
             android:layout_marginLeft="15dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
             android:background="#ffffff"
             android:text="添加分配"
             android:textColor="#ff404040"

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

@@ -21,7 +21,6 @@
             android:drawableRight="@mipmap/marking_down_pic"
             android:drawablePadding="6dp"
             android:text="全国"
-            android:visibility="invisible"
             android:textColor="#ff333333"
             android:textSize="14sp" />