diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b978ce8..b65e589 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -283,6 +283,7 @@ android:launchMode="singleTop" android:theme="@style/wxPayTheme" android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> + \ No newline at end of file diff --git a/app/src/main/java/com/sl/house_property/Main4Fragment.java b/app/src/main/java/com/sl/house_property/Main4Fragment.java index 911cfd1..01ad614 100644 --- a/app/src/main/java/com/sl/house_property/Main4Fragment.java +++ b/app/src/main/java/com/sl/house_property/Main4Fragment.java @@ -20,6 +20,7 @@ import com.cutil.SizeUtils; import com.cutil.StringUtils; import com.sl.house_property.cart.AddressListActivity; import com.sl.house_property.databinding.FragmentMain4Binding; +import com.sl.house_property.discovery.LikeActivity; import com.sl.house_property.f1.UserdlistActivity; import com.sl.house_property.order.OrderActivity; import com.sl.house_property.user.MyAuthorizedFamilyHistory; @@ -222,7 +223,13 @@ public class Main4Fragment extends BaseFragment implements } }); - + mDataBinding.ll1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(getActivity(), LikeActivity.class); + startActivityForResult(intent, 0); + } + }); // mDataBinding.llGeren.setOnClickListener(new View.OnClickListener() { // @Override // public void onClick(View v) { diff --git a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java index 2827a3d..a1da699 100644 --- a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java +++ b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java @@ -107,6 +107,8 @@ public class HistoryRecordFragment extends BaseFragment { + @Override + protected int getLayoutResId() { + return R.layout.activity_like; + } + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + Fragment likeFragment = LikeFragment.newInstance(); + getSupportFragmentManager().beginTransaction().replace(R.id.fl,likeFragment).commitAllowingStateLoss(); + } + //2. 保存MyOnTouchListener接口的列表 + private ArrayList onTouchListeners = new ArrayList(); + //4.提供给Fragment通过getActivity()方法来注册自己的触摸事件的方法 + public void registerMyOnTouchListener(MainTabActivity.MyOnTouchListener myOnTouchListener) { + onTouchListeners.add(myOnTouchListener); + } + + //5.提供给Fragment通过getActivity()方法来注销自己的触摸事件的方法 + public void unregisterMyOnTouchListener(MainTabActivity.MyOnTouchListener myOnTouchListener) { + onTouchListeners.remove(myOnTouchListener); + } +} diff --git a/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java b/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java index 186180e..520912c 100644 --- a/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java +++ b/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java @@ -5,6 +5,7 @@ import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentPagerAdapter; import android.view.LayoutInflater; +import android.view.View; import com.gyf.immersionbar.ImmersionBar; import com.sl.house_property.BaseFragment; @@ -92,5 +93,11 @@ public class LikeFragment extends BaseFragment { MyViewPagerAdapter myViewPagerAdapter = new MyViewPagerAdapter(getChildFragmentManager()); mDataBinding.fl.setAdapter(myViewPagerAdapter); mDataBinding.tb.setupWithViewPager(mDataBinding.fl); + mDataBinding.left.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + getActivity().finish(); + } + }); } } diff --git a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java index 3f61912..488ba62 100644 --- a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java +++ b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java @@ -137,7 +137,7 @@ public class MyAuthorizedFamilyHistory extends BaseActivity map = new HashMap<>(); + if (user != null) { + map.put("userid", user.getUserid()); + } else { + map.put("userid", 0 + ""); + } + map.put("app", "Cas"); + map.put("class", "DelFamilyMember"); + map.put("f_id", f_id); + map.put("sign", Md5.md5("Cas" + "DelFamilyMember" + Md5.secret)); + DelFamily(ApiConfig.BASE_URL, map, getResources().getString(R.string.loading), 0); + + } + + + private void DelFamily(String myurl, Map map, String msg, final int requstecode) { + mGankLoader = new Loader(); + Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1() { + + + @Override + public void call(Resultcode resultcode) { + progressDialog.dismiss(); + if (!(resultcode.status == 0)) { + setToast( resultcode.msg); + page=1; + getlist(); + } + if (resultcode.status == 0) { + if (requstecode == 0) { + Gson gs = new Gson(); + ArrayList adta = (ArrayList) resultcode.data; + String s = gs.toJson(adta); + + } + } + + } + + + }, new Action1() { + @Override + public void call(Throwable throwable) { + progressDialog.dismiss(); + setToast( getString(R.string.getdatafailure)); + throwable.printStackTrace(); + } + }); + + addSubscription(subscription); + } } diff --git a/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java b/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java index 03c10f9..cd37cfa 100644 --- a/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java +++ b/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java @@ -459,7 +459,7 @@ public class MyPropertyActivity extends BaseActivity } map.put("app", "Cas"); map.put("class", "AddFamilyMember"); - map.put("home_id", homeId); + map.put("user_home_id", homeId); map.put("phone", phone); map.put("username", uername); map.put("sign", Md5.md5("Cas" + "AddFamilyMember" + Md5.secret)); diff --git a/app/src/main/res/layout/activity_like.xml b/app/src/main/res/layout/activity_like.xml new file mode 100644 index 0000000..14b230f --- /dev/null +++ b/app/src/main/res/layout/activity_like.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_select_create_type.xml b/app/src/main/res/layout/dialog_select_create_type.xml index 9e5c5dd..85001b6 100644 --- a/app/src/main/res/layout/dialog_select_create_type.xml +++ b/app/src/main/res/layout/dialog_select_create_type.xml @@ -14,6 +14,7 @@