From 8678704456e2dba574ede362f67d34d9e897c1b4 Mon Sep 17 00:00:00 2001 From: jianbo <263303411@qq.com> Date: Wed, 2 Sep 2020 18:15:54 +0800 Subject: [PATCH] d --- app/src/main/AndroidManifest.xml | 4 +- app/src/main/assets/1.json | 1 - .../LoginPasswordPresenterImpl.java | 4 +- .../fenghoo/seven/main/find/FindFragment.java | 57 ++++++++++++++++++- .../main/kehu/activity/DesignActivity.java | 5 +- app/src/main/res/layout/activity_design.xml | 1 + app/src/main/res/layout/findfragment.xml | 1 - 7 files changed, 65 insertions(+), 8 deletions(-) delete mode 100644 app/src/main/assets/1.json diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a7154d3..dc8711b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,7 +58,9 @@ + android:screenOrientation="portrait" + android:theme="@style/DefaultCityPickerTheme" + > diff --git a/app/src/main/assets/1.json b/app/src/main/assets/1.json deleted file mode 100644 index b0ae2f8..0000000 --- a/app/src/main/assets/1.json +++ /dev/null @@ -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":[]} \ No newline at end of file diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/mvp/presenterImpl/LoginPasswordPresenterImpl.java b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/presenterImpl/LoginPasswordPresenterImpl.java index 6925614..fedc238 100644 --- a/app/src/main/java/com/fenghoo/seven/main/activity/mvp/presenterImpl/LoginPasswordPresenterImpl.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/presenterImpl/LoginPasswordPresenterImpl.java @@ -74,7 +74,7 @@ public class LoginPasswordPresenterImpl extends MvpBasePresenter 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(); } }); } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/DesignActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/DesignActivity.java index 1298f5d..913a66c 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/DesignActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/DesignActivity.java @@ -67,6 +67,7 @@ public class DesignActivity extends BaseTreeActivity dataBean; private TextView btn_add,btn_commit; private RecyclerView mLabelRvList; + private RelativeLayout rl_des; private DesignAdapter adapter; private List photoeditor = new ArrayList<>(); private List industryData; @@ -82,6 +83,7 @@ public class DesignActivity extends BaseTreeActivity